FIX: デバッグ動作時に発生する警告に対処

ACTIONS.php
 変数名の大文字小文字の不一致
ADMIN.php
 存在しないkey値の参照、変数の未定義
BLOG.php
 変数の未定義
ITEMACTIONS.php
 データ作成方法の不一致（StdClass/Array）による不正参照
MANAGER.php
 参照渡しすべき引数の値渡し
PAGEFACTORY.php
 存在しないkey値の参照、変数名の大文字小文字の不一致
PLUGIN.php
 存在しないkey値の参照
PLUGINADMIN.php
 global変数の定義漏れ
showlist.php
 存在しないkey値の参照
media.php
 変数の未定義
plugins/NP_SecurityEnforcer.php
 存在しないkey値の参照
plugins/NP_SkinFiles.php
 条件判定時の前提条件確認漏れ
plugins/securityenforcer/index.php
 変数の未定義

plugins/NP_MediaFiles.php において、ディレクトリ作成処理時に警告が表示されるが
意図する動作が不明なため未対処。

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index a56c433..354b5be 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -636,7 +636,7 @@ class ACTIONS extends BaseActions {
                global $blog, $manager;
                
                // when no blog found
-               if (($blogName == '') && (!is_object($blog)))
+               if (($blogname == '') && (!is_object($blog)))
                        return 0;
                        
                if ($blogname == '') {

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 907617d..3e585d5 100755 (executable)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -821,7 +821,7 @@ class ADMIN {
                if ($iForcedBlogInclude != -1)\r
                        $aBlogIds[] = intval($iForcedBlogInclude);\r
 \r
-               if (($member->isAdmin()) && ($CONF['ShowAllBlogs']))\r
+               if (($member->isAdmin()) && (array_key_exists('ShowAllBlogs', $CONF) && $CONF['ShowAllBlogs']))\r
                        $queryBlogs =  'SELECT bnumber FROM '.sql_table('blog').' ORDER BY bname';\r
                else\r
                        $queryBlogs =  'SELECT bnumber FROM '.sql_table('blog').', '.sql_table('team').' WHERE tblog=bnumber and tmember=' . $member->getID();\r
@@ -842,6 +842,8 @@ class ADMIN {
                if ($mode == 'category') {\r
                        if (sql_num_rows($blogs) > 1)\r
                                $multipleBlogs = 1;\r
+                       else\r
+                               $multipleBlogs = 0;\r
 \r
                        while ($oBlog = sql_fetch_object($blogs)) {\r
                                if ($multipleBlogs)\r

diff --git a/nucleus/libs/BLOG.php b/nucleus/libs/BLOG.php
index ae6a09d..6c76695 100755 (executable)
--- a/nucleus/libs/BLOG.php
+++ b/nucleus/libs/BLOG.php
@@ -279,6 +279,7 @@ class BLOG {
                $body      = $body;
                $more      = $more;
                $catid    = intval($catid);
+               $isFuture = 0;
 
                // convert newlines to <br />
                if ($this->convertBreaks()) {

diff --git a/nucleus/libs/ITEMACTIONS.php b/nucleus/libs/ITEMACTIONS.php
index 9717549..e9afa99 100644 (file)
--- a/nucleus/libs/ITEMACTIONS.php
+++ b/nucleus/libs/ITEMACTIONS.php
@@ -123,7 +123,11 @@ class ITEMACTIONS extends BaseActions {
        function setCurrentItem(&$item) {
                $this->currentItem =& $item;
                global $currentitemid;
-               $currentitemid = $this->currentItem->itemid;
+               if (is_array($this->currentItem)) {
+                       $currentitemid = $this->currentItem['itemid'];
+               } else {
+                       $currentitemid = $this->currentItem->itemid;
+               }
        }
        
        function setBlog(&$blog) {\r

diff --git a/nucleus/libs/MANAGER.php b/nucleus/libs/MANAGER.php
index e0acd5f..fa6686b 100755 (executable)
--- a/nucleus/libs/MANAGER.php
+++ b/nucleus/libs/MANAGER.php
@@ -407,7 +407,7 @@ class MANAGER {
       *     Can contain any type of data, depending on the event type. Usually this is
       *     an itemid, blogid, ... but it can also be an array containing multiple values
       */
-    function notify($eventName, $data) {
+    function notify($eventName, &$data) {
         // load subscription list if needed
         if (!is_array($this->subscriptions))
             $this->_loadSubscriptions();

diff --git a/nucleus/libs/PAGEFACTORY.php b/nucleus/libs/PAGEFACTORY.php
index 6f2b2b2..b303bc9 100755 (executable)
--- a/nucleus/libs/PAGEFACTORY.php
+++ b/nucleus/libs/PAGEFACTORY.php
@@ -169,7 +169,7 @@ class PAGEFACTORY extends BaseActions {
 \r
        // create category dropdown box\r
        function parse_categories($startidx = 0) {\r
-                       if ($this->variables['catid'])\r
+                       if (array_key_exists('catid', $this->variables) && $this->variables['catid'])\r
                                $catid = $this->variables['catid'];                             // on edit item\r
                        else\r
                                $catid = $this->blog->getDefaultCategory();             // on add item\r
@@ -395,7 +395,7 @@ class PAGEFACTORY extends BaseActions {
                                $manager->notify('AddItemFormExtras', $param);\r
                                break;\r
                        case 'edit':\r
-                               $PARAM = array(\r
+                               $param = array(\r
                                        'variables'     =>  $this->variables,\r
                                        'blog'          => &$this->blog,\r
                                        'itemid'        =>  $this->variables['itemid']\r

diff --git a/nucleus/libs/PLUGIN.php b/nucleus/libs/PLUGIN.php
index c27877a..db63145 100755 (executable)
--- a/nucleus/libs/PLUGIN.php
+++ b/nucleus/libs/PLUGIN.php
@@ -510,8 +510,10 @@
                 */
                function _getOID($context, $name) {
                        $key = $context . '_' . $name;
-                       $info = $this->_aOptionToInfo[$key];
-                       if (is_array($info)) return $info['oid'];
+                       if (array_key_exists($key, $this->_aOptionToInfo)) {
+                               $info = $this->_aOptionToInfo[$key];
+                               if (is_array($info)) return $info['oid'];
+                       }
 
                        // load all OIDs for this plugin from the database
                        $this->_aOptionToInfo = array();
@@ -523,8 +525,13 @@
                        }
                        sql_free_result($res);
 
-                       return $this->_aOptionToInfo[$key]['oid'];
+                       if (array_key_exists($key, $this->_aOptionToInfo)) {
+                               return $this->_aOptionToInfo[$key]['oid'];
+                       } else {
+                               return null;
+                       }
                }
+               
                function _getDefVal($context, $name) {
                        $key = $context . '_' . $name;
                        $info = $this->_aOptionToInfo[$key];
@@ -637,7 +644,7 @@
                                                $meta = NucleusPlugin::getOptionMeta($o->oextra);
 
                                                // if the option is readonly or hidden it may not be saved
-                                               if (($meta['access'] != 'readonly') && ($meta['access'] != 'hidden')) {
+                                               if (!array_key_exists('access', $meta) || (($meta['access'] != 'readonly') && ($meta['access'] != 'hidden'))) {
 
                                                        $value = undoMagic($value);     // value comes from request
 
@@ -650,7 +657,7 @@
                                                        }
 
                                                        // check the validity of numerical options
-                                                       if (($meta['datatype'] == 'numerical') && (!is_numeric($value))) {
+                                                       if (array_key_exists('datatype', $meta) && ($meta['datatype'] == 'numerical') && (!is_numeric($value))) {
                                                                //the option must be numeric, but the it isn't
                                                                //use the default for this option
                                                                $value = $o->odef;

diff --git a/nucleus/libs/PLUGINADMIN.php b/nucleus/libs/PLUGINADMIN.php
index 715b201..d2700a7 100755 (executable)
--- a/nucleus/libs/PLUGINADMIN.php
+++ b/nucleus/libs/PLUGINADMIN.php
@@ -28,7 +28,7 @@ class PluginAdmin {
 \r
        function PluginAdmin($pluginName)\r
        {\r
-               global $manager;\r
+               global $manager, $DIR_LIBS;\r
                include_once($DIR_LIBS . 'ADMIN.php');
                \r
                $this->strFullName = 'NP_' . $pluginName;\r

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index c3d5e46..17fa128 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -272,7 +272,7 @@ function listplug_plugOptionRow($current) {
        $meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
 
        // only if it is not a hidden option write the controls to the page
-       if ($meta['access'] != 'hidden') {
+       if (!array_key_exists('access', $meta) || $meta['access'] != 'hidden') {
                echo '<td>',htmlspecialchars($current['description']?$current['description']:$current['name']),'</td>';
                echo '<td>';
                switch($current['type']) {
@@ -307,15 +307,17 @@ function listplug_plugOptionRow($current) {
                                //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
 
                                echo '<input type="text" size="40" maxlength="128" name="',htmlspecialchars($varname),'" value="',htmlspecialchars($current['value']),'"';
-                               if ($meta['datatype'] == 'numerical') {
+                               if (array_key_exists('datatype', $meta) && $meta['datatype'] == 'numerical') {
                                        echo ' onkeyup="checkNumeric(this)" onblur="checkNumeric(this)"';
                                }
-                               if ($meta['access'] == 'readonly') {
+                               if (array_key_exists('access', $meta) && $meta['access'] == 'readonly') {
                                        echo ' readonly="readonly"';
                                }
                                echo ' />';
                }
-               echo $current['extra'];
+               if (array_key_exists('extra', $current)) {
+                       echo $current['extra'];
+               }
                echo '</td>';
        }
 }

diff --git a/nucleus/media.php b/nucleus/media.php
index ddeebaf..3ee21a2 100755 (executable)
--- a/nucleus/media.php
+++ b/nucleus/media.php
@@ -164,7 +164,10 @@ function media_select() {
                </tr>
 
        <?php
-
+       
+       $idxStart = 0;
+       $idxEnd = 0;
+       
        if (sizeof($arr)>0) {
 
                if (($offset + $CONF['MediaPerPage']) >= sizeof($arr))

diff --git a/nucleus/plugins/NP_SecurityEnforcer.php b/nucleus/plugins/NP_SecurityEnforcer.php
index 373615b..c6a4361 100644 (file)
--- a/nucleus/plugins/NP_SecurityEnforcer.php
+++ b/nucleus/plugins/NP_SecurityEnforcer.php
@@ -37,7 +37,7 @@ class NP_SecurityEnforcer extends NucleusPlugin {
                $query = "CREATE TABLE IF NOT EXISTS ". sql_table('plug_securityenforcer').
                                        " ( 
                                        `login` varchar(255),
-                                       `fails` int(11) NOT NULL default '0',                                     
+                                       `fails` int(11) NOT NULL default '0',
                                        `lastfail` bigint NOT NULL default '0',
                                        KEY `login` (`login`)) ENGINE=MyISAM";
                sql_query($query);
@@ -174,7 +174,7 @@ class NP_SecurityEnforcer extends NucleusPlugin {
        }
        
        public function event_PrePluginOptionsEdit($data) {
-               if ($data['plugid'] === $this->getID()) {
+               if (array_key_exists('plugid', $data) && $data['plugid'] === $this->getID()) {
                        foreach($data['options'] as $key => $value){
                                if (defined($value['description'])) {
                                        $data['options'][$key]['description'] = constant($value['description']);

diff --git a/nucleus/plugins/NP_SkinFiles.php b/nucleus/plugins/NP_SkinFiles.php
index bdf3ba3..b673b4f 100644 (file)
--- a/nucleus/plugins/NP_SkinFiles.php
+++ b/nucleus/plugins/NP_SkinFiles.php
@@ -121,7 +121,7 @@ class NP_SkinFiles extends NucleusPlugin {
        }
        
        public function event_PrePluginOptionsEdit($data) {
-               if ($data['plugid'] !== $this->getID()) {
+               if ($data['context'] !== 'global' || $data['plugid'] !== $this->getID()) {
                        return;
                }
                foreach($data['options'] as $key => $value){

diff --git a/nucleus/plugins/securityenforcer/index.php b/nucleus/plugins/securityenforcer/index.php
index 05bd28a..5c2d86c 100644 (file)
--- a/nucleus/plugins/securityenforcer/index.php
+++ b/nucleus/plugins/securityenforcer/index.php
@@ -34,6 +34,7 @@ Admin area for NP_SecurityEnforcer
        $oPluginAdmin->start('');\r
        \r
        // if form to unlock is posted\r
+       $message = '';\r
        if(postVar('action') == 'unlock') {\r
                if (!$manager->checkTicket()) \r
                        doError('Invalid Ticket');\r