Просмотр исходного кода

JonFin PR conflict fix
Fix spelling on proceed
Fixed #738

causefx 8 лет назад
Родитель
Сommit
fa53c735f6
6 измененных файлов с 27 добавлено и 86 удалено
  1. 22 81
      check.php
  2. 1 1
      lang/en.ini
  3. 1 1
      lang/es.ini
  4. 1 1
      lang/fr.ini
  5. 1 1
      lang/it.ini
  6. 1 1
      lang/nl.ini

+ 22 - 81
check.php

@@ -8,95 +8,58 @@ if (file_exists('config/config.php')) {
 }
 
 function check($extension) {
-
-    if (extension_loaded($extension)) :
-        echo '<div class="col-lg-3">';
+    if (extension_loaded($extension)) {
+        echo '<div class="col-lg-2">';
         echo '<div class="panel panel-success">';
         echo '<div class="panel-heading">';
         echo '<h3 class="panel-title">'. $extension . '</h3>';
         echo '</div>';
         echo '<div style="color: gray" class="panel-body">';
-        echo $extension . ' is installed!';
+        echo 'Installed';
         echo '</div></div></div>';
-
-    else :
-        echo '<div class="col-lg-3">';
+    }else{
+        echo '<div class="col-lg-2">';
         echo '<div class="panel panel-danger">';
         echo '<div class="panel-heading">';
         echo '<h3 class="panel-title">'. $extension . '</h3>';
         echo '</div>';
         echo '<div style="color: gray" class="panel-body">';
-        echo $extension . ' is NOT loaded!  Please install it before proceeding';
-
-        if($extension == "PDO_SQLITE") :
-
-            echo '<br/> If you are on Windows, please uncomment this line in php.ini: ;extension=php_pdo_sqlite.dll<br/>If you are on Ununtu, please install php5.3-sqlite or php7-sqlite depending on your version of PHP, then restart PHP service';
-
-        endif;
-
+        echo 'Missing';
         echo '</div></div></div>';
-
-    endif;
-
+    }
 }
 
 function checkFunction($function) {
-
-    if (function_exists($function)) :
-        echo '<div class="col-lg-3">';
+    if (function_exists($function)) {
+        echo '<div class="col-lg-2">';
         echo '<div class="panel panel-success">';
         echo '<div class="panel-heading">';
         echo '<h3 class="panel-title">'. $function . '</h3>';
         echo '</div>';
         echo '<div style="color: gray" class="panel-body">';
-        echo $function . ' is installed!';
-
-        if($function == "MAIL") :
-
-            echo '<br/> **Please make sure you can send email prior to installing as this is needed for password resets**';
-
-        endif;
-
+        echo 'Installed';
         echo '</div></div></div>';
-
-    else :
-        echo '<div class="col-lg-3">';
+    }else{
+        echo '<div class="col-lg-2">';
         echo '<div class="panel panel-danger">';
         echo '<div class="panel-heading">';
         echo '<h3 class="panel-title">'. $function . '</h3>';
         echo '</div>';
         echo '<div style="color: gray" class="panel-body">';
-        echo $function . ' is NOT loaded!  Please install it before proceeding';
-
-        if($function == "MAIL") :
-
-            echo '<br/> **If you do not want to use password resets, this is okay not being installed**  EDIT LINE 31 on user.php to "false" [const use_mail = false]';
-
-        endif;
-
+        echo 'Missing';
         echo '</div></div></div>';
-
-    endif;
-
+    }
 }
 
 function getFilePermission($file) {
-
-    if (file_exists($file)) :
-
+    if (file_exists($file)) {
         $length = strlen(decoct(fileperms($file)))-3;
-
-        if($file{strlen($file)-1}=='/') :
-
+        if($file{strlen($file)-1}=='/') {
             $name = "Folder";
-
-        else :
-
+        }else{
             $name = "File";
-
-        endif;
-
-        if (is_writable($file)) :
+        }
+        if (is_writable($file)) {
             echo '<div class="col-lg-6">';
             echo '<div class="panel panel-success">';
             echo '<div class="panel-heading">';
@@ -105,7 +68,7 @@ function getFilePermission($file) {
             echo '<div style="color: gray" class="panel-body">';
             echo $file . ' is writable!';
             echo '</div></div></div>';
-        else :
+        }else{
             echo '<div class="col-lg-6">';
             echo '<div class="panel panel-danger">';
             echo '<div class="panel-heading">';
@@ -114,48 +77,32 @@ function getFilePermission($file) {
             echo '<div style="color: gray" class="panel-body">';
             echo $file . ' is NOT writable!  Please change the permissions to make it writtable by the PHP User.';
             echo '</div></div></div>';
-
-        endif;
-
-    endif;
+        }
+    }
 }
-
 ?>
 
 <!DOCTYPE html>
-
 <html lang="en" class="no-js">
-
     <head>
-
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="msapplication-tap-highlight" content="no" />
-
         <title>Requirement Checker</title>
-
         <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
         <link rel="stylesheet" href="css/style.css">
         <script src="bower_components/jquery/dist/jquery.min.js"></script>
         <script src="bower_components/jquery.nicescroll/jquery.nicescroll.min.js"></script>
 		<script src="bower_components/slimScroll/jquery.slimscroll.min.js"></script>
-
     </head>
-
     <body id="body-check" class="gray-bg" style="padding: 0;">
-
         <div id="main-wrapper" class="main-wrapper">
-
             <!--Content-->
             <div id="content"  style="margin:0 20px; overflow:hidden">
-
                 <h1><center>Check Requirements & Permissions</center></h1>
-
                 <div class="row">
-
                 <?php
-
                 check("PDO_SQLITE");
                 check("PDO");
                 check("SQLITE3");
@@ -178,7 +125,6 @@ function getFilePermission($file) {
                 </div>
                 <div class="row">
                 <?php
-
                 @getFilePermission($db);
                 @getFilePermission($folder);
                 getFilePermission((__DIR__));
@@ -192,11 +138,8 @@ function getFilePermission($file) {
                 echo '<div style="color: black" class="panel-body">';
                 echo phpinfo();
                 echo '</div></div>';
-
                 ?>
-
             </div>
-
         </div>
         <script>
         $("body").niceScroll({
@@ -205,7 +148,5 @@ function getFilePermission($file) {
             mousescrollstep: 60
         });
         </script>
-
     </body>
-
 </html>

+ 1 - 1
lang/en.ini

@@ -259,7 +259,7 @@ SHOW_NAMES = "Show Names"
 NOTICE_LAYOUT = "Notice Layout"
 RECENT_ITEMS_LIMIT = "Recent Items Limit"
 ALLOW_SEARCH = "Allow Search"
-CHECK_INVITE = "Enter Invite Code to Procced"
+CHECK_INVITE = "Enter Invite Code to Proceed"
 CODE = "Invite Code"
 INVITE_CODE = "Invite Code"
 DATE_SENT = "Date Sent"

+ 1 - 1
lang/es.ini

@@ -259,7 +259,7 @@ SHOW_NAMES = "Show Names"
 NOTICE_LAYOUT = "Notice Layout"
 RECENT_ITEMS_LIMIT = "Recent Items Limit"
 ALLOW_SEARCH = "Allow Search"
-CHECK_INVITE = "Enter Invite Code to Procced"
+CHECK_INVITE = "Enter Invite Code to Proceed"
 CODE = "Invite Code"
 INVITE_CODE = "Invite Code"
 DATE_SENT = "Date Sent"

+ 1 - 1
lang/fr.ini

@@ -259,7 +259,7 @@ SHOW_NAMES = "Show Names"
 NOTICE_LAYOUT = "Notice Layout"
 RECENT_ITEMS_LIMIT = "Recent Items Limit"
 ALLOW_SEARCH = "Allow Search"
-CHECK_INVITE = "Enter Invite Code to Procced"
+CHECK_INVITE = "Enter Invite Code to Proceed"
 CODE = "Invite Code"
 INVITE_CODE = "Invite Code"
 DATE_SENT = "Date Sent"

+ 1 - 1
lang/it.ini

@@ -259,7 +259,7 @@ SHOW_NAMES = "Show Names"
 NOTICE_LAYOUT = "Notice Layout"
 RECENT_ITEMS_LIMIT = "Recent Items Limit"
 ALLOW_SEARCH = "Allow Search"
-CHECK_INVITE = "Enter Invite Code to Procced"
+CHECK_INVITE = "Enter Invite Code to Proceed"
 CODE = "Invite Code"
 INVITE_CODE = "Invite Code"
 DATE_SENT = "Date Sent"

+ 1 - 1
lang/nl.ini

@@ -259,7 +259,7 @@ SHOW_NAMES = "Show Names"
 NOTICE_LAYOUT = "Notice Layout"
 RECENT_ITEMS_LIMIT = "Recent Items Limit"
 ALLOW_SEARCH = "Allow Search"
-CHECK_INVITE = "Enter Invite Code to Procced"
+CHECK_INVITE = "Enter Invite Code to Proceed"
 CODE = "Invite Code"
 INVITE_CODE = "Invite Code"
 DATE_SENT = "Date Sent"