Dev: update_helper new urls

LimeSurvey · Oct 16, 2015 · 86eaf26 · 86eaf26
1 parent 8974229
commit 86eaf26
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/application/helpers/update/update_helper.php b/application/helpers/update/update_helper.php
@@ -18,16 +18,16 @@
  */
 function CheckForDBUpgrades($subaction = null)
 {
-	$dbversionnumber = Yii::app()->getConfig('dbversionnumber');
+    $dbversionnumber = Yii::app()->getConfig('dbversionnumber');
     $currentDBVersion=GetGlobalSetting('DBVersion');
-	$usertemplaterootdir = Yii::app()->getConfig('usertemplaterootdir');
-	$standardtemplaterootdir = Yii::app()->getConfig('standardtemplaterootdir');
+    $usertemplaterootdir = Yii::app()->getConfig('usertemplaterootdir');
+    $standardtemplaterootdir = Yii::app()->getConfig('standardtemplaterootdir');
     if (intval($dbversionnumber)>intval($currentDBVersion))
     {
         if(isset($subaction) && $subaction=="yes")
         {
             echo Yii::app()->getController()->_getAdminHeader();
-        	echo "<div style='width:90%; padding:1% 5%;background-color:#eee;'>";
+            echo "<div style='width:90%; padding:1% 5%;background-color:#eee;'>";
             Yii::app()->loadHelper('update/updatedb');
             $result=db_upgrade_all(intval($currentDBVersion));
             if ($result)
@@ -37,7 +37,7 @@ function CheckForDBUpgrades($subaction = null)
             }
             else
             {
-                $data = "<p><a href='".Yii::app()->getController()->createUrl("/admin/update/sa/db")."'>".gT("Please fix this error in your database and try again")."</a></p></div>";
+                $data = "<p><a href='".Yii::app()->getController()->createUrl("/admin/databaseupdate/sa/db")."'>".gT("Please fix this error in your database and try again")."</a></p></div>";
             }
             return $data;
         }
@@ -50,8 +50,8 @@ function CheckForDBUpgrades($subaction = null)
 function ShowDBUpgradeNotice() {
     //$error=false;
 
-	//$sitename = Yii::app()->getConfig('sitename');
-	return '<div class="messagebox">'
+    //$sitename = Yii::app()->getConfig('sitename');
+    return '<div class="messagebox">'
     ."<div class='header'>".gT('Database upgrade').'</div><p>'
     .gT('Please verify the following information before continuing with the database upgrade:').'</p><ul>'
     ."<li><b>" .gT('Database type') . ":</b> " . Yii::app()->db->getDriverName() . "</li>"
@@ -61,9 +61,9 @@ function ShowDBUpgradeNotice() {
     ."<li><b>" .gT('Root URL') . ":</b> " . Yii::app()->getController()->createUrl('') . "</li>"
     .'</ul><br/>'
     ."<p>"
-    ."<a href='".Yii::app()->getController()->createUrl("admin/update/sa/db/continue/yes")."'>" . gT('Click here to continue') . "</a>"
+    ."<a href='".Yii::app()->getController()->createUrl("admin/databaseupdate/sa/db/continue/yes")."'>" . gT('Click here to continue') . "</a>"
     ."</p>"
-	.'</div>';
+    .'</div>';
 }
 
 function getDBConnectionStringProperty($sProperty)