diff --git a/src/Controller/Component.php b/src/Controller/Component.php index 99ca77c..f698f50 100644 --- a/src/Controller/Component.php +++ b/src/Controller/Component.php @@ -112,7 +112,9 @@ class Controller_Component $tpl->set('common', Path::join(WWW_PATH, '../', 'common')); $tpl->set('script', Path::join(WWW_PATH, 'js')); $tpl->set('media', Path::join(TEMPLATE_WEB, $template)); - $tpl->set('site_template', SITE_WWW_PATH . '/templates' . $registry->readKey(array('system', 'template'))); + if ($registry) { + $tpl->set('site_template', SITE_WWW_PATH . '/templates' . $registry->readKey(array('system', 'template'))); + } $tpl->set('base', SITE_WWW_PATH); $tpl->set('component_base', $this->webPath[$selected]); diff --git a/src/Controller/Installer.php b/src/Controller/Installer.php index 0b4a6ce..d20a93d 100644 --- a/src/Controller/Installer.php +++ b/src/Controller/Installer.php @@ -85,7 +85,6 @@ class Controller_Installer $version_old = "0.0"; $registry->writeKey(array($name), array()); } -// echo $version_old, $settings->get('version'); if (version_compare($version_old, $settings->get('version'), "!=")) { $sql = $settings->get('sql'); if (is_array($sql)) { diff --git a/src/Filter/Authorization.php b/src/Filter/Authorization.php index 2666465..5afd556 100644 --- a/src/Filter/Authorization.php +++ b/src/Filter/Authorization.php @@ -4,14 +4,14 @@ class Filter_Authorization { const SESSION_BROWSER_SIGN_SECRET = '@w3dsju45Msk#'; const SESSION_BROWSER_SIGN_KEYNAME = 'session.app.browser.sign'; - static function isLogged() { + static function isLogged($group = 'access') { +// echo session_status(); if (session_status() == PHP_SESSION_NONE) { session_start(); } $hash = self::getBrowserSign(); // Если $hash не совпадает $_SESSION['hash'] то удаляем сессию -// print_r($_SESSION); - if (isset($_SESSION['access']) && isset($_SESSION[self::SESSION_BROWSER_SIGN_KEYNAME])) { + if (isset($_SESSION[$group]) && isset($_SESSION[self::SESSION_BROWSER_SIGN_KEYNAME])) { if ($hash == $_SESSION[self::SESSION_BROWSER_SIGN_KEYNAME]) { // UserAccess::getUserById($_SESSION ['access']); // Поиск по идентификатору return true; @@ -22,14 +22,14 @@ class Filter_Authorization { return false; } - static function enter($id) + static function enter($id, $group = 'access') { // $db->executeQuery("UPDATE visitor SET sid = '' WHERE id_visitor = " . $result->getInt('id_user')); // session_register("access"); // session_register("time"); // $_SESSION ["group"] = $result->getInt('access'); - $_SESSION ["access"] = $id; // id_user + $_SESSION [$group] = $id; // id_user $_SESSION [self::SESSION_BROWSER_SIGN_KEYNAME] = self::getBrowserSign(); $_SESSION ["time"] = time(); } diff --git a/src/Form/Form.php b/src/Form/Form.php index f0e6922..f79c9f3 100644 --- a/src/Form/Form.php +++ b/src/Form/Form.php @@ -288,7 +288,7 @@ class Form_Form extends View_View { 'color' => 'TColor', 'textarea' => 'TTextArea', - 'text' => 'TTextArea', + 'text' => 'TTextArea', 'multiselect' => 'TSelectMany', // 'selectmany' => 'TSelectMany', 'select1' => 'TSelectOne',