X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=c4d94539df5797c01dad0cfd64d9f4fc0c754242;hb=5088ee92669272ebac6f1bd1acebc05fe382829f;hp=fc11db8442acec040c7072dc8e9bccfa48a31025;hpb=728910985f90c66207bd0ac9f16ea48ca5ad7823;p=fa-stable.git
diff --git a/includes/current_user.inc b/includes/current_user.inc
index fc11db84..c4d94539 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;
@@ -73,6 +73,7 @@ class current_user
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;
}
@@ -123,10 +124,9 @@ class current_user
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 get_db_connection()
+ function can_access_page($page_level)
+ {
+ return $this->can_access($page_level);
+ }
+
+ 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($prefs);
}
}
@@ -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;
@@ -377,14 +394,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 +427,76 @@ 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];
+}
?>
\ No newline at end of file