diff --git a/www/admin/class_test.php b/www/admin/class_test.php
index b1e58f03..86a04a82 100644
--- a/www/admin/class_test.php
+++ b/www/admin/class_test.php
@@ -28,10 +28,12 @@
// set + check edit access id
$edit_access_id = 3;
+ print "ACL UNIT: ".print_r(array_keys($login->acl['unit']), 1)."
";
+ print "ACCESS CHECK: ".$login->login_check_edit_access($edit_access_id)."
";
if ($login->login_check_edit_access($edit_access_id))
$basic->edit_access_id = $edit_access_id;
else
- $basic->edit_access_id = $login->acl['info']['default_edit_access'];
+ $basic->edit_access_id = $login->acl['unit_id'];
// $basic->debug('SESSION', $basic->print_ar($_SESSION));
diff --git a/www/libs/Class.Basic.inc b/www/libs/Class.Basic.inc
index 563cff4f..51175a36 100644
--- a/www/libs/Class.Basic.inc
+++ b/www/libs/Class.Basic.inc
@@ -1081,6 +1081,20 @@
return $number;
}
+ // METHOD: DateStringFormat
+ // PARAMS: unix timestamp, true/false to show microtime
+ // RETURN: string formated date+time in Y-M-D h:m:s
+ // DESC : a simple wrapper for the date format
+ public static function DateStringFormat($timestamp, $show_micro = true)
+ {
+ list ($timestamp, $ms) = explode('.', round($timestamp, 4));
+ if ($show_micro)
+ $string = date("Y-m-d H:i:s", $timestamp).' '.$ms.'ms';
+ else
+ $string = date("Y-m-d H:i:s", $timestamp);
+ return $string;
+ }
+
// METHOD: TimeStringFormat
// PARAMS: seconds
// RETURN: formated time string
diff --git a/www/libs/Class.Login.inc b/www/libs/Class.Login.inc
index 86d59bbd..68f525b1 100644
--- a/www/libs/Class.Login.inc
+++ b/www/libs/Class.Login.inc
@@ -641,7 +641,7 @@
// DESC : checks if this edit access id is valid
public function login_check_edit_access($edit_access_id)
{
- if (array_key_exists($edit_access_id, $this->acl['info']['edit_access']))
+ if (array_key_exists($edit_access_id, $this->acl['unit']))
return true;
else
return false;