Merge pull request #48 from kivudesign/version_boss

Refactoring app project to support multiple folder autoloading from buildit autoload,

config/globals.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Support for DataBase configuration resource
+ * Authentication information store on global variable
+ */
+    $db_conf= $load_init_config["db_conf"];
+    // database configuration setup
+    $GLOBALS['config']=[
+        'mysql'=>[
+            'host'=> $db_conf["host"],
+            'username'=> $db_conf["user"],
+            'password'=> $db_conf["password"],
+            'db'=> $db_conf["database"]
+        ],
+        'remender'=>[],
+        'session'=>[
+            "token_name"=>"token"
+        ],
+        'controller'=>WEB_ROOT,
+        'middleware'=>WEB_ROOT,
+        'vendor'=>false,
+        'autoload'=>["src","controller","middleware"]
+    ];

config/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

config/load_init_config.php

@@ -0,0 +1,2 @@
+<?php
+    $load_init_config = parse_ini_file("config.ini", true);

controller/homeController.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Wepesi Home Controller
+ *
+ */
+namespace Wepesi\Controller;
+use Wepesi\Core\Input;
+use Wepesi\Core\Redirect;
+use Wepesi\Core\Session;
+
+class homeController{
+        function __construct()
+        {
+        }
+
+        function home(){
+            Redirect::to(WEB_ROOT);
+        }
+        function changeLang(){
+            Session::put('lang', Input::get("lang"));
+            Redirect::to(WEB_ROOT);
+        }
+    }

controller/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

global/autoload.php

@@ -5,15 +5,23 @@
  * it speed and support event namespaces.
  * but it not support for external module install via composer.
  */
