ADDED: debug info in System info to show if $CONF['ItemURL'] is broken in admin panel...

[nucleus-jp/nucleus-jp-ancient.git] / utf8 / nucleus / libs / globalfunctions.php

diff --git a/utf8/nucleus/libs/globalfunctions.php b/utf8/nucleus/libs/globalfunctions.php
index 7530e72..10d75d6 100755 (executable)
--- a/utf8/nucleus/libs/globalfunctions.php
+++ b/utf8/nucleus/libs/globalfunctions.php
@@ -46,9 +46,10 @@ if ($CONF['debug']) {
                more of the installation files (install.php, install.sql, upgrades/\r
                directory) are still on the server.\r
 */\r
+\r
 $CONF['alertOnHeadersSent']  = 1;\r
 $CONF['alertOnSecurityRisk'] = 1;\r
-$CONF['ItemURL']             = $CONF['Self'];\r
+/*$CONF['ItemURL']             = $CONF['Self'];\r
 $CONF['ArchiveURL']          = $CONF['Self'];\r
 $CONF['ArchiveListURL']      = $CONF['Self'];\r
 $CONF['MemberURL']           = $CONF['Self'];\r
@@ -60,7 +61,7 @@ $CONF['CategoryURL']         = $CONF['Self'];
 // this avoids urls like index.php/item/13/index.php/item/15\r
 if (!isset($CONF['URLMode']) || (($CONF['URLMode'] == 'pathinfo') && (substr($CONF['Self'], strlen($CONF['Self']) - 4) == '.php'))) {\r
        $CONF['URLMode'] = 'normal';\r
-}\r
+}*/\r
 \r
 if (getNucleusPatchLevel() > 0) {\r
        $nucleus['version'] .= '/' . getNucleusPatchLevel();\r
@@ -164,13 +165,27 @@ if (!isset($CONF['Self'])) {
                $CONF['Self'] = substr($CONF['Self'], 0, strlen($CONF['Self']) -1);\r
        }\r
 \r
-       $CONF['ItemURL']        = $CONF['Self'];\r
+/*     $CONF['ItemURL']        = $CONF['Self'];\r
        $CONF['ArchiveURL']     = $CONF['Self'];\r
        $CONF['ArchiveListURL'] = $CONF['Self'];\r
        $CONF['MemberURL']      = $CONF['Self'];\r
        $CONF['SearchURL']      = $CONF['Self'];\r
        $CONF['BlogURL']        = $CONF['Self'];\r
-       $CONF['CategoryURL']    = $CONF['Self'];\r
+       $CONF['CategoryURL']    = $CONF['Self'];*/\r
+}\r
+\r
+$CONF['ItemURL'] = $CONF['Self'];\r
+$CONF['ArchiveURL'] = $CONF['Self'];\r
+$CONF['ArchiveListURL'] = $CONF['Self'];\r
+$CONF['MemberURL'] = $CONF['Self'];\r
+$CONF['SearchURL'] = $CONF['Self'];\r
+$CONF['BlogURL'] = $CONF['Self'];\r
+$CONF['CategoryURL'] = $CONF['Self'];\r
+\r
+// switch URLMode back to normal when $CONF['Self'] ends in .php\r
+// this avoids urls like index.php/item/13/index.php/item/15\r
+if (!isset($CONF['URLMode']) || (($CONF['URLMode'] == 'pathinfo') && (substr($CONF['Self'], strlen($CONF['Self']) - 4) == '.php'))) {\r
+       $CONF['URLMode'] = 'normal';\r
 }\r
 \r
 // automatically use simpler toolbar for mozilla\r
@@ -374,7 +389,7 @@ if ($CONF['URLMode'] == 'pathinfo') {
                $CONF['CategoryKey'] = 'category';\r
        }\r
 \r
-       if ($CONF['SpecialskinKey'] == '') {\r
+       if (!isset($CONF['SpecialskinKey']) || $CONF['SpecialskinKey'] == '') {\r
                $CONF['SpecialskinKey'] = 'special';\r
        }\r
 \r
@@ -1891,7 +1906,9 @@ function sanitizeArray(&$array)
                if (!in_array($key, $excludeListForSanitization)) {\r
 \r
                        // check value\r
-                       @list($val, $tmp) = explode('\\', $val);\r
+                       if (strpos($val, '\\')) {\r
+                               list($val, $tmp) = explode('\\', $val);\r
+                       }\r
 \r
                        // remove control code etc.\r
                        $val = strtr($val, "\0\r\n<>'\"", "       ");\r