Dev Fixed update controller routes to new compatible format

LimeSurvey · Dec 6, 2012 · 7643c8d · 7643c8d
1 parent e737059
commit 7643c8d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/application/views/admin/update/step2.php b/application/views/admin/update/step2.php
@@ -69,13 +69,13 @@
     if (count($readonlyfiles)>0)
     {
         echo '<br />'.$clang->gT('When checking your file permissions we found one or more problems. Please check for any error messages above and fix these before you can proceed.');
-        echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/update/step2/")."', '_top')\"";
+        echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/update/sa/step2/")."', '_top')\"";
         echo ">".$clang->gT('Check again')."</button></p>";
     }
     else
     {
         $clang->eT('Please check any problems above and then proceed to the next step.').'<br />';
-        echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/update/step3/")."', '_top')\" ";
+        echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/update/sa/step3/")."', '_top')\" ";
         echo ">".sprintf($clang->gT('Proceed to step %s'),'3')."</button></p>";
 
     }

diff --git a/application/views/admin/update/step3.php b/application/views/admin/update/step3.php
@@ -28,9 +28,9 @@
         echo "<span class='warningtitle'>".$clang->gT('No DB backup created:').'<br />'.$clang->gT('Database backup functionality is currently not available for your database type. Before proceeding please backup your database using a backup tool!').'</span><br /><br />';
     }
 
-$clang->eT('Please check any problems above and then proceed to the final step.');
-    echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/update/step4/")."', '_top')\" ";
-echo ">".sprintf($clang->gT('Proceed to step %s'),'4')."</button></p>";
-echo '</div>';
+    $clang->eT('Please check any problems above and then proceed to the final step.');
+    echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/update/sa/step4/")."', '_top')\" ";
+    echo ">".sprintf($clang->gT('Proceed to step %s'),'4')."</button></p>";
+    echo '</div>';
 
 ?>
diff --git a/application/views/admin/update/update.php b/application/views/admin/update/update.php
@@ -10,7 +10,7 @@
 if ($updatekey==''){
     $clang->eT('You need an update key to run the ComfortUpdate. During the beta test of this update feature the key "LIMESURVEYUPDATE" can be used.');?>
     <br /><br />
-    <?php echo CHtml::form(array("admin/update/index/subaction/keyupdate"), 'post', array('id'=>'keyupdate')); ?>
+    <?php echo CHtml::form(array("admin/update/sa/index/subaction/keyupdate"), 'post', array('id'=>'keyupdate')); ?>
     <label for='updatekey'><?php $clang->eT('Please enter a valid update-key:');?> </label>
     <input id="updatekey" name="updatekey" type="text" value="LIMESURVEYUPDATE" /> <input type="submit" value="<?php $clang->eT('Save update key')?>" /></form>
     <?php
@@ -41,13 +41,13 @@
     if ($error)
     {
         echo '<br /><br />'.$clang->gT('When checking your installation we found one or more problems. Please check for any error messages above and fix these before you can proceed.');
-        echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/update/index/")."', '_top')\"";
+        echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/update/sa/index/")."', '_top')\"";
         echo ">".$clang->gT('Check again')."</button></p>";
     }
     else
     {
         echo '<br /><br />'.$clang->gT('Everything looks alright. Please proceed to the next step.');
-        echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/update/step2/")."', '_top')\"";
+        echo "<p><button onclick=\"window.open('".Yii::app()->getController()->createUrl("admin/update/sa/step2/")."', '_top')\"";
         if ($updatekey==''){    echo "disabled='disabled'"; }
         echo ">".sprintf($clang->gT('Proceed to step %s'),'2')."</button></p>";
     }