-    spl_autoload_register(function($class){
-        $dirs = getSubDirectories("src");
-        $class_arr=explode("\\",$class);
-        $len=count($class_arr);
-        $classFile=$class_arr[($len-1)];
-        foreach($dirs as $dir){
-            $file=$dir."/". checkFileExtension($classFile);
-            if (is_file($file)) { // check if the file exist
-                require_once($file); // incluse the file request if it exist
+    $config = $GLOBALS["config"];
+    $autoload =["src"];
+    if(isset($config["autoload"])){
+        $autoload=is_string($config['autoload'])?[$config['autoload']]:$config['autoload'];
+    }
+
+    spl_autoload_register(function($class) use ($autoload) {
+        foreach ($autoload as $src){
+            $dirs = getSubDirectories($src);
+            $class_arr = explode("\\",$class);
+            $len = count($class_arr);
+            $classFile = $class_arr[($len-1)];
+            foreach($dirs as $dir){
+                $file = $dir."/". checkFileExtension($classFile);
+                if ( is_file($file) ) {
+                    require_once($file);
+                }
             }
         }
     });

global/global.php → global/constant.php

@@ -6,12 +6,10 @@
      */
     const LANG = "fr";
     include("./lang/".LANG."/language.php");
-    // load configguration
-    $ini_array =(object) parse_ini_file("./config/config.ini", true);
 
-    //include database Globale configuration
-    include ("db.php");
-    // inlude language file according to your configuraiton
+
+
+    // include language file according to your configuration
     define("LANG_VALIDATE", $validation);
 
     //web root configaration
@@ -20,7 +18,7 @@
     define('ROOT', str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']));
 
     // default timezone
-    define('TIMEZONE','Africa/Kigali');
+    const TIMEZONE = 'Africa/Kigali';
 
     //define default domain
     $server_name=$_SERVER['SERVER_NAME'];

global/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

global/init.php

@@ -1,35 +1,21 @@
 <?php
-    session_start();
-
-    require_once 'global.php';
-    //
-
 /**
- * @param $dir
- * @return array|false
+ *
  */
-    function getSubDirectories($dir)    {
-        $subDir = array();
-        $directories = array_filter(glob($dir), 'is_dir');
-        $subDir = array_merge($subDir, $directories);
-        foreach ($directories as $directory) $subDir = array_merge($subDir, getSubDirectories($directory . '/*'));
-        return $subDir;
-    }
+    session_start();
+
+    include "config/load_init_config.php";
+    include "constant.php";
+    include "config/globals.php";
+    include "helper/functions.php";
 /**
- * @param $fileName
- * @return mixed|string
+ *
  */
-    function checkFileExtension($fileName){
-        $file_parts = pathinfo($fileName);
-        $file = isset($file_parts['extension']) ? $fileName : $fileName . ".php";
-        return $file;
-    }
-    require_once 'cors.php';
-    //activet this module for only for api app
-    $autoload= (object)$ini_array->autoload;
-    if(isset($autoload->vendor) && !$autoload->vendor){
-        var_dump($GLOBALS['config']);
-        include 'autoload.php';
-    }else{
-        die("There hould be a vendor key on autoload patern to manage with autoload to be used. by default if false");
-    }
+
+$vendor = isset($GLOBALS["config"]) ? (isset($GLOBALS["config"]["vendor"]) ?$GLOBALS["config"]["vendor"]: false) : false;
+
+if( !$vendor ){
+    include "autoload.php";
+}else{
+    include "vendor/autoload.php";
+}

helper/functions.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Scan a folder an get all directory inside
+ * @param $dir
+ * @return array
+ */
+function getSubDirectories($dir): array
+{
+    $subDir = array();
+    $directories = array_filter(glob($dir), 'is_dir');
+    $subDir = array_merge($subDir, $directories);
+    foreach ($directories as $directory) $subDir = array_merge($subDir, getSubDirectories($directory . '/*'));
+    return $subDir;
+}
+/**
+ * @param $fileName
+ * @return mixed|string
+ */
+function checkFileExtension($fileName){
+    $file_parts = pathinfo($fileName);
+    return isset($file_parts['extension']) ? $fileName : $fileName . ".php";
+}

helper/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

index.php

@@ -1,4 +1,3 @@
 <?php
     require_once 'global/init.php';
-    require_once 'route/index.php';
-?>
+    require_once 'route/router.php';

lang/en/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

lang/en/language.php

@@ -11,5 +11,6 @@
     "email"=>"invalid email address",
     "url"=>"invalid url",
     "file"=>"should be a file",
-    "unique"=>"already exist."
+    "unique"=>"already exist.",
+    "unknown"=>"unknown"
 ];

lang/fr/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

lang/fr/language.php

@@ -6,6 +6,8 @@
     "A Simple Php MVC platform to develop quickly a php application"=>"Une plateforme Simple Php MVC pour développer rapidement une application web",
     "Home"=>"Acceuill",
     "contact"=>"contact",
+    "Translate"=>"Traduire",
+    "Change the language"=>"Changez de langue"
 ];
 $validation=[
     "required"=> "est obligatoire",
@@ -16,5 +18,6 @@
     "email"=> "Adresse e-mail invalide",
     "url"=>"invalid url",
     "file"=> "devrait être un fichier",
-    "unique"=> "existe déjà."
+    "unique"=> "existe déjà.",
+    "unknown"=> "Inconus."
 ];

lang/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

layout/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

layout/js/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

layout/style/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

middleware/Validation/HomeValidation.php

@@ -0,0 +1,29 @@
+<?php
+namespace wepesi\Validation;
+
+use Wepesi\Core\Validation\Validate;
+
+class HomeValidation
+{
+    function changeLang(){
+        $valid = new Validate();
+        $schema = [
+            "token" => $valid->string("token")
+                ->min(1)
+                ->max(2)
+                ->required()
+                ->check(),
+            "lang" => $valid->string("lang")
+                ->min(1)
+                ->max(2)
+                ->required()
+                ->check()
+        ];
+
+        $valid->check($_POST,$schema);
+        if(!$valid->passed()){
+            var_dump($valid->errors());
+            die();
+        }
+    }
+}

middleware/Validation/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

middleware/index.php

@@ -0,0 +1,5 @@
+<?php
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

route/index.php

@@ -1,15 +1,5 @@
 <?php
-
-use Wepesi\Core\Routing\Router;
-use Wepesi\Core\View;
-
-$route=new Router();
-    // setup get started pages index
-    $route->get('/', function () {
-        new View('index');
-    });
-    $route->get('/home', "homeCtrl#home");
-    $route->get('/contact', [homeCtrl::class,"contact"]);
-
-    $route->run();
-?>
+if ( $_SERVER['REQUEST_METHOD']=='GET' && realpath(__FILE__) == realpath( $_SERVER['SCRIPT_FILENAME'] ) ) {
+    header( 'HTTP/1.0 403 Forbidden', TRUE, 403 );
+    die( header( 'location:'.str_replace('index.php', '', $_SERVER['SCRIPT_FILENAME']) ) );
+}

route/router.php

@@ -0,0 +1,2 @@
+<?php
+    include "web.php";