[Svn-src-all:3914] [version-2_12_4en 22828] #2238 Merged r22826

[michael_nelson]

Subversion committed to /home/svn/open 22828
http://svn.ec-cube.net/open_trac/changeset/22828
┌────────────────────────────┐
│更新者　:  michael_nelson                               │
│更新日時:  2013-05-20 15:25:03 +0900 (月, 20  5月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#2238 Merged r22826 

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
_U  branches/version-2_12_4en/
_U  branches/version-2_12_4en/data/
U   branches/version-2_12_4en/data/class/helper/SC_Helper_Session.php


Property changes on: branches/version-2_12_4en
___________________________________________________________________
変更: svn:mergeinfo
   - /branches/version-2_12-dev:21998-22057,22062-22080,22083-22086,22089-22095,22097-22098,22104-22107,22111-22120,22123-22143,22145-22146,22158,22164-22165,22167-22169,22187-22196,22199-22204,22231,22241,22580,22604,22797-22798,22802
/branches/version-2_12_2:21999-22009
/branches/version-2_12_3:22219-22261
/branches/version-2_12_3en-p1:22525-22541
/branches/version-2_4:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev:18473-18475
   + /branches/version-2_12-dev:21998-22057,22062-22080,22083-22086,22089-22095,22097-22098,22104-22107,22111-22120,22123-22143,22145-22146,22158,22164-22165,22167-22169,22187-22196,22199-22204,22231,22241,22580,22604,22797-22798,22802,22826
/branches/version-2_12_2:21999-22009
/branches/version-2_12_3:22219-22261
/branches/version-2_12_3en-p1:22525-22541
/branches/version-2_4:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev:18473-18475


Property changes on: branches/version-2_12_4en/data
___________________________________________________________________
変更: svn:mergeinfo
   - /branches/version-2_12-dev:22241
/branches/version-2_12-dev/data:21998-22057,22062-22080,22083-22086,22089-22095,22097-22098,22104-22107,22111-22120,22123-22143,22145-22146,22158,22164-22165,22167-22169,22187-22196,22199-22204,22231,22241,22580,22604,22797-22798,22802
/branches/version-2_12_2/data:21999-22009
/branches/version-2_12_3/data:22219-22261
/branches/version-2_12_3en-p1/data:22525-22541
/branches/version-2_4/data:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev/data:18473-18475
   + /branches/version-2_12-dev:22241
/branches/version-2_12-dev/data:21998-22057,22062-22080,22083-22086,22089-22095,22097-22098,22104-22107,22111-22120,22123-22143,22145-22146,22158,22164-22165,22167-22169,22187-22196,22199-22204,22231,22241,22580,22604,22797-22798,22802,22826
/branches/version-2_12_2/data:21999-22009
/branches/version-2_12_3/data:22219-22261
/branches/version-2_12_3en-p1/data:22525-22541
/branches/version-2_4/data:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev/data:18473-18475

変更: branches/version-2_12_4en/data/class/helper/SC_Helper_Session.php
===================================================================
--- branches/version-2_12_4en/data/class/helper/SC_Helper_Session.php	2013-05-20 06:03:24 UTC (rev 22827)
+++ branches/version-2_12_4en/data/class/helper/SC_Helper_Session.php	2013-05-20 06:25:03 UTC (rev 22828)
@@ -215,20 +215,24 @@
      * @return void
      */
     function adminAuthorization() {
-        $masterData = new SC_DB_MasterData_Ex();
-        $arrExcludes = $masterData->getMasterData('mtb_auth_excludes');
-        if (preg_match('|^' . ROOT_URLPATH . ADMIN_DIR . '|', $_SERVER['SCRIPT_NAME'])) {
-            $is_auth = true;
-
-            foreach ($arrExcludes as $exclude) {
-                if (preg_match('|^' . ROOT_URLPATH . ADMIN_DIR . $exclude . '|', $_SERVER['SCRIPT_NAME'])) {
-                    $is_auth = false;
-                    break;
+        if (($script_path = realpath($_SERVER['SCRIPT_FILENAME'])) !== FALSE) {
+            $arrScriptPath = explode('/', str_replace('\\', '/', $script_path));
+            $arrAdminPath = explode('/', str_replace('\\', '/', substr(HTML_REALDIR . ADMIN_DIR, 0, -1)));
+            $arrDiff = array_diff_assoc($arrAdminPath, $arrScriptPath);
+            if (in_array(substr(ADMIN_DIR, 0, -1), $arrDiff)) {
+                return;
+            } else {
+                $masterData = new SC_DB_MasterData_Ex();
+                $arrExcludes = $masterData->getMasterData('mtb_auth_excludes');
+                foreach ($arrExcludes as $exclude) {
+                    $arrExcludesPath = explode('/', str_replace('\\', '/', HTML_REALDIR . ADMIN_DIR . $exclude));
+                    $arrDiff = array_diff_assoc($arrExcludesPath, $arrScriptPath);
+                    if (count($arrDiff) === 0) {
+                        return;
+                    }
                 }
             }
-            if ($is_auth) {
-                SC_Utils_Ex::sfIsSuccess(new SC_Session_Ex());
-            }
         }
+        SC_Utils_Ex::sfIsSuccess(new SC_Session_Ex());
     }
 }