update v 1.0.7.5

resources/views/themes/default1/installer/helpdesk/check-js.blade.php

@@ -0,0 +1,20 @@
+@extends('themes.default1.installer.layout.installer2')
+@section('license')
+active
+@stop
+@section('content')
+    <div id="no-js">
+    <noscript>
+        <!-- <meta http-equiv="refresh" content="0;url=step1"> -->
+       
+        <div class="woocommerce-message woocommerce-tracker" >
+                <center id="fail" style="font-size: 1.3em">JavaScript Disabled!</center>
+                <p style="font-size:1.0em">Hello, Sparky! You are just few steps away from your support system. It looks like that JavaScript is disabled in your browser or not supported by your browser. FAVEO doesn't work properly without JavaScript, and it may cause errors in installation. Please check and enable JavaScript in your browser in order to install and run FAVEO to its full extent.</p>
+            </div>
+           <p class="wc-setup-actions step">
+                <a href="{!! $url !!}"><input type="submit" id="submitme" class="button-primary button button-large button-next" value="Reload" name="accept1"></a>
+            </p>
+    </noscript>
+    </div>
+   
+@stop

resources/views/themes/default1/installer/helpdesk/view1.blade.php

@@ -3,6 +3,13 @@
 active
 @stop
 @section('content')
+    <div id="no-js">
+   <noscript>
+        <meta http-equiv="refresh" content="0; URL=JavaScript-disabled">
+        <style type="text/css">#form-content {display: none;}</style>
+    </noscript>
+    </div>
+    <div id="form-content">
         <center><h1>License Agreement</h1></center>
 
         <p>Please read this software license agreement carefully before downloading or using the software. By clicking on the "accept" button, opening the package, or downloading the product, you are consenting to be bound by this agreement. If you do not agree to all of the terms of this agreement, stop the installation process and exit.</p>
@@ -53,8 +60,14 @@ active
                 <input type="submit" class="button button-large button-next" value="Cancel" style="float: left">
             </p>
         </form>
-
+        </div>
     <script>
+        window.onload = function() {
+            if(!window.location.hash) {
+                window.location = window.location + '#loaded';
+                window.location.reload();
+            }
+        }
         var second = document.getElementById('Acceptme').checked = false;
         var first = document.getElementById('submitme').disabled = true;
         var checkme = document.getElementById('Acceptme');

resources/views/themes/default1/installer/helpdesk/view2.blade.php

@@ -11,11 +11,13 @@ active
 
 
 @section('content')
-
+ <div id="form-content">
 <center><h1>Environment Test</h1></center>
-
-
-
+         @if (Session::has('fail_to_change'))
+           <div class="woocommerce-message woocommerce-tracker" >
+                <p id="fail">{!!Session::get('fail_to_change')!!}</p>
+            </div>
+         @endif
 <?php
 define('PROBE_VERSION', '1.0');
 define('PROBE_FOR', 'Faveo HELPDESK '. Config::get('app.version').' and Newer');
