X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fcurrent_user.inc;h=94b7c2ffaa86f079c786071641004faf38a96b5c;hb=6bdb8986a143a35e8f8a1c318bd14fab839000b2;hp=549c31b045897cf31ea57d23fa94d86a3ec40b8e;hpb=7e8c90ee7e898a9181f62f387ccb92158f47f59c;p=fa-stable.git
diff --git a/includes/current_user.inc b/includes/current_user.inc
index 549c31b0..94b7c2ff 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 $logged;
var $ui_mode = 0;
@@ -53,6 +54,8 @@ class current_user
function login($company, $loginname, $password)
{
+ global $security_areas, $security_groups, $security_headings;
+
$this->set_company($company);
$this->logged = false;
@@ -61,8 +64,40 @@ 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 "
";
+ 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,22 +110,40 @@ 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;
+ $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()
@@ -114,11 +167,11 @@ class current_user
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) {
+ $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);
+ $show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab);
// re-read the prefs
$user = get_user($this->user);
@@ -155,6 +208,19 @@ function price_format($number) {
$_SESSION["wa_current_user"]->prefs->price_dec());
}
+function price_decimal_format($number, &$dec)
+{
+ $dec = user_price_dec();
+ $str = strval($number);
+ $pos = strpos($str, '.');
+ if ($pos !== false)
+ {
+ $len = strlen(substr($str, $pos + 1));
+ if ($len > $dec)
+ $dec = $len;
+ }
+ return number_format2($number, $dec);
+}
// 2008-06-15. Added extra parameter $stock_id and reference for $dec
//--------------------------------------------------------------------
function qty_format($number, $stock_id=null, &$dec) {
@@ -312,14 +378,19 @@ function sticky_doc_date()
return $_SESSION["wa_current_user"]->prefs->sticky_date();
}
+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)
+ $print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab)
{
$_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);
+ $print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab);
}
function add_user_js_data() {