X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=408addb427866289ae329ffa8de4ccdcd2396849;hb=f7b0f0130571e3473baead5cffe25666170fe70f;hp=4f216955b8726c0ed6c7ca8b44cf5857e9cc7195;hpb=95303d7b5280820af76ddbd8908b120813f1e763;p=fa-stable.git
diff --git a/includes/current_user.inc b/includes/current_user.inc
index 4f216955..408addb4 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -24,7 +24,8 @@ class current_user
var $access;
var $timeout;
var $last_act;
-
+ var $role_set = false;
+ var $old_db;
var $logged;
var $ui_mode = 0;
@@ -53,6 +54,8 @@ class current_user
function login($company, $loginname, $password)
{
+ global $security_areas, $security_groups, $security_headings, $path_to_root;
+
$this->set_company($company);
$this->logged = false;
@@ -61,8 +64,41 @@ 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"]) {
- $this->access = $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;
+ }
+ $this->access = $myrow["full_access"];
+ if (in_array(20, $security_groups[$this->access]))
+ // temporary access for admin users
+ $this->role_set[] = $security_areas['SA_SOFTWAREUPGRADE'][0];
+ else {
+ echo "
";
+ echo _('System is available for site admin only until full database upgrade');
+ echo "
";
+ exit;
+ }
+ } else {
+ $this->role_set = array();
+ $this->access = $myrow["role_id"];
+ // store area codes available for current user role
+ $role = get_security_role($this->access);
+ if (!$role)
+ return false;
+ foreach( $role['areas'] as $code )
+ // filter only area codes for enabled security sections
+ if (in_array($code&~0xff, $role['sections']))
+ $this->role_set[] = $code;
+ }
$this->name = $myrow["real_name"];
$this->pos = $myrow["pos"];
$this->loginname = $loginname;
@@ -75,29 +111,49 @@ class current_user
$this->timeout = session_timeout();
}
}
-
return $this->logged;
}
function check_user_access()
{
global $security_groups;
- return is_array($security_groups[$this->access]);
+ if ($this->old_db) {
+ // notification after upgrade from pre-2.2 version
+ return isset($security_groups) && is_array(@$security_groups[$this->access]);
+ } else
+ return !isset($security_groups) && is_array($this->role_set);
+ }
+
+ 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]);
+ }
+
+ 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));
}
function can_access_page($page_level)
{
- global $security_groups;
- // first registered company has site admin privileges
- return isset($page_level) && in_array($page_level, $security_groups[$this->access])
- && ($this->company == 0 || $page_level != 20);
+ 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);
@@ -111,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);
}
}
@@ -168,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) {
@@ -201,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;
@@ -330,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() {
@@ -368,4 +427,59 @@ 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;
+ }
+}
+
+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;
+}
+
+function array_search_key($needle, $haystack, $valuekey=null)
+{
+ foreach($haystack as $key => $value) {
+ $val = isset($valuekey) ? $value[$valuekey] : $value;
+ if ($needle == $val){
+ return $key;
+ }
+ }
+ return null;
+}
?>
\ No newline at end of file