OSDN Git Service

管理画面用スキン変数のヘルプのリンク生成部分を変更
authorshizuki <shizuki@kinezumi.net>
Thu, 12 Apr 2012 02:33:55 +0000 (11:33 +0900)
committershizuki <shizuki@kinezumi.net>
Thu, 12 Apr 2012 02:33:55 +0000 (11:33 +0900)
同梱プラグインのコードクリーンアップ
NP_SecurityEnforcerのバグ修正

nucleus/libs/AdminActions.php
nucleus/plugins/NP_Ping.php
nucleus/plugins/NP_SecurityEnforcer.php
nucleus/plugins/NP_SkinFiles.php
nucleus/plugins/NP_Text.php

index ef25184..f6f791b 100644 (file)
@@ -1533,7 +1533,8 @@ class AdminActions extends BaseActions
                                continue;
                        }
                        
-                       echo "<a href=\"{$DIR_ADMINSKINS}documentation/help.html#{$current}\" onclick=\"if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);\">{$current}</a>\n";
+                       echo helplink("adminskinvar-{$current}") . "$current</a>\n";
+//                     echo "<a href=\"{$DIR_ADMINSKINS}documentation/help.html#{$current}\" onclick=\"if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);\">{$current}</a>\n";
                        
                        if ( count($actions) != 0 )
                        {
index c1b191c..0d3f06c 100644 (file)
 
 class NP_Ping extends NucleusPlugin
 {
-       public function getName() { return 'Ping'; }
-       public function getAuthor() { return 'admun (Edmond Hui)'; }
-       public function getURL() { return 'http://edmondhui.homeip.net/nudn'; }
-       public function getVersion() { return '1.81'; }
-       public function getMinNucleusVersion() { return '330'; }
-       public function getDescription() { return _PING_DESC; }
-       public function supportsFeature($what) { return ( $what == 'SqlTablePrefix' ); }
-       public function getEventList(){ return array('JustPosted', 'PostAddItem', 'PostUpdateItem'); }
+       public function getName()
+       {
+               return 'Ping';
+       }
+
+       public function getAuthor()
+       {
+               return 'admun (Edmond Hui)';
+       }
+
+       public function getURL()
+       {
+               return 'http://edmondhui.homeip.net/nudn';
+       }
+
+       public function getVersion()
+       {
+               return '1.81';
+       }
+
+       public function getMinNucleusVersion()
+       {
+               return '330';
+       }
+
+       public function getDescription()
+       {
+               return _PING_DESC;
+       }
+
+       public function supportsFeature($what)
+       {
+               return ( $what == 'SqlTablePrefix' );
+       }
+
+       public function getEventList()
+       {
+               return array('JustPosted', 'PostAddItem', 'PostUpdateItem');
+       }
+
        public function init()
        {
                // include translation file for this plugin
@@ -58,24 +90,24 @@ class NP_Ping extends NucleusPlugin
        public function install()
        {
                // Default, http://pingomatic.com
-               $this->createOption('pingpong_pingomatic', _PING_PINGOM, 'yesno', 'yes');
+               $this->createOption('pingpong_pingomatic',  _PING_PINGOM,    'yesno', 'yes');
                // http://weblogs.com
-               $this->createOption('pingpong_weblogs', _PING_WEBLOGS, 'yesno', 'no');
+               $this->createOption('pingpong_weblogs',     _PING_WEBLOGS,   'yesno', 'no');
                // http://www.technorati.com
-               $this->createOption('pingpong_technorati', _PING_TECHNOR, 'yesno', 'no');
+               $this->createOption('pingpong_technorati',  _PING_TECHNOR,   'yesno', 'no');
                // http://www.blogrolling.com
-               $this->createOption('pingpong_blogrolling', _PING_BLOGR, 'yesno', 'no');
+               $this->createOption('pingpong_blogrolling', _PING_BLOGR,     'yesno', 'no');
                // http://blo.gs
-               $this->createOption('pingpong_blogs', _PING_BLOGS, 'yesno', 'no');
+               $this->createOption('pingpong_blogs',       _PING_BLOGS,     'yesno', 'no');
                // http://weblogues.com/
-               $this->createOption('pingpong_weblogues', _PING_WEBLOGUES, 'yesno', 'no');
+               $this->createOption('pingpong_weblogues',   _PING_WEBLOGUES, 'yesno', 'no');
                // http://blogg.de
-               $this->createOption('pingpong_bloggde', _PING_BLOGGDE, 'yesno', 'no');
+               $this->createOption('pingpong_bloggde',     _PING_BLOGGDE,   'yesno', 'no');
                // Pinging on background
-               $this->createOption('ping_background', _PING_BG, 'yesno', 'no');
-               
-               /* plugin weblog option */
-               $this->createBlogOption('ping_sendping', _PING_SENDPING, 'yesno', 'yes');
+               $this->createOption('ping_background',      _PING_BG,        'yesno', 'no');
+
+               // plugin weblog option
+               $this->createBlogOption('ping_sendping',    _PING_SENDPING,  'yesno', 'yes');
                return;
        }
        
@@ -90,7 +122,7 @@ class NP_Ping extends NucleusPlugin
                }
                
                $bid = intval($data['blogid']);
-               if ($this->getBlogOption($bid, 'ping_sendping') == "yes")
+               if ( $this->getBlogOption($bid, 'ping_sendping') == "yes" )
                {
                        if ( $this->getOption('ping_background') == "yes" )
                        {
@@ -123,9 +155,11 @@ class NP_Ping extends NucleusPlugin
                $iid  = intval($itemid);
                global $manager;
                $item = $manager->getItem($iid,0,0);
-               if ($item) {
+               if ( $item )
+               {
                        $bid = intval(getBlogIDFromItemID($iid));
-                       if ($this->getBlogOption($bid, 'ping_sendping') == "yes" ) {
+                       if ( $this->getBlogOption($bid, 'ping_sendping') == "yes" )
+                       {
                                $this->sendPings(array('blogid' => $bid));
                        }
                }
index fcdbe28..527dcf1 100644 (file)
@@ -16,15 +16,49 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details.
 */
 class NP_SecurityEnforcer extends NucleusPlugin
 {
-       public function getName()               { return 'SecurityEnforcer'; }
-       public function getAuthor()             { return 'Frank Truscott + Cacher + Mocchi'; }
-       public function getURL()                        { return 'http://revcetera.com/ftruscot';       }
-       public function getVersion()    { return '1.02'; }
-       public function getDescription()        { return _SECURITYENFORCER_DESCRIPTION; }
-       public function getMinNucleusVersion()  { return 400; }
-       public function getTableList() { return array(sql_table('plug_securityenforcer')); }
-       public function getEventList() { return array('QuickMenu','PrePasswordSet','CustomLogin','LoginSuccess','LoginFailed','PostRegister'); }
-       public function hasAdminArea() { return 1; }
+       public function getName()
+       {
+               return 'SecurityEnforcer';
+       }
+
+       public function getAuthor()
+       {
+               return 'Frank Truscott + Cacher + Mocchi';
+       }
+
+       public function getURL()
+       {
+               return 'http://revcetera.com/ftruscot';
+       }
+
+       public function getVersion()
+       {
+               return '1.02';
+       }
+
+       public function getDescription()
+       {
+               return _SECURITYENFORCER_DESCRIPTION;
+       }
+
+       public function getMinNucleusVersion()
+       {
+               return 400;
+       }
+
+       public function getTableList()
+       {
+               return array(sql_table('plug_securityenforcer'));
+       }
+
+       public function getEventList()
+       {
+               return array('QuickMenu','PrePasswordSet','CustomLogin','LoginSuccess','LoginFailed','PostRegister');
+       }
+
+       public function hasAdminArea() {
+               return 1;
+       }
        
        public function supportsFeature($what)
        {
@@ -40,13 +74,13 @@ class NP_SecurityEnforcer extends NucleusPlugin
                global $CONF;
                
                // Need to make some options
-               $this->createOption('quickmenu', '_SECURITYENFORCER_OPT_QUICKMENU', 'yesno', 'yes');
-               $this->createOption('del_uninstall_data', '_SECURITYENFORCER_OPT_DEL_UNINSTALL_DATA', 'yesno','no');
-               $this->createOption('enable_security', '_SECURITYENFORCER_OPT_ENABLE', 'yesno','yes');
-               $this->createOption('pwd_min_length', '_SECURITYENFORCER_OPT_PWD_MIN_LENGTH', 'text','8');
-               $this->createOption('pwd_complexity', '_SECURITYENFORCER_OPT_PWD_COMPLEXITY', 'select','0', '_SECURITYENFORCER_OPT_SELECT_OFF_COMP|0|_SECURITYENFORCER_OPT_SELECT_ONE_COMP|1|_SECURITYENFORCER_OPT_SELECT_TWO_COMP|2|_SECURITYENFORCER_OPT_SELECT_THREE_COMP|3|_SECURITYENFORCER_OPT_SELECT_FOUR_COMP|4;datatype=numerical');
-               $this->createOption('max_failed_login', '_SECURITYENFORCER_OPT_MAX_FAILED_LOGIN', 'text', '5');
-               $this->createOption('login_lockout', '_SECURITYENFORCER_OPT_LOGIN_LOCKOUT', 'text', '15');
+               $this->createOption('quickmenu',          _SECURITYENFORCER_OPT_QUICKMENU,          'yesno', 'yes');
+               $this->createOption('del_uninstall_data', _SECURITYENFORCER_OPT_DEL_UNINSTALL_DATA, 'yesno','no');
+               $this->createOption('enable_security',    _SECURITYENFORCER_OPT_ENABLE,             'yesno','yes');
+               $this->createOption('pwd_min_length',     _SECURITYENFORCER_OPT_PWD_MIN_LENGTH,     'text','8');
+               $this->createOption('pwd_complexity',     _SECURITYENFORCER_OPT_PWD_COMPLEXITY,     'select', '0', _SECURITYENFORCER_OPT_SELECT_OFF_COMP . '|0|' . _SECURITYENFORCER_OPT_SELECT_ONE_COMP . '|1|' . _SECURITYENFORCER_OPT_SELECT_TWO_COMP . '|2|' . _SECURITYENFORCER_OPT_SELECT_THREE_COMP . '3|' . _SECURITYENFORCER_OPT_SELECT_FOUR_COMP . '4;datatype=numerical');
+               $this->createOption('max_failed_login',   _SECURITYENFORCER_OPT_MAX_FAILED_LOGIN,   'text', '5');
+               $this->createOption('login_lockout',      _SECURITYENFORCER_OPT_LOGIN_LOCKOUT,      'text', '15');
                
                // create needed tables
                sql_query("CREATE TABLE IF NOT EXISTS ". sql_table('plug_securityenforcer').
@@ -83,7 +117,7 @@ class NP_SecurityEnforcer extends NucleusPlugin
                $this->pwd_min_length   = (integer) $this->getOption('pwd_min_length');
                $this->pwd_complexity   = (integer) $this->getOption('pwd_complexity');
                $this->max_failed_login = (integer) $this->getOption('max_failed_login');
-               $this->login_lockout            = (integer) $this->getOption('login_lockout');
+               $this->login_lockout    = (integer) $this->getOption('login_lockout');
                return;
        }
        
@@ -167,17 +201,17 @@ class NP_SecurityEnforcer extends NucleusPlugin
                global $_SERVER;
                $login = $data['login'];
                $ip = $_SERVER['REMOTE_ADDR'];
-               sql_query("DELETE FROM ".sql_table('plug_securityenforcer')." WHERE lastfail < ".(time() - ($this->login_lockout * 60)));
-               $query = "SELECT fails as result FROM ".sql_table('plug_securityenforcer')." ";
-               $query .= "WHERE login='".sql_real_escape_string($login)."'";
+               sql_query("DELETE FROM " . sql_table('plug_securityenforcer') . " WHERE lastfail < " . (time() - ($this->login_lockout * 60)));
+               $query = "SELECT fails as result FROM " . sql_table('plug_securityenforcer') . " ";
+               $query .= "WHERE login='" . sql_real_escape_string($login) . "'";
                $flogin = quickQuery($query); 
-               $query = "SELECT fails as result FROM ".sql_table('plug_securityenforcer')." ";
-               $query .= "WHERE login='".sql_real_escape_string($ip)."'";
+               $query = "SELECT fails as result FROM " . sql_table('plug_securityenforcer') . " ";
+               $query .= "WHERE login='" . sql_real_escape_string($ip) . "'";
                $fip = quickQuery($query); 
                
                if ( $flogin >= $this->max_failed_login || $fip >= $this->max_failed_login )
                {
-                       $data['success'] = 0;
+                       $data['success']    = 0;
                        $data['allowlocal'] = 0;
                        $info = sprintf(_SECURITYENFORCER_LOGIN_DISALLOWED, Entity::hsc($login), Entity::hsc($ip));
                        ActionLog::add(INFO, $info);
@@ -195,8 +229,8 @@ class NP_SecurityEnforcer extends NucleusPlugin
                global $_SERVER;
                $login = $data['username'];
                $ip = $_SERVER['REMOTE_ADDR'];
-               sql_query("DELETE FROM ".sql_table('plug_securityenforcer')." WHERE login='".sql_real_escape_string($login)."'");
-               sql_query("DELETE FROM ".sql_table('plug_securityenforcer')." WHERE login='".sql_real_escape_string($ip)."'");
+               sql_query("DELETE FROM " . sql_table('plug_securityenforcer') . " WHERE login='" . sql_real_escape_string($login) . "'");
+               sql_query("DELETE FROM " . sql_table('plug_securityenforcer') . " WHERE login='" . sql_real_escape_string($ip) . "'");
                return;
        }
        
@@ -210,23 +244,23 @@ class NP_SecurityEnforcer extends NucleusPlugin
                global $_SERVER;
                $login = $data['username'];
                $ip = $_SERVER['REMOTE_ADDR'];
-               $lres = sql_query("SELECT * FROM ".sql_table('plug_securityenforcer')." WHERE login='".sql_real_escape_string($login)."'");
+               $lres = sql_query("SELECT * FROM " . sql_table('plug_securityenforcer') . " WHERE login='" . sql_real_escape_string($login) . "'");
                if ( sql_num_rows($lres) )
                {
-                       sql_query("UPDATE ".sql_table('plug_securityenforcer')." SET fails=fails+1, lastfail=".time()." WHERE login='".sql_real_escape_string($login)."'");
+                       sql_query("UPDATE " . sql_table('plug_securityenforcer') . " SET fails=fails+1, lastfail=" . time() . " WHERE login='" . sql_real_escape_string($login) . "'");
                }
                else
                {
-                       sql_query("INSERT INTO ".sql_table('plug_securityenforcer')." (login,fails,lastfail) VALUES ('".sql_real_escape_string($login)."',1,".time().")");
+                       sql_query("INSERT INTO " . sql_table('plug_securityenforcer') . " (login,fails,lastfail) VALUES ('" . sql_real_escape_string($login) . "',1," . time() . ")");
                }
-               $lres = sql_query("SELECT * FROM ".sql_table('plug_securityenforcer')." WHERE login='".sql_real_escape_string($ip)."'");
+               $lres = sql_query("SELECT * FROM " . sql_table('plug_securityenforcer') . " WHERE login='" . sql_real_escape_string($ip) . "'");
                if ( sql_num_rows($lres) )
                {
-                       sql_query("UPDATE ".sql_table('plug_securityenforcer')." SET fails=fails+1, lastfail=".time()." WHERE login='".sql_real_escape_string($ip)."'");
+                       sql_query("UPDATE " . sql_table('plug_securityenforcer') . " SET fails=fails+1, lastfail=" . time() . " WHERE login='" . sql_real_escape_string($ip) . "'");
                }
                else
                {
-                       sql_query("INSERT INTO ".sql_table('plug_securityenforcer')." (login,fails,lastfail) VALUES ('".sql_real_escape_string($ip)."',1,".time().")");
+                       sql_query("INSERT INTO " . sql_table('plug_securityenforcer') . " (login,fails,lastfail) VALUES ('" . sql_real_escape_string($ip) . "',1," . time() . ")");
                }
                return;
        }
@@ -250,17 +284,17 @@ class NP_SecurityEnforcer extends NucleusPlugin
                        $complexity = 4;
                }
                
-               $ucchars = "[A-Z]";
-               $lcchars = "[a-z]";
-               $numchars = "[0-9]";
-               $ochars = "[-~!@#$%^&*()_+=,.<>?:;|]";
+               $ucchars   = "[A-Z]";
+               $lcchars   = "[a-z]";
+               $numchars  = "[0-9]";
+               $ochars    = "[-~!@#$%^&*()_+=,.<>?:;|]";
                $chartypes = array($ucchars, $lcchars, $numchars, $ochars);
-               $tot = array(0,0,0,0);
-               $i = 0;
+               $tot       = array(0,0,0,0);
+               $i         = 0;
                
                foreach ( $chartypes as $value )
                {
-                       $tot[$i] = preg_match("#{$value}#", $passwd);
+                       $tot[$i] = preg_match('#' . $value . '#', $passwd);
                        $i = $i + 1;
                }
                
index 3806db9..1c42c0a 100644 (file)
@@ -1,6 +1,7 @@
 <?php
 
-class NP_SkinFiles extends NucleusPlugin {
+class NP_SkinFiles extends NucleusPlugin
+{
 
    /* ==========================================================================================
        * Nucleus SkinFiles Plugin
@@ -44,14 +45,40 @@ class NP_SkinFiles extends NucleusPlugin {
        * v2.02 kimitake - multilingual support, modified form button for IE
        */
        
-       public function getName()                       { return 'SkinFiles'; }
-       public function getAuthor()                     { return 'Misc authors'; }
-       public function getURL()                        { return 'http://www.nucleuscms.org/'; }
-       public function getVersion()            { return '2.02'; }
-       public function getDescription()        { return 'A simple file manager for skins.';    }
-       public function hasAdminArea()          { return 1; }
-       public function getEventList()          { return array('QuickMenu'); }
-       
+       public function getName()
+       {
+               return 'SkinFiles';
+       }
+       public function getAuthor()
+       {
+               return 'Misc authors';
+       }
+
+       public function getURL()
+       {
+               return 'http://www.nucleuscms.org/';
+       }
+
+       public function getVersion()
+       {
+               return '2.02';
+       }
+
+       public function getDescription()
+       {
+               return 'A simple file manager for skins.';
+       }
+
+       public function hasAdminArea()
+       {
+               return 1;
+       }
+
+       public function getEventList()
+       {
+               return array('QuickMenu');
+       }
+
        public function supportsFeature($what)
        {
                if ( $what == 'SqlTablePrefix' )
index 7542560..007d6e3 100644 (file)
@@ -22,21 +22,56 @@ class NP_Text extends NucleusPlugin
        public $errorLogged = false;
        public $constantPrefix = "SL_";
        
-       public function getName()                       { return 'Text'; }
-       public function getAuthor()                     { return 'Armon Toubman'; }
-       public function getURL()                        { return 'http://forum.nucleuscms.org/viewtopic.php?t=14904'; }
-       public function getVersion()            { return '0.53'; }
-       public function getDescription()        { return 'Display constants from translation files: <%Text(CONSTANT)%>'; }
-       public function getEventList()          { return array('PreSkinParse'); }
-       public function supportsFeature($feature)       { return ( $feature == 'SqlTablePrefix' ); }
-       public function install()                       { return; }
-       public function uninstall()                     { return; }
+       public function getName()
+       {
+               return 'Text';
+       }
+       public function getAuthor()
+       {
+               return 'Armon Toubman';
+       }
+
+       public function getURL()
+       {
+               return 'http://forum.nucleuscms.org/viewtopic.php?t=14904';
+       }
+
+       public function getVersion()
+       {
+               return '0.53';
+       }
+
+       public function getDescription()
+       {
+               return 'Display constants from translation files: <%Text(CONSTANT)%>';
+       }
+
+       public function getEventList()
+       {
+               return array('PreSkinParse');
+       }
+
+       public function supportsFeature($feature)
+       {
+               return ( $feature == 'SqlTablePrefix' );
+       }
+
+       public function install()
+       {
+               return;
+       }
+
+       public function uninstall()
+       {
+               return;
+       }
+
        public function init()
        {
                $this->incModePref = $this->skin_incmodepref();
                return;
        }
-       
+
        public function event_PreSkinParse()
        {
                global $member;
@@ -116,7 +151,8 @@ class NP_Text extends NucleusPlugin
                        $filename = $filename.".php";
                }
                
-               if( is_file($filename) ) {
+               if ( is_file($filename) )
+               {
                        include($filename);
                }
                else
@@ -124,7 +160,7 @@ class NP_Text extends NucleusPlugin
                        addToLog(1, "NP_Text cannot find ".$filename);
                }
                
-               if( defined($this->constantPrefix.$constant) )
+               if ( defined($this->constantPrefix.$constant) )
                {
                        echo constant($this->constantPrefix.$constant);
                }
@@ -142,7 +178,7 @@ class NP_Text extends NucleusPlugin
        private function skin_incmodepref()
        {
                global $currentSkinName;
-               $sql = "SELECT * FROM ".sql_table("skin_desc")." WHERE sdname = '".$currentSkinName."'";
+               $sql = "SELECT * FROM " . sql_table("skin_desc") . " WHERE sdname = '" . $currentSkinName . "'";
                $result = sql_query($sql);
                $row = sql_fetch_array($result, MYSQL_ASSOC);
                return array($row['sdincmode'], $row['sdincpref']);