[xoops-cvslog 6069] CVS update: xoops2jp/html/core

Back to archive index

NobuNobu nobun****@users*****
2006年 12月 28日 (木) 23:17:48 JST


Index: xoops2jp/html/core/XCube_ActionForm.class.php
diff -u xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.4 xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.5
--- xoops2jp/html/core/XCube_ActionForm.class.php:1.1.2.4	Tue Dec 26 23:30:54 2006
+++ xoops2jp/html/core/XCube_ActionForm.class.php	Thu Dec 28 23:17:48 2006
@@ -2,7 +2,7 @@
 /**
  *
  * @package XCube
- * @version $Id: XCube_ActionForm.class.php,v 1.1.2.4 2006/12/26 14:30:54 nobunobu Exp $
+ * @version $Id: XCube_ActionForm.class.php,v 1.1.2.5 2006/12/28 14:17:48 nobunobu Exp $
  * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
  * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
  *
@@ -135,7 +135,9 @@
 	{
 		if ($this->_mToken == null) {
 			srand(microtime() * 100000);
-			$this->_mToken = md5(XOOPS_SALT . uniqid(rand(), true));
+			$root=&XCube_Root::getSingleton();
+			$salt = $root->getSiteConfig('Cube', 'Salt');
+			$this->_mToken = md5($salt . uniqid(rand(), true));
 			
 			$_SESSION['XCUBE_TOKEN'][$this->getTokenName()] = $this->_mToken;
 		}
Index: xoops2jp/html/core/XCube_FormFile.class.php
diff -u xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.3 xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.4
--- xoops2jp/html/core/XCube_FormFile.class.php:1.1.2.3	Tue Dec 26 23:30:54 2006
+++ xoops2jp/html/core/XCube_FormFile.class.php	Thu Dec 28 23:17:48 2006
@@ -2,7 +2,7 @@
 /**
  *
  * @package XCube
- * @version $Id: XCube_FormFile.class.php,v 1.1.2.3 2006/12/26 14:30:54 nobunobu Exp $
+ * @version $Id: XCube_FormFile.class.php,v 1.1.2.4 2006/12/28 14:17:48 nobunobu Exp $
  * @copyright Copyright 2005, 2006 XOOPS Cube Project <http://xoopscube.org/>
  * @license http://xoopscube.sourceforge.net/bsd_licenses.txt Modified BSD license
  *
@@ -203,7 +203,10 @@
 	*/
 	function _getRandomString($salt='')
 	{
-	    if (empty($salt)) $salt = XOOPS_SALT;
+		if (empty($salt)) {
+			$root=&XCube_Root::getSingleton();
+			$salt = $root->getSiteConfig('Cube', 'Salt');
+		}
 		srand( microtime() *1000000);
 		return md5($salt . rand());
 	}


xoops-cvslog メーリングリストの案内
Back to archive index