diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php index 203d161db05..5841958d0c0 100644 --- a/auth/mnet/auth.php +++ b/auth/mnet/auth.php @@ -941,7 +941,6 @@ class auth_plugin_mnet extends auth_plugin_base { // run the keepalive client $this->keepalive_client(); - // admin/cron.php should have run srand for us $random100 = rand(0,100); if ($random100 < 10) { // Approximately 10% of the time. // nuke olden sessions diff --git a/backup/cc/entities.class.php b/backup/cc/entities.class.php index e0737fdca11..368c7e0ea6d 100644 --- a/backup/cc/entities.class.php +++ b/backup/cc/entities.class.php @@ -309,7 +309,6 @@ class entities { $source = str_split($source, 1); for ($i = 1; $i <= $length; $i++) { - mt_srand((double) microtime() * 1000000); $num = mt_rand(1, count($source)); $response .= $source[$num - 1]; } diff --git a/lib/adodb/adodb.inc.php b/lib/adodb/adodb.inc.php index af89cf5b29c..f7b1404d837 100644 --- a/lib/adodb/adodb.inc.php +++ b/lib/adodb/adodb.inc.php @@ -169,11 +169,6 @@ die("Illegal path http:// or ftp://"); } - - // Initialize random number generator for randomizing cache flushes - // -- note Since PHP 4.2.0, the seed becomes optional and defaults to a random value if omitted. - srand(((double)microtime())*1000000); - /** * ADODB version as a string. */ diff --git a/lib/adodb/readme_moodle.txt b/lib/adodb/readme_moodle.txt index f35bff68162..3366cea8a69 100644 --- a/lib/adodb/readme_moodle.txt +++ b/lib/adodb/readme_moodle.txt @@ -19,6 +19,6 @@ Added: * readme_moodle.txt - this file ;-) Our changes: - * none + * Removed random seed initialization from lib/adodb/adodb.inc.php:172 skodak, iarenaza, moodler, stronk7 diff --git a/lib/cronlib.php b/lib/cronlib.php index bc5e29abc56..39321cb8485 100644 --- a/lib/cronlib.php +++ b/lib/cronlib.php @@ -67,7 +67,6 @@ function cron_run() { // Run cleanup core cron jobs, but not every time since they aren't too important. // These don't have a timer to reduce load, so we'll use a random number // to randomly choose the percentage of times we should run these jobs. - srand ((double) microtime() * 10000000); $random100 = rand(0,100); if ($random100 < 20) { // Approximately 20% of the time. mtrace("Running clean-up tasks..."); diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 2b3b80bf45a..99735c63d70 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -9213,7 +9213,6 @@ function random_string ($length=15) { $pool .= 'abcdefghijklmnopqrstuvwxyz'; $pool .= '0123456789'; $poollen = strlen($pool); - mt_srand ((double) microtime() * 1000000); $string = ''; for ($i = 0; $i < $length; $i++) { $string .= substr($pool, (mt_rand()%($poollen)), 1); @@ -9234,7 +9233,6 @@ function complex_random_string($length=null) { $pool = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; $pool .= '`~!@#%^&*()_+-=[];,./<>?:{} '; $poollen = strlen($pool); - mt_srand ((double) microtime() * 1000000); if ($length===null) { $length = floor(rand(24,32)); } @@ -9542,7 +9540,6 @@ function unformat_float($locale_float, $strict = false) { */ function swapshuffle($array) { - srand ((double) microtime() * 10000000); $last = count($array) - 1; for ($i=0;$i<=$last;$i++) { $from = rand(0,$last); @@ -9582,7 +9579,6 @@ function swapshuffle_assoc($array) { * @return array */ function draw_rand_array($array, $draws) { - srand ((double) microtime() * 10000000); $return = array(); diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php index 442f9f09abc..4d431a5fcda 100644 --- a/lib/tests/accesslib_test.php +++ b/lib/tests/accesslib_test.php @@ -2016,12 +2016,10 @@ class accesslib_testcase extends advanced_testcase { $userids = array_slice($userids, 0, 5); } - // Random time! - //srand(666); - foreach($userids as $userid) { // no guest or deleted - // each user gets 0-10 random roles + foreach ($userids as $userid) { // No guest or deleted. + // Each user gets 0-10 random roles. $rcount = rand(0, 10); - for($j=0; $j<$rcount; $j++) { + for ($j=0; $j<$rcount; $j++) { $roleid = $roles[rand(0, count($roles)-1)]; $contextid = $contexts[rand(0, count($contexts)-1)]->id; role_assign($roleid, $userid, $contextid);