@@ -26,7 +28,7 @@ class TestResult {
     var $message;
     var $status;
 
-    function TestResult($message, $status = STATUS_OK) {
+    function __construct($message, $status = STATUS_OK) {
         $this->message = $message;
         $this->status = $status;
     }
@@ -45,7 +47,8 @@ class TestResult {
         <br/>
     This test will check prerequisites required to install Faveo
     
-    <br/><br/>    
+    <br/><br/>
+    <p>NOTE:&nbsp;FAVEO doesn't work properly without JavaScript.  In order to install and run FAVEO to its full extent please make sure JavaScript is enabled in your browser.</p>
      <?php
 
 function validate_php(&$results) {
@@ -61,7 +64,7 @@ function validate_php(&$results) {
 /**
  * Convert filesize value from php.ini to bytes
  *
- * Convert PHP config value (2M, 8M, 200K...) to bytes. This function was taken from PHP documentation. $val is string
+ * Convert PHP config value (2M, 8M, 200K...) to bytes. This function was taken  from PHP documentation. $val is string
  * value that need to be converted
  *
  * @param string $val
@@ -83,6 +86,28 @@ function php_config_value_to_bytes($val) {
     return (integer) $val;
 } // php_config_value_to_bytes
 
+/**
+ * to check file permissions 
+ *
+ */
+function checkFilePermission(&$results) {
+    $path1 = base_path().DIRECTORY_SEPARATOR.'.env';
+    $path2 = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'database.php';
+    $path3 = base_path().DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Http'.DIRECTORY_SEPARATOR.'routes.php';
+    $path4 = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'lfm.php';
+    $f1 = substr(sprintf("%o",fileperms($path1)),-3);
+    $f2 = substr(sprintf("%o",fileperms($path2)),-3);
+    $f3 = substr(sprintf("%o",fileperms($path3)),-3);
+    $f4 = substr(sprintf("%o",fileperms($path4)),-3);
+    if( $f1 >= '644' && $f2 >= '644' && $f3 >= '644' && $f4 >= '644') {
+        $results[] = new TestResult('File permission looks fine', STATUS_OK);
+        return true;
+    } else {
+        $results[] = new TestResult('File permissions needed.<ul><b>Change file permission to "777" for following files</b><li>'.$path1.'</li><li>'.$path2.'</li><li>'.$path3.'</li><li>'.$path4.'</li></ul></br>Change the permission manually on your server or <a href="change-file-permission">click here.</a>', STATUS_ERROR);
+        return false;
+    }
+}
+
 /**
  * Validate memory limit
  *
@@ -201,6 +226,7 @@ $results = array();
 $php_ok = validate_php($results);
 $memory_ok = validate_memory_limit($results);
 $extensions_ok = validate_extensions($results);
+$file_permission = checkFilePermission($results);
 ?>
 <p class="wc-setup-actions step">
 <?php 
@@ -210,7 +236,7 @@ foreach ($results as $result) {
 ?>
 </p>
 <?php
-if ($php_ok && $memory_ok && $extensions_ok ) {
+if ($php_ok && $memory_ok && $extensions_ok && $file_permission ) {
     ?>
 </div>  
 
@@ -250,5 +276,5 @@ if ($php_ok && $memory_ok && $extensions_ok ) {
         {{-- </ul> --}}
       </div>
 </div>
-
+</div>
 @stop

resources/views/themes/default1/installer/helpdesk/view4.blade.php

@@ -43,7 +43,7 @@ define('STATUS_ERROR', 'Error');
 class TestResult {
     var $message;
     var $status;
-    function TestResult($message, $status = STATUS_OK) {
+    function __construct($message, $status = STATUS_OK) {
         $this->message = $message;
         $this->status = $status;
     }

resources/views/themes/default1/installer/helpdesk/view5.blade.php

@@ -17,6 +17,7 @@ active
 @stop
 
 @section('content')
+ <div id="form-content">
 <div ng-app="myApp">
         <h1 style="text-align: center;">Locale Information</h1>
         {!! Form::open(['url'=>route('postaccount')]) !!}
@@ -330,7 +331,9 @@ active
                     </tr>
                 </div>
             </table>
-            <br>
+            <input id="dummy-data" class="input-checkbox" type="checkbox" name="dummy-data">
+            <label for="dummy-data" style="color:#3AA7D9">Install dummy data</label>
+            <br><br>
             <p class="wc-setup-actions step">
                 <input type="submit" id="submitme" class="button-primary button button-large button-next" value="Install">
                 <a href="{{url('step4')}}" class="button button-large button-next" style="float: left">Previous</a>
@@ -342,4 +345,6 @@ active
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0/angular.min.js"></script>
     <script src="{{asset("lb-faveo/js/angular2.js")}}" type="text/javascript"></script>
     </div>
+    </div>
+    
 @stop