Dev Replaced references to obsolete sha256 library for the PHP functi…

…on and removed the library
LimeSurvey · May 17, 2012 · 834ead6 · 834ead6
1 parent f1f4460
commit 834ead6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 508 deletions.
diff --git a/application/controllers/InstallerController.php b/application/controllers/InstallerController.php
@@ -36,12 +36,6 @@ class InstallerController extends CController {
     */
     public $lang = null;
 
-    /**
-    * Sha256
-    * @var Sha256
-    */
-    private $sha256;
-
     /**
     * Checks for action specific authorization and then executes an action
     *
@@ -626,10 +620,7 @@ private function stepOptionalConfiguration()
 
                 //checking DB Connection
                 if ($this->connection->getActive() == true) {
-                    $this->loadLibrary('admin/sha256');
-                    $this->sha256 = new SHA256;
-                    $password_hash = $this->sha256->hashing($defaultpass);
-
+                    $password_hash=hash('sha256', $defaultpass);
                     try {
                         $this->connection->createCommand()->insert("{{settings_global}}", array('stg_name' => 'SessionName', 'stg_value' => 'ls'.self::_getRandomID().self::_getRandomID().self::_getRandomID()));
 
@@ -1200,9 +1191,7 @@ function cmd_install_db()
             echo $sError.PHP_EOL;
         }
 
-        $this->loadLibrary('admin/sha256');
-        $this->sha256 = new SHA256;
-        $sPasswordHash = $this->sha256->hashing(Yii::app()->getConfig('defaultpass'));
+        $sPasswordHash=hash('sha256', Yii::app()->getConfig('defaultpass'));
 
         try {
             $this->connection->createCommand()->insert("{{settings_global}}", array('stg_name' => 'SessionName', 'stg_value' => 'ls'.self::_getRandomID().self::_getRandomID().self::_getRandomID()));

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -6952,8 +6952,6 @@ function modifyDatabase($sqlfile='', $sqlstring='')
     global $codeString;
     global $modifyoutput;
 
-    Yii::app()->loadLibrary('admin/sha256','sha256');
-    $sha256 = new sha256;
     $success = true;  // Let's be optimistic
     $modifyoutput='';
 
@@ -6985,7 +6983,7 @@ function modifyDatabase($sqlfile='', $sqlstring='')
                 $command .= $line;
                 $command = str_replace('prefix_', Yii::app()->db->tablePrefix, $command); // Table prefixes
                 $command = str_replace('$defaultuser', Yii::app()->getConfig('defaultuser'), $command);
-                $command = str_replace('$defaultpass', $sha256->hashing(Yii::app()->getConfig('defaultpass')), $command);
+                $command = str_replace('$defaultpass', hash('sha256',Yii::app()->getConfig('defaultpass')), $command);
                 $command = str_replace('$siteadminname', $siteadminname, $command);
                 $command = str_replace('$siteadminemail', $siteadminemail, $command);
                 $command = str_replace('$defaultlang', Yii::app()->getConfig('defaultlang'), $command);
@@ -7116,13 +7114,6 @@ function getPrintableHeader()
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <script type="text/javascript" src="'.$rooturl.'/scripts/jquery/jquery.js"></script>
     <script type="text/javascript" src="'.$homeurl.'/scripts/printablesurvey.js"></script>
-
-    <!--[if lt IE 7]>
-    <script type="text/javascript" src="'.$homeurl.'/scripts/DD_belatedPNG_0.0.8a-min.js"></script>
-    <script>
-    DD_belatedPNG.fix("img");
-    </script>
-    <![endif]-->
     ';
     return $headelements;
 }