From 2a6eaf60f32d6b24be57085d5445788127a49491 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Sat, 4 Jun 2011 09:34:12 +0000
Subject: [PATCH] fixing some small php notice at install time

---
 bureau/class/lang_env.php  | 10 +++++++++-
 bureau/class/m_err.php     |  1 +
 bureau/class/m_quota.php   |  2 +-
 bureau/class/variables.php |  2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bureau/class/lang_env.php b/bureau/class/lang_env.php
index 51e5c95e..17b33412 100644
--- a/bureau/class/lang_env.php
+++ b/bureau/class/lang_env.php
@@ -9,6 +9,9 @@ function update_locale($langpath) {
       $locales[$mat[1]]=$mat[1];
     }
   }
+  if (!count($locales)) {
+    $locales=array("en_US"=>"en_US");
+  }
   return $locales;
 }
 
@@ -23,6 +26,11 @@ $langpath = bindtextdomain("alternc", "/var/alternc/bureau/locales");
 // Create or update a locale.php file if it is outdated.
 $locales = update_locale($langpath);
 
+// Default to en_US : 
+if (!isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
+  $_SERVER["HTTP_ACCEPT_LANGUAGE"]="en_US";
+}
+
 if (!(isset($lang))) {  // Use the browser first preferred language
   $lang=strtolower(substr(trim($_SERVER["HTTP_ACCEPT_LANGUAGE"]),0,5));
 }
@@ -39,7 +47,7 @@ if (! isset($locales[$lang])) { // Requested language not found in locales
   }
 }
 
-if (!isset($locales[$lang])) $lang=$locales[0]; 
+if (!isset($locales[$lang])) list($lang)=each($locales);
 
 if (isset($setlang) && isset($lang)) {
   setcookie("lang",$lang);
diff --git a/bureau/class/m_err.php b/bureau/class/m_err.php
index 83024ce2..2fe424a4 100644
--- a/bureau/class/m_err.php
+++ b/bureau/class/m_err.php
@@ -140,6 +140,7 @@ class m_err {
     global $mem,$cuid;
     $f=@fopen($this->logfile,"ab");
     if ($f) {
+      if (!isset($_SERVER['REMOTE_ADDR'])) $_SERVER['REMOTE_ADDR']="::1";
       fputs($f,date("d/m/Y H:i:s")." - " . $_SERVER['REMOTE_ADDR'] . " - CALL - ");
       fputs($f,$mem->user["login"]." - ");
       fputs($f,$clsid." - ".$function." - ".$param."\n");
diff --git a/bureau/class/m_quota.php b/bureau/class/m_quota.php
index 195d974a..3c51eef4 100644
--- a/bureau/class/m_quota.php
+++ b/bureau/class/m_quota.php
@@ -173,7 +173,7 @@ class m_quota {
     global $err,$db,$cuid;
     $err->log("quota","setquota",$ressource."/".$size);
     if (floatval($size)==0) $size="0";
-    if ($this->disk[$ressource]) {
+    if (isset($this->disk[$ressource])) {
       // It's a disk resource, update it with shell command
       exec("/usr/lib/alternc/quota_edit $cuid $size");
       // Now we check that the value has been written properly : 
diff --git a/bureau/class/variables.php b/bureau/class/variables.php
index b9f3834e..070f0ea1 100644
--- a/bureau/class/variables.php
+++ b/bureau/class/variables.php
@@ -46,7 +46,7 @@ function variable_init($conf = array()) {
   while ($db->next_record($result)) {
     /* maybe the data is *not* serialized, in that case, take it verbatim */
     $variable = $db->Record;
-    if (($variables[$variable['name']] = unserialize($variable['value'])) === FALSE) {
+    if (($variables[$variable['name']] = @unserialize($variable['value'])) === FALSE) {
       $variables[$variable['name']] = $variable['value'];
     }
   }