Few changes in Installer.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10701 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Aug 12, 2011 · ed1c838 · ed1c838
1 parent 41b4896
commit ed1c838
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 9 deletions.
diff --git a/application/controllers/installer.php b/application/controllers/installer.php
@@ -116,7 +116,7 @@ function install($step=0)
                 }
 
                 //directory permissions checking 
-                // chill.php file check
+                // root directory file check
 
                 if (file_exists($this->config->item('rootdir')))
                 {
@@ -128,6 +128,7 @@ function install($step=0)
                     else
                     {
                         $data['directoryWritable'] = "Unwritable";
+                        $data['derror'] = true;
                         $proceed=false;
                     }
 
@@ -136,6 +137,7 @@ function install($step=0)
                 {
                     $data['directoryPresent'] = "Not Found";
                     $data['directoryWritable'] = "";
+                    $data['derror'] = true;
                     $proceed=false;
                 }
                 // tmp directory check
@@ -150,6 +152,7 @@ function install($step=0)
                     else
                     {
                         $data['tmpdirWritable'] = "Unwritable";
+                        $data['terror'] = true;
                         $proceed=false;
                     }
 
@@ -158,6 +161,7 @@ function install($step=0)
                 {
                     $data['tmpdirPresent'] = "Not Found";
                     $data['tmpdirWritable'] = "";
+                    $data['terror'] = true;
                     $proceed=false;
                 }
                 // templates directory check
@@ -172,6 +176,7 @@ function install($step=0)
                     else
                     {
                         $data['templatedirWritable'] = "Unwritable";
+                        $data['tperror'] = true;
                         $proceed=false;
                     }
 
@@ -180,6 +185,7 @@ function install($step=0)
                 {
                     $data['templatedirPresent'] = "Not Found";
                     $data['templatedirWritable'] = "";
+                    $data['tperror'] = true;
                     $proceed=false;
                 }
                 //upload directory check
@@ -194,6 +200,7 @@ function install($step=0)
                     else
                     {
                         $data['uploaddirWritable'] = "Unwritable";
+                        $data['uerror'] = true;
                         $proceed=false;
                     }
 
@@ -202,6 +209,7 @@ function install($step=0)
                 {
                     $data['uploaddirPresent'] = "Not Found";
                     $data['uploaddirWritable'] = "";
+                    $data['uerror'] = true;
                     $proceed=false;
                 }
 

diff --git a/application/views/installer/license_view.php b/application/views/installer/license_view.php
@@ -1,4 +1,18 @@
 <?php $this->load->view("installer/header_view",array('progressValue' => $progressValue)); ?>
+<script type="text/javascript">
+    function changecbStatus() {
+
+          document.formcheck.accept.checked=(! document.formcheck.accept.checked);
+          if (document.getElementById("cbStatus").checked == false) {
+                $('#next').hide('slow');
+                alert("You need to accept license terms and conditions to proceed further.")
+            } else {
+                $('#next').show('fast');
+            }
+		}
+  </script>
+
+
 <div class="container_6">
 <div class="grid_2 table">
 <p class="title"> &nbsp;Progress</p>

diff --git a/application/views/installer/precheck_view.php b/application/views/installer/precheck_view.php
@@ -42,9 +42,9 @@
 <legend class="content-table-heading">Basic settings</legend>
 <table style="width: 671px; margin-top: 0px; border-top-width: 1px; ">
 <tr>
-<td  style="width: 209px;">&nbsp;</td>
-<td align="center" style="width: 225px;"><b>Reccommended settings</b></td>
-<td align="center" style="width: 225px;"><b>Current settings</b></td>
+<td  style="width: 209px;">Required settings</td>
+<td align="center" style="width: 225px;"><b>Recommended setting</b></td>
+<td align="center" style="width: 225px;"><b>Current setting</b></td>
 </tr>
 <tr>
 <td style="width: 209px;">PHP version</td>
@@ -59,7 +59,8 @@
 <tr>
 <td style="width: 209px;">Root directory</td>
 <td align="center" style="width: 225px;">Found,Writable</td>
-<td align="center" style="width: 225px;"><?php echo $directoryPresent ; if ($directoryWritable) echo ",$directoryWritable" ; ?></td>
+<td align="center" style="width: 225px;"><?php if (isset($derror) && $derror) { ?><b><font color="red"><?php echo $directoryPresent ; if ($directoryWritable) echo ",$directoryWritable" ; ?></font></b>
+<?php } else { ?><?php echo $directoryPresent ; if ($directoryWritable) echo ",$directoryWritable" ; ?> <?php } ?></td>
 </tr>
 <tr>
 <td style="width: 209x;">mysql php library</td>
@@ -69,17 +70,20 @@
 <tr>
 <td style="width: 209px;">/tmp directory</td>
 <td align="center" style="width: 225px;">Found,Writable</td>
-<td align="center" style="width: 225px;"><?php echo $tmpdirPresent ; if ($tmpdirWritable) echo ",$tmpdirWritable" ; ?></td>
+<td align="center" style="width: 225px;"><?php if (isset($terror) && $terror) { ?><b><font color="red"><?php echo $tmpdirPresent ; if ($tmpdirWritable) echo ",$tmpdirWritable" ; ?></font></b>
+<?php } else { ?><?php echo $tmpdirPresent ; if ($tmpdirWritable) echo ",$tmpdirWritable" ; ?><?php } ?></td>
 </tr>
 <tr>
 <td style="width: 209px;">/upload directory</td>
 <td align="center" style="width: 225px;">Found,Writable</td>
-<td align="center" style="width: 225px;"><?php echo $uploaddirPresent ; if ($uploaddirWritable) echo ",$uploaddirWritable" ; ?></td>
+<td align="center" style="width: 225px;"><?php if (isset($uerror) && $uerror) { ?><b><font color="red"><?php echo $uploaddirPresent ; if ($uploaddirWritable) echo ",$uploaddirWritable" ; ?></font></b>
+<?php } else { ?><?php echo $uploaddirPresent ; if ($uploaddirWritable) echo ",$uploaddirWritable" ; ?><?php } ?></td>
 </tr>
 <tr>
 <td style="width: 209px;">/template directory</td>
 <td align="center" style="width: 225px;">Found,Writable</td>
-<td align="center" style="width: 225px;"><?php echo $templatedirPresent ; if ($templatedirWritable) echo ",$templatedirWritable" ; ?></td>
+<td align="center" style="width: 225px;"><?php if (isset($tperror) && $tperror) { ?><b><font color="red"><?php echo $templatedirPresent ; if ($templatedirWritable) echo ",$templatedirWritable" ; ?></font></b>
+<?php } else { ?><?php echo $templatedirPresent ; if ($templatedirWritable) echo ",$templatedirWritable" ; ?><?php } ?></td>
 </tr>
 
 </table>

diff --git a/application/views/installer/success_view.php b/application/views/installer/success_view.php
@@ -81,7 +81,7 @@
 <td align="left" style="width: 300px;"><input class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" type="button" value="Previous" onclick="javascript: window.open('<?php echo site_url("installer/install/license"); ?>', '_top')" /></td>
 <td align="center" style="width: 800px;"><input class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" type="button" value="Delete" onclick="javascript: window.open('<?php echo site_url("installer/deletefiles"); ?>', '_top')"  /></td>
 <td align="right" style="width: 190px;">
-<div id="next" style="font-size:11px;"><input class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" type="submit" value="Next" onclick="javascript: window.open('<?php echo site_url("admin/"); ?>', '_top')" /></div>
+<div id="next" style="font-size:11px;"><input class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" type="submit" value="Administration" onclick="javascript: window.open('<?php echo site_url("admin/"); ?>', '_top')" /></div>
 </form>
 </td>
 </tr>