X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=ab5073a63d8a95329324c12909689c82b815eab5;hb=4019df1a1a914da6061795ae88fd54d506208ffc;hp=77e8dc3e471707e139509000211a9548ccc27017;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git diff --git a/includes/current_user.inc b/includes/current_user.inc index 77e8dc3e..ab5073a6 100644 --- a/includes/current_user.inc +++ b/includes/current_user.inc @@ -25,7 +25,7 @@ class current_user var $timeout; var $last_act; var $role_set = false; - + var $old_db; var $logged; var $ui_mode = 0; @@ -54,7 +54,7 @@ class current_user function login($company, $loginname, $password) { - global $security_areas, $security_groups, $security_headings; + global $security_areas, $security_groups, $security_headings, $path_to_root; $this->set_company($company); $this->logged = false; @@ -64,14 +64,16 @@ class current_user if (db_num_rows($Auth_Result) > 0) { $myrow = db_fetch($Auth_Result); + $this->old_db = isset($myrow["full_access"]); if (! @$myrow["inactive"]) { - if (isset($myrow["full_access"])) { + if ($this->old_db) { // Transition code: // db was not yet upgraded after source update to v.2.2 // give enough access for admin user to continue upgrade if (!isset($security_groups) || !isset($security_headings)) { echo "


"; echo _('Before software upgrade you have to include old $security_groups and $security_headings arrays from old config.php file to the new one.'); + echo '
'.""._("Back").""; echo "

"; exit; } @@ -115,18 +117,16 @@ class current_user function check_user_access() { global $security_groups; - if (isset($security_groups)) { + if ($this->old_db) { // notification after upgrade from pre-2.2 version -// display_notification(_("After database upgrade don't forget to remove \$security_groups and \$security_headings from config.php file!")); - return is_array(@$security_groups[$this->access]); + return isset($security_groups) && is_array(@$security_groups[$this->access]); } else - return is_array($this->role_set); + return !isset($security_groups) && is_array($this->role_set); } - function can_access_page($page_level) + function can_access($page_level) { global $security_groups, $security_areas; - if (isset($security_groups)) { return $this->company == 0 && in_array(20, $security_groups[$this->access]); @@ -134,17 +134,26 @@ class current_user if ($page_level === 'SA_OPEN') return true; + if ($page_level === 'SA_DENIED' || $page_level === '') + return false; + $code = $security_areas[$page_level][0]; + // only first registered company has site admin privileges return $code && in_array($code, $this->role_set) - && ($this->company == 0 || ($code&~0xff != SS_SADMIN)); + && ($this->company == 0 || (($code&~0xff) != SS_SADMIN)); + } + + function can_access_page($page_level) + { + return $this->can_access($page_level); } - function get_db_connection() + function get_db_connection($id=-1) { global $db_connections; - $connection = $db_connections[$this->company]; + $connection = $db_connections[$id == -1 ? $this->company : $id]; //print_r($connection); @@ -158,18 +167,15 @@ class current_user return $db; } - function update_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, - $showgl, $showcodes, $date_format, $date_sep, $tho_sep, $dec_sep, - $theme, $pagesize, $show_hints, $profile, $rep_popup, $query_size, - $graphic_links, $lang, $stickydate, $startup_tab) { - update_user_display_prefs($this->user, $price_dec, - $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes, - $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, - $show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab); - - // re-read the prefs - $user = get_user($this->user); - $this->prefs = new user_prefs($user); + function update_prefs($prefs) + { + global $allow_demo_mode; + + if(!$allow_demo_mode) { + update_user_prefs($this->user, $prefs); + } + + $this->prefs = new user_prefs(get_user($this->user)); } } @@ -177,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); } @@ -187,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); } // @@ -215,6 +221,15 @@ function price_decimal_format($number, &$dec) } return number_format2($number, $dec); } +// function money_format doesn't exist in OS Win. +if (!function_exists('money_format')) +{ + function money_format($format, $number) + { + return price_format($number); + } +} + // 2008-06-15. Added extra parameter $stock_id and reference for $dec //-------------------------------------------------------------------- function qty_format($number, $stock_id=null, &$dec) { @@ -248,10 +263,12 @@ function user_numeric($input) { $num = trim($input); $sep = $thoseps[user_tho_sep()]; - if($sep!='') $num = str_replace( $sep, '', $num); - str_replace($sep, '', $num); + if ($sep!='') + $num = str_replace( $sep, '', $num); + $sep = $decseps[user_dec_sep()]; - if($sep!='.') $num = str_replace( $sep, '.', $num); + if ($sep!='.') + $num = str_replace( $sep, '.', $num); if (!is_numeric($num)) return false; @@ -264,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() @@ -334,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() @@ -377,14 +397,9 @@ function user_startup_tab() return $_SESSION["wa_current_user"]->prefs->start_up_tab(); } -function set_user_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes, - $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints, - $print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab) +function set_user_prefs($prefs) { - - $_SESSION["wa_current_user"]->update_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes, - $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints, - $print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab); + $_SESSION["wa_current_user"]->update_prefs($prefs); } function add_user_js_data() { @@ -415,4 +430,105 @@ function session_timeout() $tout = @get_company_pref('login_tout'); // mask warning for db ver. 2.2 return $tout ? $tout : ini_get('session.gc_maxlifetime'); } + +//----------------------------------------------------------------------------- +// Inserts $elements into $array at position $index. +// $elements is list of any objects +// +function array_insert(&$array, $index, $elements) +{ + if (!is_array($elements)) $elements = array($elements); + + $head = array_splice($array, 0, $index); + $array = array_merge($head, $elements, $array); +} + +function array_remove(&$array, $index, $len=1) +{ + array_splice($array, $index, $len); +} + +function array_substitute(&$array, $index, $len, $elements) +{ + array_splice($array, $index, $len); + array_insert($array, $index, $elements); +} + +function array_append(&$array, $elements) +{ + foreach($elements as $key => $el) { + if(is_int($key)) + $array[] = $el; + else + $array[$key] = $el; + } +} +// +// Search $needle in $haystack or in $haystack[][$valuekey] +// returns $needle found or null. +// +function array_search_value($needle, $haystack, $valuekey=null) +{ + foreach($haystack as $key => $value) { + $val = isset($valuekey) ? @$value[$valuekey] : $value; + if ($needle == $val){ + return $value; + } + } + return null; +} +// +// Search $needle in $haystack or in $haystack[][$valuekey] +// returns array of keys of $haystack elements found +// +function array_search_keys($needle, $haystack, $valuekey=null) +{ + $keys = array(); + if($haystack) + foreach($haystack as $key => $value) { + $val = isset($valuekey) ? @$value[$valuekey] : $value; + if ($needle == $val){ + $keys[] = $key; + } + } + return $keys; +} +// +// Find first (single) $needle in $haystack or in $haystack[][$valuekey] +// returns $haystack element found or null +// +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