MERGE: リビジョン1730のマージ。

$CONFにsecureCookieKeyがない場合に警告が出力されるのを修正

Revision 1730:
FIX: Warning of 'Notice: Undefined index: secureCookieKey
in /nucleus/libs/MEMBER.php'
'secureCookieKey' key is not alway in $CONF array. If not exists, use
empty string for argument of Member::set_cookie_salt().
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1730

diff --git a/nucleus/libs/MEMBER.php b/nucleus/libs/MEMBER.php
index fe82e2c..0bb02a9 100644 (file)
--- a/nucleus/libs/MEMBER.php
+++ b/nucleus/libs/MEMBER.php
@@ -2,7 +2,7 @@
 \r
 /* \r
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
- * Copyright (C) 2002-2012 The Nucleus Group\r
+ * Copyright (C) 2002-2009 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
@@ -14,7 +14,7 @@
  * A class representing site members\r
  * \r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
- * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
  * @version $Id: MEMBER.php 1616 2012-01-08 09:48:15Z sakamocchi $\r
  */\r
 class Member\r
@@ -189,7 +189,12 @@ class Member
                */\r
                if ( !$this->cookie_salt )\r
                {\r
-                       $this->set_cookie_salt($CONF['secureCookieKey']);\r
+                       $salt = 0;\r
+                       if ( array_key_exists('secureCookieKey', $CONF) )\r
+                       {\r
+                               $salt = $CONF['secureCookieKey'];\r
+                       }\r
+                       $this->set_cookie_salt($salt);\r
                }\r
                \r
                $success = 0;\r
@@ -276,8 +281,14 @@ class Member
                        */\r
                        if ( !$this->cookie_salt )\r
                        {\r
-                               $this->set_cookie_salt($CONF['secureCookieKey']);\r
+                               $salt = 0;\r
+                               if ( array_key_exists('secureCookieKey', $CONF) )\r
+                               {\r
+                                       $salt = $CONF['secureCookieKey'];\r
+                               }\r
+                               $this->set_cookie_salt($salt);\r
                        }\r
+                       \r
                        if ( $this->cookie_salt !== 'none' )\r
                        {\r
                                $ck = $this->hash($ck . $this->cookie_salt);\r