[eGroupWare-svn] r49532 - in /trunk: emailadmin/inc/class.emailadmin_imapbase.inc.php mail/inc/class.mail_compose.inc.php

[<ral...@us...>]

Author: ralfbecker
Date: Fri Nov 21 10:33:34 2014
New Revision: 49532

URL: http://svn.stylite.de/viewvc/egroupware?rev=49532&view=rev
Log:
fix compose ID and random string generation to use API auth::randomstring() method

Modified:
    trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php
    trunk/mail/inc/class.mail_compose.inc.php

Modified: trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php?rev=49532&r1=49531&r2=49532&view=diff
==============================================================================
--- trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_imapbase.inc.php Fri Nov 21 10:33:34 2014
@@ -5302,13 +5302,13 @@
 	}
 
 	/**
-	 * getRandomString - function to be used to fetch a random string and md5 encode that one
-	 * @param none
-	 * @return string - a random number which is md5 encoded
-	 */
-	static function getRandomString() {
-		mt_srand((float) microtime() * 1000000);
-		return md5(mt_rand (100000, 999999));
+	 * Get a random string of 32 chars
+	 *
+	 * @return string
+	 */
+	static function getRandomString()
+	{
+		return auth::randomstring(32);
 	}
 
 	/**

Modified: trunk/mail/inc/class.mail_compose.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/inc/class.mail_compose.inc.php?rev=49532&r1=49531&r2=49532&view=diff
==============================================================================
--- trunk/mail/inc/class.mail_compose.inc.php (original)
+++ trunk/mail/inc/class.mail_compose.inc.php Fri Nov 21 10:33:34 2014
@@ -179,7 +179,7 @@
 			// is some style already set and our initalStyle always adds a span with  
 			// and we want to avoid that
 			$isFirstLoad = !($actionToProcess=='composeasnew');//true;
-			$this->composeID = $_content['composeID'] = $this->getComposeID();
+			$this->composeID = $_content['composeID'] = $this->generateComposeID();
 			if (!is_array($_content))
 			{
 				$_content = $this->setDefaults();
@@ -1341,13 +1341,12 @@
 		}
 	}
 
-	// create a hopefully unique id, to keep track of different compose windows
-	// if you do this, you are creating a new email
-	function getComposeID()
+	/**
+	 *  create a unique id, to keep track of different compose windows
+	 */
+	function generateComposeID()
 	{
-		$this->composeID = $this->getRandomString();
-
-		return $this->composeID;
+		return mail_bo::getRandomString();
 	}
 
 	// $_mode can be:
@@ -1756,17 +1755,7 @@
 	}
 
 	/**
-	 * Fetch a random string and md5 encode that one
-	 *
-	 * @param none
-	 * @return string - a random number which is md5 encoded
-	 */
-	function getRandomString() {
-		return mail_bo::getRandomString();
-	}
-
-	/**
-	 * Fetch a random string and md5 encode that one
+	 * Test if string contains one of the keys of an array
 	 *
 	 * @param array arrayToTestAgainst to test its keys against haystack
 	 * @param string haystack