diff options
| author | Simon Rettberg | 2014-10-06 19:30:38 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-10-06 19:30:38 +0200 |
| commit | 9792e13f6ef1c9855ebe0736e7a1effc535dac76 (patch) | |
| tree | 07516ae42f0508c395f91607d94db7dcf92e4f06 | |
| parent | Use eventlog in init and update API, populate database with default values on... (diff) | |
| download | slx-admin-9792e13f6ef1c9855ebe0736e7a1effc535dac76.tar.gz slx-admin-9792e13f6ef1c9855ebe0736e7a1effc535dac76.tar.xz slx-admin-9792e13f6ef1c9855ebe0736e7a1effc535dac76.zip | |
Minor fixes and improvements
| -rw-r--r-- | inc/permission.inc.php | 17 | ||||
| -rw-r--r-- | modules/minilinux.inc.php | 2 | ||||
| -rw-r--r-- | modules/translation.inc.php | 2 |
3 files changed, 7 insertions, 14 deletions
diff --git a/inc/permission.inc.php b/inc/permission.inc.php index b63e9d45..f90319a4 100644 --- a/inc/permission.inc.php +++ b/inc/permission.inc.php @@ -2,24 +2,17 @@ class Permission { - private static $permissions = false; + private static $permissions = array( + 'superadmin' => 1, + 'baseconfig_global' => 2, + 'baseconfig_local' => 4, + ); public static function get($permission) { - self::init(); if (!isset(self::$permissions[$permission])) Util::traceError('Invalid permission: ' . $permission); return self::$permissions[$permission]; } - private static function init() - { - if (self::$permissions !== false) return; - self::$permissions = array(); - $res = Database::simpleQuery('SELECT mask, identifier FROM permission'); - while ($row = $res->fetch(PDO::FETCH_ASSOC)) { - self::$permissions[$row['identifier']] = $row['mask']; - } - } - } diff --git a/modules/minilinux.inc.php b/modules/minilinux.inc.php index 36a097b5..df2a0839 100644 --- a/modules/minilinux.inc.php +++ b/modules/minilinux.inc.php @@ -25,7 +25,7 @@ class Page_MiniLinux extends Page $data = Property::getVersionCheckInformation(); if (!is_array($data) || !isset($data['systems'])) { echo Render::parse('messagebox-error', array( - 'message' => 'Failed to retrieve the list: ' . $data + 'message' => 'Failed to retrieve the list: ' . print_r($data, true) )); return; } diff --git a/modules/translation.inc.php b/modules/translation.inc.php index d42066f3..15733b73 100644 --- a/modules/translation.inc.php +++ b/modules/translation.inc.php @@ -271,7 +271,7 @@ class Page_Translation extends Page */ private function loadHardcodedStringEditArray() { - $tags = $this->loadTagsFromPhp('/Dictionary\s*::\s*translate\s*\(\s*[\'"](.*?)[\'"]\s*[\)\,]/i'); + $tags = $this->loadTagsFromPhp('/Dictionary\s*::\s*translate\s*\(\s*[\'"](.*?)[\'"]\s*\)/i'); if ($tags === false) return false; return $this->buildTranslationTable('messages-hardcoded', $tags); |