X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=bca45f0875cdcd589a6430b5b701498979e04d67;hb=d3f047621e21e734300f97c1361a4c7b96e0f385;hp=77e8dc3e471707e139509000211a9548ccc27017;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git
diff --git a/includes/current_user.inc b/includes/current_user.inc
index 77e8dc3e..bca45f08 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 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);
@@ -161,14 +170,29 @@ 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, $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);
+ $graphic_links, $lang, $stickydate, $startup_tab)
+ {
+ global $allow_demo_mode;
+
+ $user = array(
+ 'prices_dec' => $price_dec, 'qty_dec' => $qty_dec,
+ 'rates_dec' => $exrate_dec, 'percent_dec' => $percent_dec,
+ 'show_gl' => $showgl, 'show_codes' => $showcodes,
+ 'date_format' => $date_format, 'date_sep' => $date_sep,
+ 'tho_sep' => $tho_sep, 'dec_sep' => $dec_sep,
+ 'theme' => $theme, 'page_size' => $pagesize,
+ 'show_hints' => $show_hints, 'print_profile' => $profile,
+ 'rep_popup' => $rep_popup, 'query_size' => $query_size,
+ 'graphic_links' => $graphic_links, 'language' => $lang,
+ 'sticky_doc_date' => $stickydate, 'startup_tab' => $startup_tab
+ );
+
+ if(!$allow_demo_mode) {
+ 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);
+ }
$this->prefs = new user_prefs($user);
}
}
@@ -215,6 +239,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 +281,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;
@@ -415,4 +450,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