Lobby 0.4

admin/install.php

@@ -114,16 +114,27 @@
                       }
                       ?></td>
                     </tr>
-                    <tr>
-                      <td>Apache mod_rewrite Module</td>
-                      <td><?php if (preg_match("/mod_rewrite/", $info)){
-                        sss("Ok", "Apache mod_rewrite module is enabled");
-                      }else{
-                        $error = 1;
-                        ser("Not Ok", "Apache mod_rewrite module is not enabled");
-                      }
-                      ?></td>
-                    </tr>
+                    <?php
+                    ob_start(); 
+                      phpinfo(INFO_GENERAL); 
+                    $g_info = ob_get_contents(); 
+                    ob_end_clean();
+                    $server_software = stristr($g_info, 'Server API'); 
+                    if(preg_match("/\>Apache/", $server_software)){
+                    ?>
+                      <tr>
+                        <td>Apache mod_rewrite Module</td>
+                        <td><?php if (preg_match("/mod_rewrite/", $info)){
+                          sss("Ok", "Apache mod_rewrite module is enabled");
+                        }else{
+                          $error = 1;
+                          ser("Not Ok", "Apache mod_rewrite module is not enabled");
+                        }
+                        ?></td>
+                      </tr>
+                    <?php
+                    }
+                    ?>
                     <tr>
                       <td>Permissions</td>
                       <td><?php if (is_writable(L_DIR)){
@@ -151,7 +162,7 @@
           }else if($install_step === "4"){
             echo "<h2>Safety</h2>";
             $safe = \Lobby\Install::safe();
-            if($safe == "configFile"){
+            if($safe === "configFile"){
               ser("Permission Error", "The <b>config.php</b> file still has write permission. Change the permission to Read Only.");
             }
             if($safe !== true){
@@ -170,7 +181,7 @@
               <tbody>
                 <tr>
                   <td width="50%"><?php
-                    $mysql_version = stristr($info, 'Client API version'); 
+                    $mysql_version = stristr($info, 'Client API version');
                     preg_match('/[1-9].[0-9].[1-9][0-9]/', $mysql_version, $match); 
                     $mysql_version = $match[0];
                     if(version_compare($mysql_version, '5.0') >= 0){
@@ -222,47 +233,51 @@
                 $username = \H::input('dbusername', "POST");
                 $password = \H::input('dbpassword', "POST");
                 $prefix = \H::input('prefix', "POST");
-
-                /**
-                 * We give the database config to the Install Class
-                 */
-                \Lobby\Install::dbConfig(array(
-                  "host" => $dbhost,
-                  "port" => $dbport,
-                  "dbname" => $dbname,
-                  "username" => $username,
-                  "password" => $password,
-                  "prefix" => $prefix
-                ));
 
-                /**
-                 * First, check if prefix is valid
-                 * Check if connection to database can be established using the credentials given by the user
-                 */
-                if($prefix == "" || preg_match("/[^0-9,a-z,A-Z,\$,_]+/i", $prefix) != 0 || strlen($prefix) > 50){
-                  ser("Error", "A Prefix should only contain basic Latin letters, digits 0-9, dollar, underscore and shouldn't exceed 50 characters.<cl/>" . \Lobby::l("/admin/install.php?step=2" . H::csrf("g"), "Try Again", "class='button'"));
-                }else if(\Lobby\Install::checkDatabaseConnection() !== false){
+                if($dbhost === "" || $dbport === "" || $dbname === "" || $username === ""){
+                  ser("Empty Fields", "Buddy, you left out some details.<cl/>" . \Lobby::l("/admin/install.php?step=3&db_type=mysql" . H::csrf("g"), "Try Again", "class='button orange'"));
+                  }else{
                   /**
-                   * Create Tables
+                   * We give the database config to the Install Class
                    */
-                  if(\Lobby\Install::makeDatabase($prefix)){
-                    /**
-                     * Make the Config File
-                     */
-                    \Lobby\Install::makeConfigFile();
+                  \Lobby\Install::dbConfig(array(
+                    "host" => $dbhost,
+                    "port" => $dbport,
+                    "dbname" => $dbname,
+                    "username" => $username,
+                    "password" => $password,
+                    "prefix" => $prefix
+                  ));
 
+                  /**
+                   * First, check if prefix is valid
+                   * Check if connection to database can be established using the credentials given by the user
+                   */
+                  if($prefix == "" || preg_match("/[^0-9,a-z,A-Z,\$,_]+/i", $prefix) != 0 || strlen($prefix) > 50){
+                    ser("Error", "A Prefix should only contain basic Latin letters, digits 0-9, dollar, underscore and shouldn't exceed 50 characters.<cl/>" . \Lobby::l("/admin/install.php?step=3&db_type=mysql" . H::csrf("g"), "Try Again", "class='button orange'"));
+                  }else if(\Lobby\Install::checkDatabaseConnection() !== false){
                     /**
-                     * Enable app lEdit
+                     * Create Tables
                      */
-                    \Lobby::$installed = true;
-                    \Lobby\DB::init();
-                    $App = new \Lobby\Apps("ledit");
-                    $App->enableApp();
+                    if(\Lobby\Install::makeDatabase($prefix)){
+                      /**
+                       * Make the Config File
+                       */
+                      \Lobby\Install::makeConfigFile();
 
-                    sss("Success", "Database Tables and <b>config.php</b> file was successfully created.");
-                    echo '<cl/><a href="?step=4'. H::csrf("g") .'" class="button">Proceed</a>';
-                  }else{
-                    ser("Unable To Create Database Tables", "Are there any tables with the same name ? Or Does the user have the permissions to create tables ? Error :<blockquote>". \Lobby\Install::$error ."</blockquote>" . \Lobby::l("/admin/install.php?step=2" . H::csrf("g"), "Try Again", "class='button'"));
+                      /**
+                       * Enable app lEdit
+                       */
+                      \Lobby::$installed = true;
+                      \Lobby\DB::init();
+                      $App = new \Lobby\Apps("ledit");
+                      $App->enableApp();
+
+                      sss("Success", "Database Tables and <b>config.php</b> file was successfully created.");
+                      echo '<cl/><a href="?step=4'. H::csrf("g") .'" class="button">Proceed</a>';
+                    }else{
+                      ser("Unable To Create Database Tables", "Are there any tables with the same name ? Or Does the user have the permissions to create tables ? Error :<blockquote>". \Lobby\Install::$error ."</blockquote>" . \Lobby::l("/admin/install.php?step=2" . H::csrf("g"), "Try Again", "class='button'"));
+                    }
                   }
                 }
               }else{

contents/apps/index.php

@@ -0,0 +1,2 @@
+<?php
+// Silence

contents/index.php

@@ -0,0 +1,2 @@
+<?php
+// Silence

contents/modules/index.php

@@ -0,0 +1,2 @@
+<?php
+// Silence

contents/themes/index.php

@@ -0,0 +1,2 @@
+<?php
+// Silence

includes/serve.php

@@ -1,7 +1,7 @@
 <?php
 require_once "../load.php";
 
-$f = $_GET['file'];
+$f = rtrim($_GET['file'], ",");
 $content = "";
 $extraContent = "";
 

includes/src/Install.php

@@ -54,12 +54,15 @@ public static function checkDatabaseConnection(){
         }
       }
 
-      if(!$notable){ /* There are database tables */
-        ser("Error", "Lobby Tables with prefix <b>". self::$database['prefix'] ."</b> exists. Delete (DROP) those tables and <a href='install.php?step=2". \H::csrf("g") ."'>try again.</a>");
+      if(!$notable){
+        /**
+         * Database tables exist
+         */
+        ser("Error", "Lobby Tables with prefix <b>". self::$database['prefix'] ."</b> exists. Delete (DROP) those tables and <cl/><a class='button orange' href='install.php?step=3&db_type=mysql". \H::csrf("g") ."'>Try Again</a>");
         return false;
       }
     }catch(\PDOException $Exception) {
-      ser("Error", "Unable to connect. Make sure that the settings you entered are correct. <cl/><a href='install.php?step=2'>Try Again</a>");
+      ser("Error", "Unable to connect. Make sure that the settings you entered are correct. <cl/><a class='button orange' href='install.php?step=3&db_type=mysql". \H::csrf("g") ."'>Try Again</a>");
       return false;
     }
   }

includes/src/Lobby.php

@@ -40,16 +40,14 @@ public static function init(){
       self::$host_name = $url_parts['host'];
       self::$url = self::$config['lobby_url'];
     }else{
-      $base_dir  = L_DIR;
-      $doc_root  = str_replace("\\", "/", preg_replace("!${_SERVER['SCRIPT_NAME']}$!", '', $_SERVER['SCRIPT_FILENAME']));
-      $base_url  = preg_replace("!^${doc_root}!", '', $base_dir); # ex: '' or '/mywebsite'
-      $protocol  = empty($_SERVER['HTTPS']) ? 'http' : 'https';
-      $port      = $_SERVER['SERVER_PORT'];
-      $disp_port = ($protocol == 'http' && $port == 80 || $protocol == 'https' && $port == 443) ? '' : ":$port";
-      $domain    = $_SERVER['SERVER_NAME'];
+      $docDir = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']);
+      $subdir = str_replace($docDir, '', L_DIR);
+      $urladdr = $_SERVER['HTTP_HOST'] . $subdir;
+      $urladdr = (empty($_SERVER['HTTPS']) ? 'http' : 'https') . "://" . $urladdr;
+      self::$url = rtrim($urladdr, "/");
 
-      self::$url  = "${protocol}://${domain}${disp_port}${base_url}";
-      self::$host_name = $domain;
+      unset($tempPath1, $tempPath2, $tempPath3, $urladdr);
+      self::$host_name = $_SERVER['HTTP_HOST'];
     }
   }
 
@@ -423,4 +421,3 @@ public static function curPage($page = false, $full = false){
   }
 }
 \Lobby::init();
-?>

includes/src/Router.php

@@ -169,10 +169,27 @@ public static function statusRoutes(){
      * The default 404 page
      */
     self::$router->onHttpError(function ($code, $router) {
-      if($code == 404){
-        ser();
+      if($code === 404){
+        if(self::pathExists()){
+          $router->response()->code(200);
+        }else{
+          ser();
+        }
       }
     });
   }
+
+  /**
+   * This is useful when Lobby is run using PHP Built In Server
+   * When no routes are matched, by default a 404 is inited,
+   * even when the file exists in Lobby as .php file. To prevent
+   * this, we check if the file exist and return false to the PHP
+   * Built in Server to make it serve the file normally
+   * http://php.net/manual/en/features.commandline.webserver.php#example-430
+   */
+  public static function pathExists(){
+    return file_exists(L_DIR . $_SERVER['PHP_SELF']);
+  }
+
 }
 \Lobby\Router::init();

includes/src/Update.php

@@ -1,9 +1,12 @@
 <?php
 namespace Lobby;
+
 /**
  * The Update class.
  * For updating Lobby Core & Apps
+ * The script execution time is set to unlimited
  */
+set_time_limit(0);
 
 class Update extends \Lobby {