From 1f6a8ec61742b0484e664e54958b050082505210 Mon Sep 17 00:00:00 2001
From: Manish Verma <manish.verma@ladybirdweb.com>
Date: Wed, 28 Dec 2016 11:51:40 +0530
Subject: [PATCH] Bug-fix-patch-13

# Installer JavaScript disabled check
# Added 'mbstring' in extension check
# Added max execution time check warning
---
 .../installer/helpdesk/check-js.blade.php     |  9 +--
 .../installer/helpdesk/view2.blade.php        | 47 +++++---------
 .../installer/layout/installer2.blade.php     | 63 +++++++++++++++++++
 3 files changed, 82 insertions(+), 37 deletions(-)
 create mode 100644 resources/views/themes/default1/installer/layout/installer2.blade.php

diff --git a/resources/views/themes/default1/installer/helpdesk/check-js.blade.php b/resources/views/themes/default1/installer/helpdesk/check-js.blade.php
index aa44a40fb..b16f7b07e 100644
--- a/resources/views/themes/default1/installer/helpdesk/check-js.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/check-js.blade.php
@@ -9,11 +9,12 @@ active
        
         <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 style="font-size:1.0em">Hello, Sparky! You are just a 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>
+                 <p class="wc-setup-actions step">
+            Have you enabled JavaScript?&nbsp;
+                <a href="{!! $url !!}">Click here</a> to reload the page now.
             </p>
+        </div>
     </noscript>
     </div>
    
diff --git a/resources/views/themes/default1/installer/helpdesk/view2.blade.php b/resources/views/themes/default1/installer/helpdesk/view2.blade.php
index 37c0da96f..4d4ec1f51 100644
--- a/resources/views/themes/default1/installer/helpdesk/view2.blade.php
+++ b/resources/views/themes/default1/installer/helpdesk/view2.blade.php
@@ -12,37 +12,7 @@ active
 
 @section('content')
 
-<?php  //dd(ini_get('disable_functions')); ?> 
-
-
-<?php
-// $sets = explode(",", ini_get('disable_functions'));
-// $required_functions = ['escapeshellarg'];
-// foreach ($sets as $key) {
-//     $key = trim($key);
-//     foreach ($required_functions as $value) {
-//         if($key == $value) {
-//             if (strpos(ini_get('disable_functions'), $key) !== false) {
-//                 dd("found");
-//             } else {
-//                 dd("not - found");
-//             }
-//         }
-//     }
-// }
-// dd($sets);
-
-// // foreach ( as $key => $value) {
-// //     # code...
-// // }
-// if (strpos($to_check, $statement) !== false) {
-//             return true;
-//         } else {
-//             return false;
-//         }
-?>
-
- <div id="form-content">
+<div id="form-content">
 <center><h1>Environment Test</h1></center>
          @if (Session::has('fail_to_change'))
            <div class="woocommerce-message woocommerce-tracker" >
