Fixies and Updates

KaduAmaral · Oct 8, 2017 · 38576dd · 38576dd
1 parent a09f7cf
commit 38576dd
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,4 +70,7 @@ Temporary Items
 /.idea/markdown-navigator
 /.idea/base.iml
 /.idea/blade.xml
-/app/example/routes.cache.php
+
+# Application Files
+/app/*/routes.cache.php
+/app/*/config.php
diff --git a/app/example/config.php → app/example/environments/dev.php b/app/example/config.php → app/example/environments/dev.php
@@ -19,6 +19,7 @@
 
 
 Config::Set([
-   'url' => 'http://localhost/Base/public_html/',
+   'url' => 'http://localhost/base/public_html/',
+   'public' => dirname(dirname(__DIR__)).'/public_html',
    'name' => 'example',
 ]);
diff --git a/app/example/config.php.dev → app/example/environments/prod.php b/app/example/config.php.dev → app/example/environments/prod.php
@@ -19,6 +19,7 @@
 
 
 Config::Set([
-   'url' => 'http://localhost/Base/public_html/',
+   'url' => 'http://localhost/base/public_html/',
+   'public' => dirname(dirname(__DIR__)).'/public_html',
    'name' => 'example',
 ]);
diff --git a/app/example/config.php.prod → app/example/environments/stage.php b/app/example/config.php.prod → app/example/environments/stage.php
@@ -19,6 +19,7 @@
 
 
 Config::Set([
-   'url' => 'http://localhost/Base/public_html/',
+   'url' => 'http://localhost/base/public_html/',
+   'public' => dirname(dirname(__DIR__)).'/public_html',
    'name' => 'example',
 ]);
diff --git a/base/console/commands/environment.class.php b/base/console/commands/environment.class.php
@@ -28,15 +28,15 @@ public function execute(\CMP\Console $console, $args = []) {
    private function setArgs($args) {
       $this->app = $args['--app'];
       $this->env = $args['--env'];
-      $this->appPath = APPS.$this->app.DS;
+      $this->appPath = APPS.$this->app;
 
    }
 
    private function copyConfig() {
      $this->console->writeln('Setting config file...');
-     $path = "{$this->appPath}config.{$this->env}.php";
+     $path = "{$this->appPath}/environments/{$this->env}.php";
       if (file_exists($path))
-         copy($path, "{$this->appPath}config.php");
+         copy($path, "{$this->appPath}/config.php");
       else
          throw new \Exception('Config file does\'t exists for environment '.$this->env);
    }
@@ -50,7 +50,8 @@ private function copyHtaccess() {
      if (file_exists($path))
         copy($path, $newPath);
      else
-        throw new \Exception('HTACCESS file does\'t exists for environment '.$this->env);
+        $this->console->writeln("<error>HTACCESS file does\'t exists for environment {$this->env}</error>");
+        // throw new \Exception('HTACCESS file does\'t exists for environment '.$this->env);
    }
 
    private function configure() {
@@ -62,7 +63,7 @@ private function configure() {
 
       if (is_null($this->config = $this->console->share('config'))) {
         $this->config = $this->console->share('config', \Core\Config::SetApplication($this->appPath));
-        $this->loadFile($this->appPath.'config.php');
+        $this->loadFile($this->appPath.'/config.php');
       }
 
       return TRUE;
@@ -78,7 +79,7 @@ private function loadFile($file) {
    public function getOptionCollection() {
       $collection = new \CMP\Command\OptionCollection();
       $collection->add('a|app:', 'Application folder name');
-      $collection->add('e|env:', 'Environment [prod|dev] (default: dev)', 'dev');
+      $collection->add('e|env:', 'Environment [prod|dev|stage] (default: dev)', 'dev');
 
       return $collection;
    }

diff --git a/composer.json b/composer.json
@@ -19,6 +19,6 @@
         "kaduamaral/connectionpdo": "~1.1",
         "phpmailer/phpmailer": "~5.2",
         "mobiledetect/mobiledetectlib": "~2.8",
-        "kaduamaral/cmp": "^1.1"
+        "kaduamaral/cmp": "^1.1.4"
     }
 }
diff --git a/public_html/.htaccess → public_html/dev.htaccess b/public_html/.htaccess → public_html/dev.htaccess
@@ -11,7 +11,7 @@ Options -Indexes
 
 RewriteEngine On
 
-RewriteBase /Base/public_html/
+RewriteBase /base/public_html/
 
 RewriteCond %{SCRIPT_FILENAME} !-f
 RewriteCond %{SCRIPT_FILENAME} !-d

diff --git a/public_html/index.php b/public_html/index.php
@@ -1,8 +1,5 @@
 <?php
 
-   error_reporting(E_ALL);
-   ini_set('display_errors', 1);
-
-   require_once __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'loader.php';
+   require_once dirname(__DIR__).'/base/config/loader.php';
 
    \Core\Application::RUN('example');
diff --git a/public_html/prod.htaccess b/public_html/prod.htaccess
@@ -0,0 +1,22 @@
+Options +FollowSymlinks
+
+# Prevent Directoy listing 
+Options -Indexes
+
+# Prevent Direct Access to files
+<FilesMatch "(?i)((\.tpl|\.ini|\.log|(?<!robots)\.txt))">
+ Order deny,allow
+ Deny from all
+</FilesMatch>
+
+RewriteEngine On
+
+RewriteBase /base/public_html/
+
+RewriteCond %{SCRIPT_FILENAME} !-f
+RewriteCond %{SCRIPT_FILENAME} !-d
+RewriteRule ^$ index.php?URI=$1 [L,QSA]
+
+RewriteCond %{SCRIPT_FILENAME} !-f
+RewriteCond %{SCRIPT_FILENAME} !-d
+RewriteRule ^(.*)/? index.php?URI=$1 [L,QSA]
diff --git a/public_html/stage.htaccess b/public_html/stage.htaccess
@@ -0,0 +1,22 @@
+Options +FollowSymlinks
+
+# Prevent Directoy listing 
+Options -Indexes
+
+# Prevent Direct Access to files
+<FilesMatch "(?i)((\.tpl|\.ini|\.log|(?<!robots)\.txt))">
+ Order deny,allow
+ Deny from all
+</FilesMatch>
+
+RewriteEngine On
+
+RewriteBase /base/public_html/
+
+RewriteCond %{SCRIPT_FILENAME} !-f
+RewriteCond %{SCRIPT_FILENAME} !-d
+RewriteRule ^$ index.php?URI=$1 [L,QSA]
+
+RewriteCond %{SCRIPT_FILENAME} !-f
+RewriteCond %{SCRIPT_FILENAME} !-d
+RewriteRule ^(.*)/? index.php?URI=$1 [L,QSA]