FIX: PHP5/MySQL5における文法違反コードの修正

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

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index 73586f0..a3671c1 100755 (executable)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -290,7 +290,11 @@ if ($action == 'login') {
                        $action = $nextaction;\r
                }\r
 \r
                        $action = $nextaction;\r
                }\r
 \r

-               $manager->notify('LoginSuccess', array('member' => &$member, 'username' => $login) );\r
+               $param = array(\r
+                       'member'        => &$member,\r
+                       'username'      =>  $login\r
+               );\r
+               $manager->notify('LoginSuccess', $param);\r

                $errormessage = '';\r
                ACTIONLOG::add(INFO, "Login successful for $login (sharedpc=$shared)");\r
        } else {\r
                $errormessage = '';\r
                ACTIONLOG::add(INFO, "Login successful for $login (sharedpc=$shared)");\r
        } else {\r


@@ -303,8 +307,9 @@ if ($action == 'login') {
                else \r
                {\r
                        $errormessage = 'Login failed for ' . $login;\r
                else \r
                {\r
                        $errormessage = 'Login failed for ' . $login;\r

-               } \r
-               $manager->notify('LoginFailed', array('username' => $login) );\r
+               }\r
+               $param = array('username' => $login);\r
+               $manager->notify('LoginFailed', $param);\r

                ACTIONLOG::add(INFO, $errormessage);\r
        }\r
 /*\r
                ACTIONLOG::add(INFO, $errormessage);\r
        }\r
 /*\r


@@ -317,10 +322,12 @@ Backed out for now: See http://forum.nucleuscms.org/viewtopic.php?t=3684 for det
        $pw      = serverVar('PHP_AUTH_PW');\r
 \r
        if ($member->login($login, $pw) ) {\r
        $pw      = serverVar('PHP_AUTH_PW');\r
 \r
        if ($member->login($login, $pw) ) {\r

-               $manager->notify('LoginSuccess',array('member' => &$member));\r
+               $param = array('member' => &$member);\r
+               $manager->notify('LoginSuccess', $param);\r

                ACTIONLOG::add(INFO, "HTTP authentication successful for $login");\r
        } else {\r
                ACTIONLOG::add(INFO, "HTTP authentication successful for $login");\r
        } else {\r

-               $manager->notify('LoginFailed',array('username' => $login));\r
+               $param = array('username' => $login);\r
+               $manager->notify('LoginFailed', $param);\r

                ACTIONLOG::add(INFO, 'HTTP authentication failed for ' . $login);\r
 \r
                //Since bad credentials, generate an apropriate error page\r
                ACTIONLOG::add(INFO, 'HTTP authentication failed for ' . $login);\r
 \r
                //Since bad credentials, generate an apropriate error page\r


@@ -335,7 +342,8 @@ Backed out for now: See http://forum.nucleuscms.org/viewtopic.php?t=3684 for det
        // remove cookies on logout\r
        setcookie($CONF['CookiePrefix'] . 'user', '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);\r
        setcookie($CONF['CookiePrefix'] . 'loginkey', '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);\r
        // remove cookies on logout\r
        setcookie($CONF['CookiePrefix'] . 'user', '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);\r
        setcookie($CONF['CookiePrefix'] . 'loginkey', '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);\r

-       $manager->notify('Logout', array('username' => cookieVar($CONF['CookiePrefix'] . 'user') ) );\r
+       $param = array('username' => cookieVar($CONF['CookiePrefix'] . 'user'));\r
+       $manager->notify('Logout', $param);\r

 } elseif (cookieVar($CONF['CookiePrefix'] . 'user') ) {\r
        // Cookie Authentication\r
        $ck=cookieVar($CONF['CookiePrefix'] . 'loginkey');\r
 } elseif (cookieVar($CONF['CookiePrefix'] . 'user') ) {\r
        // Cookie Authentication\r
        $ck=cookieVar($CONF['CookiePrefix'] . 'loginkey');\r


@@ -353,7 +361,8 @@ Backed out for now: See http://forum.nucleuscms.org/viewtopic.php?t=3684 for det
 }\r
 \r
 // login completed\r
 }\r
 \r
 // login completed\r

-$manager->notify('PostAuthentication', array('loggedIn' => $member->isLoggedIn() ) );\r
+$param = array('loggedIn' => $member->isLoggedIn());\r
+$manager->notify('PostAuthentication', $param);\r

 ticketForPlugin();\r
 \r
 // first, let's see if the site is disabled or not. always allow admin area access.\r
 ticketForPlugin();\r
 \r
 // first, let's see if the site is disabled or not. always allow admin area access.\r


@@ -459,14 +468,12 @@ if ($CONF['URLMode'] == 'pathinfo') {
        }\r
 \r
        $parsed = false;\r
        }\r
 \r
        $parsed = false;\r

-       $manager->notify(\r
-               'ParseURL',\r
-               array(\r
-                       'type' => basename(serverVar('SCRIPT_NAME') ), // e.g. item, blog, ...\r
-                       'info' => $virtualpath,\r
-                       'complete' => &$parsed\r
-               )\r
+       $param = array(\r
+               'type'          =>  basename(serverVar('SCRIPT_NAME') ), // e.g. item, blog, ...\r
+               'info'          =>  $virtualpath,\r
+               'complete'      => &$parsed\r

        );\r
        );\r

+       $manager->notify('ParseURL', $param);\r

 \r
        if (!$parsed) {\r
                // default implementation\r
 \r
        if (!$parsed) {\r
                // default implementation\r


@@ -548,13 +555,11 @@ if ($CONF['URLMode'] == 'pathinfo') {
        the values of something like catid or itemid\r
        New in 3.60\r
 */\r
        the values of something like catid or itemid\r
        New in 3.60\r
 */\r

-$manager->notify(\r
-       'PostParseURL',\r
-       array(\r
-               'type' => basename(serverVar('SCRIPT_NAME') ), // e.g. item, blog, ...\r
-               'info' => $virtualpath\r
-       )\r
+$param = array(\r
+       'type' => basename(serverVar('SCRIPT_NAME') ), // e.g. item, blog, ...\r
+       'info' => $virtualpath\r

 );\r
 );\r

+$manager->notify('PostParseURL', $param);\r

 \r
 function include_libs($file,$once=true,$require=true){\r
        global $DIR_LIBS;\r
 \r
 function include_libs($file,$once=true,$require=true){\r
        global $DIR_LIBS;\r


@@ -684,14 +689,12 @@ function sendContentType($contenttype, $pagetype = '', $charset = _CHARSET) {
                        $contenttype = 'text/html';\r
                }\r
 \r
                        $contenttype = 'text/html';\r
                }\r
 \r

-               $manager->notify(\r
-                       'PreSendContentType',\r
-                       array(\r
-                               'contentType' => &$contenttype,\r
-                               'charset' => &$charset,\r
-                               'pageType' => $pagetype\r
-                       )\r
+               $param = array(\r
+                       'contentType'   => &$contenttype,\r
+                       'charset'               => &$charset,\r
+                       'pageType'              =>  $pagetype\r

                );\r
                );\r

+               $manager->notify('PreSendContentType', $param);\r

 \r
                // strip strange characters\r
                $contenttype = preg_replace('|[^a-z0-9-+./]|i', '', $contenttype);\r
 \r
                // strip strange characters\r
                $contenttype = preg_replace('|[^a-z0-9-+./]|i', '', $contenttype);\r


@@ -1549,7 +1552,7 @@ function createBlogidLink($blogid, $params = '') {
        return createLink('blog', array('blogid' => $blogid, 'extra' => $params) );\r
 }\r
 \r
        return createLink('blog', array('blogid' => $blogid, 'extra' => $params) );\r
 }\r
 \r

-function createLink($type, $params) {\r
+function createLink($type, $args) {\r

        global $manager, $CONF;\r
 \r
        $generatedURL = '';\r
        global $manager, $CONF;\r
 \r
        $generatedURL = '';\r


@@ -1559,15 +1562,13 @@ function createLink($type, $params) {
        $created = false;\r
 \r
        if ($usePathInfo) {\r
        $created = false;\r
 \r
        if ($usePathInfo) {\r

-               $manager->notify(\r
-                       'GenerateURL',\r
-                       array(\r
-                               'type' => $type,\r
-                               'params' => $params,\r
-                               'completed' => &$created,\r
-                               'url' => &$url\r
-                       )\r
+               $param = array(\r
+                       'type'          =>  $type,\r
+                       'args'          =>  $args,\r
+                       'completed'     => &$created,\r
+                       'url'           => &$url\r

                );\r
                );\r

+               $manager->notify('GenerateURL', $param);\r

        }\r
 \r
        // if a plugin created the URL, return it\r
        }\r
 \r
        // if a plugin created the URL, return it\r


@@ -1579,58 +1580,58 @@ function createLink($type, $params) {
        switch ($type) {\r
                case 'item':\r
                        if ($usePathInfo) {\r
        switch ($type) {\r
                case 'item':\r
                        if ($usePathInfo) {\r

-                               $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $params['itemid'];\r
+                               $url = $CONF['ItemURL'] . '/' . $CONF['ItemKey'] . '/' . $args['itemid'];\r

                        } else {\r
                        } else {\r

-                               $url = $CONF['ItemURL'] . '?itemid=' . $params['itemid'];\r
+                               $url = $CONF['ItemURL'] . '?itemid=' . $args['itemid'];\r

                        }\r
                        break;\r
 \r
                case 'member':\r
                        if ($usePathInfo) {\r
                        }\r
                        break;\r
 \r
                case 'member':\r
                        if ($usePathInfo) {\r

-                               $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $params['memberid'];\r
+                               $url = $CONF['MemberURL'] . '/' . $CONF['MemberKey'] . '/' . $args['memberid'];\r

                        } else {\r
                        } else {\r

-                               $url = $CONF['MemberURL'] . '?memberid=' . $params['memberid'];\r
+                               $url = $CONF['MemberURL'] . '?memberid=' . $args['memberid'];\r

                        }\r
                        break;\r
 \r
                case 'category':\r
                        if ($usePathInfo) {\r
                        }\r
                        break;\r
 \r
                case 'category':\r
                        if ($usePathInfo) {\r

-                               $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $params['catid'];\r
+                               $url = $CONF['CategoryURL'] . '/' . $CONF['CategoryKey'] . '/' . $args['catid'];\r

                        } else {\r
                        } else {\r

-                               $url = $CONF['CategoryURL'] . '?catid=' . $params['catid'];\r
+                               $url = $CONF['CategoryURL'] . '?catid=' . $args['catid'];\r

                        }\r
                        break;\r
 \r
                case 'archivelist':\r
                        }\r
                        break;\r
 \r
                case 'archivelist':\r

-                       if (!$params['blogid']) {\r
-                               $params['blogid'] = $CONF['DefaultBlog'];\r
+                       if (!$args['blogid']) {\r
+                               $args['blogid'] = $CONF['DefaultBlog'];\r

                        }\r
 \r
                        if ($usePathInfo) {\r
                        }\r
 \r
                        if ($usePathInfo) {\r

-                               $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $params['blogid'];\r
+                               $url = $CONF['ArchiveListURL'] . '/' . $CONF['ArchivesKey'] . '/' . $args['blogid'];\r

                        } else {\r
                        } else {\r

-                               $url = $CONF['ArchiveListURL'] . '?archivelist=' . $params['blogid'];\r
+                               $url = $CONF['ArchiveListURL'] . '?archivelist=' . $args['blogid'];\r

                        }\r
                        break;\r
 \r
                case 'archive':\r
                        if ($usePathInfo) {\r
                        }\r
                        break;\r
 \r
                case 'archive':\r
                        if ($usePathInfo) {\r

-                               $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$params['blogid'].'/' . $params['archive'];\r
+                               $url = $CONF['ArchiveURL'] . '/' . $CONF['ArchiveKey'] . '/'.$args['blogid'].'/' . $args['archive'];\r

                        } else {\r
                        } else {\r

-                               $url = $CONF['ArchiveURL'] . '?blogid='.$params['blogid'].'&archive=' . $params['archive'];\r
+                               $url = $CONF['ArchiveURL'] . '?blogid='.$args['blogid'].'&archive=' . $args['archive'];\r

                        }\r
                        break;\r
 \r
                case 'blog':\r
                        if ($usePathInfo) {\r
                        }\r
                        break;\r
 \r
                case 'blog':\r
                        if ($usePathInfo) {\r

-                               $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $params['blogid'];\r
+                               $url = $CONF['BlogURL'] . '/' . $CONF['BlogKey'] . '/' . $args['blogid'];\r

                        } else {\r
                        } else {\r

-                               $url = $CONF['BlogURL'] . '?blogid=' . $params['blogid'];\r
+                               $url = $CONF['BlogURL'] . '?blogid=' . $args['blogid'];\r

                        }\r
                        break;\r
        }\r
 \r
                        }\r
                        break;\r
        }\r
 \r

-       return addLinkParams($url, (isset($params['extra'])? $params['extra'] : null));\r
+       return addLinkParams($url, (isset($args['extra'])? $args['extra'] : null));\r

 }\r
 \r
 function createBlogLink($url, $params) {\r
 }\r
 \r
 function createBlogLink($url, $params) {\r