Enforce password checking. Revise the deference between the installed and the latest...

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1097 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/nucleus/libs/ADMIN.php b/utf8/nucleus/libs/ADMIN.php
index e91befc..4f63391 100755 (executable)
--- a/utf8/nucleus/libs/ADMIN.php
+++ b/utf8/nucleus/libs/ADMIN.php
@@ -1,7 +1,7 @@
 <?php\r
 /*\r
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
- * Copyright (C) 2002-2010 The Nucleus Group\r
+ * Copyright (C) 2002-2011 The Nucleus Group\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -13,7 +13,7 @@
  * The code for the Nucleus admin area\r
  *\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
- * @copyright Copyright (C) 2002-2010 The Nucleus Group\r
+ * @copyright Copyright (C) 2002-2011 The Nucleus Group\r
  * @version $Id$\r
  * @version $NucleusJP: ADMIN.php,v 1.21.2.4 2007/10/30 19:04:24 kmorimatsu Exp $\r
  */\r
@@ -2188,21 +2188,28 @@ class ADMIN {
                $password          = postVar('password');\r
                $repeatpassword = postVar('repeatpassword');\r
 \r
-               if ($password != $repeatpassword)\r
+               if (!$password) {
+                       return $this->_showActivationPage($key, _ERROR_PASSWORDMISSING);\r
+               }\r
+               \r
+               if ($password != $repeatpassword) {\r
                        return $this->_showActivationPage($key, _ERROR_PASSWORDMISMATCH);\r
-\r
-               if ($password && (strlen($password) < 6))\r
+               }\r
+               \r
+               if (strlen($password) < 6) {\r
                        return $this->_showActivationPage($key, _ERROR_PASSWORDTOOSHORT);\r
+               }\r
                \r
-               if ($password) {\r
-                       $pwdvalid = true;\r
-                       $pwderror = '';\r
-                       global $manager;\r
-                       $manager->notify('PrePasswordSet',array('password' => $password, 'errormessage' => &$pwderror, 'valid' => &$pwdvalid));\r
-                       if (!$pwdvalid) {\r
-                               return $this->_showActivationPage($key,$pwderror);\r
-                       }\r
+               $pwdvalid = true;\r
+               $pwderror = '';\r
+               \r
+               global $manager;\r
+               $manager->notify('PrePasswordSet',array('password' => $password, 'errormessage' => &$pwderror, 'valid' => &$pwdvalid));\r
+               \r
+               if (!$pwdvalid) {\r
+                       return $this->_showActivationPage($key,$pwderror);\r
                }\r
+               \r
                $error = '';\r
                $manager->notify('ValidateForm', array('type' => 'activation', 'member' => $mem, 'error' => &$error));\r
                if ($error != '')\r
@@ -4376,7 +4383,7 @@ selector();
                <?php              if ($msg) echo "<p>"._MESSAGE.": $msg</p>";\r
                ?>\r
 \r
-\r
+               <div style="width:100%;">\r
                <form method="post" action="index.php">\r
                <div>\r
 \r
@@ -4423,7 +4430,7 @@ selector();
                echo '<br />' . _SKINEDIT_ALLOWEDTEMPLATESS;\r
                $query = 'SELECT tdname as name, tddesc as description FROM '.sql_table('template_desc');\r
                        showlist($query,'table',array('content'=>'shortnames'));\r
-               echo '</div></form>';\r
+               echo '</div></form></div>';\r
                $this->pagefoot();\r
        }\r
 \r
@@ -5027,6 +5034,7 @@ selector();
                $this->updateConfig('CookiePrefix',      postVar('CookiePrefix'));\r
                $this->updateConfig('DebugVars',                postVar('DebugVars'));\r
                $this->updateConfig('DefaultListSize',  postVar('DefaultListSize'));\r
+               $this->updateConfig('AdminCSS',          postVar('AdminCSS'));\r
 \r
                // load new config and redirect (this way, the new language will be used is necessary)\r
                // note that when changing cookie settings, this redirect might cause the user\r
@@ -5243,7 +5251,7 @@ selector();
                <head>\r
                        <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _CHARSET ?>" />\r
                        <title><?php echo htmlspecialchars($CONF['SiteName'])?> - Admin</title>\r
-                       <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<?php echo $baseUrl?>styles/admin.css" />\r
+                       <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<?php echo $baseUrl?>styles/admin_<?php echo $CONF["AdminCSS"]?>.css" />\r
                        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css"\r
                        href="<?php echo $baseUrl?>styles/addedit.css" />\r
 \r
@@ -5283,10 +5291,9 @@ selector();
                                echo '<a href="' . $checkURL . '" title="' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE . '">Nucleus CMS ' . $nucleus['version'] . $codenamestring . '</a>';\r
                                $newestVersion = getLatestVersion();\r
                                $newestCompare = str_replace('/','.',$newestVersion);\r
-                               $newestCompare = intval($newestCompare);\r
                                $currentVersion = str_replace(array('/','v'),array('.',''),$nucleus['version']);\r
                                if ($newestVersion && version_compare($newestCompare,$currentVersion) > 0) {\r
-                                       echo '<br /><a style="color:red" href="http://nucleuscms.org/upgrade.php" title="'._ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE.'">'._ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT.$newestVersion.'</a>';\r
+                                       echo '<br /><a style="color:red" href="'._ADMINPAGEFOOT_OFFICIALURL.'upgrade.php" title="'._ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE.'">'._ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT.$newestVersion.'</a>';\r
                                }\r
                        } else {\r
                                echo 'Nucleus CMS ' . $nucleus['version'] . $codenamestring;\r
@@ -5923,9 +5930,9 @@ selector();
 \r
        }\r
 \r
-       /**\r
-        * @todo document this\r
-        */\r
+/*\r
+ * @todo document this\r
+ */\r
        function action_pluginlist() {\r
                global $member, $manager;\r
 \r
@@ -6041,7 +6048,7 @@ selector();
                if (($plug->supportsFeature('HelpPage') > 0) && (@file_exists($helpFile))) {\r
                        @readfile($helpFile);\r
                } else {\r
-                       echo '<p>Error: ', _ERROR_PLUGNOHELPFILE,'</p>';\r
+                       echo '<p>' . _ERROR .': ', _ERROR_PLUGNOHELPFILE,'</p>';\r
                        echo '<p><a href="index.php?action=pluginlist">(',_BACK,')</a></p>';\r
                }\r
 \r