@@ -208,7 +178,7 @@ function validate_zend_compatibility_mode(&$results) {
 function validate_extensions(&$results) {
     $ok = true;
 
-    $required_extensions = array('mcrypt', 'openssl', 'pdo', 'fileinfo', 'curl', 'zip');
+    $required_extensions = array('mcrypt', 'openssl', 'pdo', 'fileinfo', 'curl', 'zip', 'mbstring');
 
     foreach ($required_extensions as $required_extension) {
         if (extension_loaded($required_extension)) {
@@ -277,6 +247,16 @@ function checkDisabledFunctions(&$results) {
     return $ok;
 }
 
+function checkMaxExecutiontime(&$results)
+{
+    $ok = true;
+    if ((int)ini_get('max_execution_time') >=  120) {
+        $results[] = new TestResult("Maximum execution time is as per requirement.", STATUS_OK);
+    } else {
+        $results[] = new TestResult("Maximum execution time is too low. Recommneded execution time is 120 seconds ", STATUS_WARNING);
+    }
+    return $ok;
+}
 // ---------------------------------------------------
 //  Do the magic
 // ---------------------------------------------------
@@ -288,6 +268,7 @@ $memory_ok = validate_memory_limit($results);
 $extensions_ok = validate_extensions($results);
 $file_permission = checkFilePermission($results);
 $required_functions = checkDisabledFunctions($results);
+$check_execution_time = checkMaxExecutiontime($results);
 ?>
 <p class="setup-actions step">
 <?php 
@@ -297,7 +278,7 @@ foreach ($results as $result) {
 ?>
 </p>
 <?php
-if ($php_ok && $memory_ok && $extensions_ok && $file_permission && $required_functions) {
+if ($php_ok && $memory_ok && $extensions_ok && $file_permission && $required_functions && $check_execution_time) {
     ?>
 </div>  
 
diff --git a/resources/views/themes/default1/installer/layout/installer2.blade.php b/resources/views/themes/default1/installer/layout/installer2.blade.php
new file mode 100644
index 000000000..e48ef80ab
--- /dev/null
+++ b/resources/views/themes/default1/installer/layout/installer2.blade.php
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en-US">
+    <head>
+        <meta name="viewport" content="width=device-width">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>Faveo HELPDESK</title>
+        <link rel="shortcut icon" href="{{asset("lb-faveo/media/images/favicon.ico")}}">
+        <link rel="stylesheet" href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">
+        <link rel="stylesheet" href="{{asset("lb-faveo/css/load-styles.css")}}" type="text/css" media="all">
+        <link rel="stylesheet" href="{{asset("lb-faveo/css/css.css")}}" type="text/css" media="all">
+        <link rel="stylesheet" href="{{asset("lb-faveo/css/admin.css")}}" type="text/css" media="all">
+        <link rel="stylesheet" href="{{asset("lb-faveo/css/wc-setup.css")}}" type="text/css" media="all">
+        <link rel="stylesheet" href="{{asset("lb-faveo/css/activation.css")}}" type="text/css" media="all">
+        <link rel="stylesheet" href="{{asset("lb-faveo/css/style.css")}}" type="text/css" media="all">
+        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+        <link href="{{asset("lb-faveo/css/ggpopover.css")}}" rel="stylesheet"/>
+        <link rel="stylesheet" href="{{asset("lb-faveo/css/prism.css")}}">
+        <link rel="stylesheet" href="{{asset("lb-faveo/css/chosen.css")}}">
+    </head>
+    <body class="wc-setup wp-core-ui">
+        <center><h1 id="wc-logo"><a href="http://www.faveohelpdesk.com">
+            <img src="{{asset("lb-faveo/media/installer/faveo.png")}}" alt="faveo" width="
+            250px"></a></h1></center>
+   
+    <div class="wc-setup-content">
+        @yield('content')
+    </div>
+    
+    
+    <p style="text-align: center;"> Copyright &copy; 2015 - <?php echo date('Y')?> · Ladybird Web Solution Pvt Ltd. All Rights Reserved. Powered by <a target="_blank" href="http://www.faveohelpdesk.com">Faveo </a></p>
+    
+
+
+    
+    <script src="{{asset("lb-faveo/js/ggpopover.js")}}"></script>
+    <script type="text/javascript">
+        $('[data-toggle="popover"]').ggpopover();
+    </script>
+    <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js" type="text/javascript"></script> -->
+    <script src="{{asset("lb-faveo/js/chosen.jquery.js")}}" type="text/javascript"></script>
+    <script src="{{asset("lb-faveo/js/prism.js")}}" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript">
+        var config = {
+            '.chosen-select': {},
+            '.chosen-select-deselect': {
+                allow_single_deselect: true
+            },
+            '.chosen-select-no-single': {
+                disable_search_threshold: 10
+            },
+            '.chosen-select-no-results': {
+                no_results_text: 'Oops, nothing found!'
+            },
+            '.chosen-select-width': {
+                width: "95%"
+            }
+        }
+        for (var selector in config) {
+            $(selector).chosen(config[selector]);
+        }
+    </script>
+    </body>
+</html>
\ No newline at end of file