Fixed two typos in translated messages.

[fa-stable.git] / includes / current_user.inc

diff --git a/includes/current_user.inc b/includes/current_user.inc
index c4d94539df5797c01dad0cfd64d9f4fc0c754242..ab5073a63d8a95329324c12909689c82b815eab5 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -175,7 +175,7 @@ class current_user
                        update_user_prefs($this->user, $prefs);
                }
 
-               $this->prefs = new user_prefs($prefs);
+               $this->prefs = new user_prefs(get_user($this->user));
        }
 }
 
@@ -183,7 +183,7 @@ class current_user
 
 function round2($number, $decimals=0)
 {
-       $delta = ($number < 0 ? -.000001 : .000001);
+       $delta = ($number < 0 ? -.0000000001 : .0000000001);
        return round($number+$delta, $decimals);
 }
 
@@ -193,7 +193,7 @@ function number_format2($number, $decimals=0)
        $tsep = $thoseps[$_SESSION["wa_current_user"]->prefs->tho_sep()];
        $dsep = $decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()];
        //return number_format($number, $decimals, $dsep,       $tsep);
-       $delta = ($number < 0 ? -.000001 : .000001);
+       $delta = ($number < 0 ? -.0000000001 : .0000000001);
        return number_format($number+$delta, $decimals, $dsep,  $tsep);
 }
 //
@@ -281,7 +281,9 @@ function user_numeric($input) {
 
 function user_company()
 {
-       return $_SESSION["wa_current_user"]->company;
+       global $def_coy;
+       
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->company : $def_coy;
 }
 
 function user_pos()
@@ -351,7 +353,8 @@ function user_dec_sep()
 
 function user_theme()
 {
-       return $_SESSION["wa_current_user"]->prefs->get_theme();
+       return isset($_SESSION["wa_current_user"]) ?
+               $_SESSION["wa_current_user"]->prefs->get_theme() : 'default';
 }
 
 function user_pagesize()
@@ -467,7 +470,7 @@ function array_append(&$array, $elements)
 function array_search_value($needle, $haystack, $valuekey=null)
 {
        foreach($haystack as $key => $value) {
-               $val = isset($valuekey) ? $value[$valuekey] : $value;
+               $val = isset($valuekey) ? @$value[$valuekey] : $value;
                if ($needle == $val){
                        return $value;
                }
@@ -483,7 +486,7 @@ function array_search_keys($needle, $haystack, $valuekey=null)
        $keys = array();
        if($haystack)
                foreach($haystack as $key => $value) {
-                       $val = isset($valuekey) ? $value[$valuekey] : $value;
+                       $val = isset($valuekey) ? @$value[$valuekey] : $value;
                        if ($needle == $val){
                                $keys[] = $key;
                        }
@@ -499,4 +502,33 @@ function array_search_key($needle, $haystack, $valuekey=null)
        $keys = array_search_keys($needle, $haystack, $valuekey);
        return @$keys[0];
 }
+
+function flush_dir($path, $wipe = false) 
+{
+       $dir = opendir($path);
+       while(false !== ($fname = readdir($dir))) {
+               if($fname=='.' || $fname=='..' || $fname=='CVS' || (!$wipe && $fname=='index.php')) continue;
+               if(is_dir($path.'/'.$fname)) {
+                   flush_dir($path.'/'.$fname, $wipe);
+                   if ($wipe) @rmdir($path.'/'.$fname);
+               } else
+                   @unlink($path.'/'.$fname);
+       }
+}
+/*
+       Returns current path to company private folder.
+       (Current path can change after chdir).
+*/
+function company_path($comp=null)
+{
+       global $path_to_root, $comp_path;
+
+       if (!isset($comp))
+               $comp = user_company();
+
+       // if path is relative, set current path_to_root
+       return ($comp_path[0]=='.' ? $path_to_root.'/'.basename($comp_path) : $comp_path)
+                       . '/'.$comp;
+}
+
 ?>
\ No newline at end of file