Replace rand() with mt_rand()

midasplatform · Jul 14, 2014 · 132c42b · 132c42b
1 parent 2f0df14
commit 132c42b
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 24 deletions.
diff --git a/core/controllers/UserController.php b/core/controllers/UserController.php
@@ -874,7 +874,7 @@ public function settingsAction()
             return;
             }
 
-          $tmpPath = $this->getDataDirectory('thumbnail').'/'.rand(1, 1000);
+          $tmpPath = $this->getDataDirectory('thumbnail').'/'.mt_rand(1, 1000);
           if(!file_exists($this->getDataDirectory('thumbnail')))
             {
             throw new Zend_Exception("Thumbnail path does not exist: ".$this->getDataDirectory('thumbnail'));
@@ -883,15 +883,15 @@ public function settingsAction()
             {
             mkdir($tmpPath);
             }
-          $tmpPath .= '/'.rand(1, 1000);
+          $tmpPath .= '/'.mt_rand(1, 1000);
           if(!file_exists($tmpPath))
             {
             mkdir($tmpPath);
             }
-          $destionation = $tmpPath."/".rand(1, 1000).'.jpeg';
+          $destionation = $tmpPath."/".mt_rand(1, 1000).'.jpeg';
           while(file_exists($destionation))
             {
-            $destionation = $tmpPath."/".rand(1, 1000).'.jpeg';
+            $destionation = $tmpPath."/".mt_rand(1, 1000).'.jpeg';
             }
           $pathThumbnail = $destionation;
 

diff --git a/core/controllers/components/ExportComponent.php b/core/controllers/components/ExportComponent.php
@@ -166,7 +166,7 @@ function exportBitstreams($userDao, $targetDir, $itemIds, $shouldSymLink)
               // have the same file name, add a '.new' suffix to distinguish them
               if(file_exists($dest))
                 {
-                $dest .= '.'.rand().'.new';
+                $dest .= '.'.mt_rand().'.new';
                 }
               if(!symlink($source, $dest))
                 {

diff --git a/core/controllers/components/UtilityComponent.php b/core/controllers/components/UtilityComponent.php
@@ -700,7 +700,7 @@ public static function generateRandomString($length, $alphabet = null)
     $max = strlen($alphabet) - 1;
     for($i = 0; $i < $length; $i++)
       {
-      $salt .= substr($alphabet, rand(0, $max), 1);
+      $salt .= substr($alphabet, mt_rand(0, $max), 1);
       }
     return $salt;
     }

diff --git a/core/controllers/forms/ImportForm.php b/core/controllers/forms/ImportForm.php
@@ -32,9 +32,7 @@ public function createImportForm($assetstores)
     $form->setAttrib('class', 'importForm');
 
     // Hidden upload id
-    srand(time());
-
-    $uploadId = new Zend_Form_Element_Hidden('uploadid', array('value' => rand()));
+    $uploadId = new Zend_Form_Element_Hidden('uploadid', array('value' => mt_rand()));
     $uploadId->setDecorators(array(
         'ViewHelper',
         array('HtmlTag', array('style' => 'display:none')),

diff --git a/core/models/base/ItemRevisionModelBase.php b/core/models/base/ItemRevisionModelBase.php
@@ -127,10 +127,10 @@ function addBitstream($itemRevisionDao, $bitstreamDao)
           {
           throw new Zend_Exception("Problem thumbnail path: ".UtilityComponent::getDataDirectory('thumbnail'));
           }
-        $destination = $tmpPath.'/'.rand(1, 10000).'.jpeg';
+        $destination = $tmpPath.'/'.mt_rand(1, 10000).'.jpeg';
         while(file_exists($destination))
           {
-          $destination = $tmpPath.'/'.rand(1, 10000).'.jpeg';
+          $destination = $tmpPath.'/'.mt_rand(1, 10000).'.jpeg';
           }
         $pathThumbnail = $destination;
 

diff --git a/core/models/pdo/UserapiModel.php b/core/models/pdo/UserapiModel.php
@@ -111,13 +111,13 @@ function getToken($email, $apikey, $appname)
 
     // seed with microseconds
     list($usec, $sec) = explode(' ', microtime());
-    srand((float) $sec + ((float) $usec * 100000));
+    mt_srand((float) $sec + ((float) $usec * 100000));
 
     $token = "";
     $max = strlen($keychars) - 1;
     for($i = 0; $i < $length; $i++)
       {
-      $token .= substr($keychars, rand(0, $max), 1);
+      $token .= substr($keychars, mt_rand(0, $max), 1);
       }
 
     // Find the api id

diff --git a/modules/remoteprocessing/controllers/components/ApiComponent.php b/modules/remoteprocessing/controllers/components/ApiComponent.php
@@ -234,10 +234,10 @@ public function resultsserver($args)
       mkdir(UtilityComponent::getTempDirectory().'/remoteprocessing');
       }
 
-    $destionation = UtilityComponent::getTempDirectory().'/remoteprocessing/'.rand(1, 1000).time();
+    $destionation = UtilityComponent::getTempDirectory().'/remoteprocessing/'.mt_rand(1, 1000).time();
     while(file_exists($destionation))
       {
-      $destionation = UtilityComponent::getTempDirectory().'/remoteprocessing/'.rand(1, 1000).time();
+      $destionation = UtilityComponent::getTempDirectory().'/remoteprocessing/'.mt_rand(1, 1000).time();
       }
     mkdir($destionation);
 

diff --git a/modules/thumbnailcreator/controllers/components/ImagemagickComponent.php b/modules/thumbnailcreator/controllers/components/ImagemagickComponent.php
@@ -115,10 +115,10 @@ public function createThumbnailFromPath($name, $fullPath, $width, $height, $exac
       {
       throw new Zend_Exception('Temporary thumbnail dir does not exist: '.UtilityComponent::getDataDirectory('thumbnail'));
       }
-    $destination = $tmpPath.'/'.rand(1, 10000).'.jpeg';
+    $destination = $tmpPath.'/'.mt_rand(1, 10000).'.jpeg';
     while(file_exists($destination))
       {
-      $destination = $tmpPath.'/'.rand(1, 10000).'.jpeg';
+      $destination = $tmpPath.'/'.mt_rand(1, 10000).'.jpeg';
       }
     $pathThumbnail = $destination;
 
@@ -198,7 +198,7 @@ public function preprocessByThumbnailer($name, $fullpath)
     $jpegDestination = $tmpPath.'/'.$name.'.jpeg';
     while(file_exists($jpegDestination))
       {
-      $jpegDestination = $tmpPath.'/'.$name.rand(1, 10000).'.jpeg';
+      $jpegDestination = $tmpPath.'/'.$name.mt_rand(1, 10000).'.jpeg';
       }
     $modulesConfig = Zend_Registry::get('configsModules');
     $thumbnailerPath = $modulesConfig['thumbnailcreator']->thumbnailer;

diff --git a/modules/visualize/controllers/components/MainComponent.php b/modules/visualize/controllers/components/MainComponent.php
@@ -451,7 +451,7 @@ public function processParaviewData($itemDao)
       return;
       }
 
-    $thumbnailPath = UtilityComponent::getDataDirectory('thumbnail').'/'.rand(1, 1000);
+    $thumbnailPath = UtilityComponent::getDataDirectory('thumbnail').'/'.mt_rand(1, 1000);
     if(!file_exists(UtilityComponent::getDataDirectory('thumbnail')))
       {
       throw new Zend_Exception("Problem thumbnail path: ".UtilityComponent::getDataDirectory('thumbnail'));
@@ -460,15 +460,15 @@ public function processParaviewData($itemDao)
       {
       mkdir($thumbnailPath);
       }
-    $thumbnailPath .= '/'.rand(1, 1000);
+    $thumbnailPath .= '/'.mt_rand(1, 1000);
     if(!file_exists($thumbnailPath))
       {
       mkdir($thumbnailPath);
       }
-    $destionation = $thumbnailPath."/".rand(1, 1000).'.jpeg';
+    $destionation = $thumbnailPath."/".mt_rand(1, 1000).'.jpeg';
     while(file_exists($destionation))
       {
-      $destionation = $thumbnailPath."/".rand(1, 1000).'.jpeg';
+      $destionation = $thumbnailPath."/".mt_rand(1, 1000).'.jpeg';
       }
     $pathThumbnail = $destionation;
 

diff --git a/tests/ControllerTestCase.php b/tests/ControllerTestCase.php
@@ -53,7 +53,7 @@ public function stopCodeCoverage()
       xdebug_stop_code_coverage();
 
       $file = CMAKE_BINARY_DIR.'/xdebugCoverage/'.md5($_SERVER['SCRIPT_FILENAME']);
-      file_put_contents($file.'.'.md5(uniqid(rand(), true)).'.'.get_class($this), serialize($data));
+      file_put_contents($file.'.'.md5(uniqid(mt_rand(), true)).'.'.get_class($this), serialize($data));
       }
     }
 

diff --git a/tests/DatabaseTestCase.php b/tests/DatabaseTestCase.php
@@ -51,7 +51,7 @@ public function stopCodeCoverage()
       xdebug_stop_code_coverage();
 
       $file = CMAKE_BINARY_DIR.'/xdebugCoverage/'.md5($_SERVER['SCRIPT_FILENAME']);
-      file_put_contents($file.'.'.md5(uniqid(rand(), true)).'.'.get_class($this), serialize($data));
+      file_put_contents($file.'.'.md5(uniqid(mt_rand(), true)).'.'.get_class($this), serialize($data));
       }
     }