Changeset 783 for trunk

Timestamp:

04/25/11 09:42:55 (13 months ago)

Author:

r2

Message:

авторизация админа на закрытом сайте

Location:

trunk

Files:

• components/registration/frontend.php (modified) (1 diff)
• index.php (modified) (2 diffs)

trunk/components/registration/frontend.php

@@ -435 +435 @@
                             $url = $back;
                         }
-                    } else { 
+                    } else {
+                        $admin_back = strstr($back, '/admin/login.php') ? '/admin' : $back;
+                        $url = isset($_SESSION['back_url']) ? $_SESSION['back_url'] : $admin_back;
                         $url = isset($_SESSION['back_url']) ? $_SESSION['back_url'] : '/';
                         if (isset($_SESSION['back_url'])) unset($_SESSION['back_url']);

trunk/index.php

@@ -63 +63 @@
 
     //ïðîâåðÿåì ÷òî ïîëüçîâàòåëü íå óäàëåí è íå çàáàíåí
-    if (!$inUser->update() && !$inCore->request('uri', 'str')=='/logout') { $inCore->halt(); }
+    if (!$inUser->update() && !$_SERVER['REQUEST_URI']!=='/logout') { $inCore->halt(); }
 
     //îïðåäåëÿåì çàãîëîâîê ãëàâíîé ñòðàíèöû
@@ -77 +77 @@
         if ( $inConf->siteoff &&
         !$inUser->is_admin &&
-        $inCore->request('uri', 'str')!='login' &&
-        $inCore->request('uri', 'str')!='logout'
+        $_SERVER['REQUEST_URI']!='/login' &&
+        $_SERVER['REQUEST_URI']!='/logout'
        ) {
             $inPage->includeTemplateFile('special/siteoff.php');