Fixed a stupid foldername

LastStandStudio · Aug 18, 2015 · c8cadb1 · c8cadb1
1 parent cbd8cf9
commit c8cadb1
Show file tree

Hide file tree

Showing 69 changed files with 46 additions and 32 deletions.
diff --git a/application/Controllers/Welcome.php → app/Controllers/Welcome.php b/application/Controllers/Welcome.php → app/Controllers/Welcome.php
diff --git a/application/Core/Config.php → app/Core/Config.php b/application/Core/Config.php → app/Core/Config.php
diff --git a/application/Core/Controller.php → app/Core/Controller.php b/application/Core/Controller.php → app/Core/Controller.php
diff --git a/application/Core/Error.php → app/Core/Error.php b/application/Core/Error.php → app/Core/Error.php
diff --git a/application/Core/Language.php → app/Core/Language.php b/application/Core/Language.php → app/Core/Language.php
diff --git a/application/Core/Logger.php → app/Core/Logger.php b/application/Core/Logger.php → app/Core/Logger.php
diff --git a/application/Core/Model.php → app/Core/Model.php b/application/Core/Model.php → app/Core/Model.php
diff --git a/application/Core/Router.php → app/Core/Router.php b/application/Core/Router.php → app/Core/Router.php
diff --git a/application/Core/View.php → app/Core/View.php b/application/Core/View.php → app/Core/View.php
diff --git a/application/Helpers/Arr.php → app/Helpers/Arr.php b/application/Helpers/Arr.php → app/Helpers/Arr.php
diff --git a/application/Helpers/Assets.php → app/Helpers/Assets.php b/application/Helpers/Assets.php → app/Helpers/Assets.php
diff --git a/application/Helpers/Data.php → app/Helpers/Data.php b/application/Helpers/Data.php → app/Helpers/Data.php
diff --git a/application/Helpers/Database.php → app/Helpers/Database.php b/application/Helpers/Database.php → app/Helpers/Database.php
diff --git a/application/Helpers/Date.php → app/Helpers/Date.php b/application/Helpers/Date.php → app/Helpers/Date.php
diff --git a/application/Helpers/Document.php → app/Helpers/Document.php b/application/Helpers/Document.php → app/Helpers/Document.php
diff --git a/application/Helpers/Form.php → app/Helpers/Form.php b/application/Helpers/Form.php → app/Helpers/Form.php
diff --git a/application/Helpers/Ftp.php → app/Helpers/Ftp.php b/application/Helpers/Ftp.php → app/Helpers/Ftp.php
diff --git a/application/Helpers/GeoCode.php → app/Helpers/GeoCode.php b/application/Helpers/GeoCode.php → app/Helpers/GeoCode.php
diff --git a/application/Helpers/Number.php → app/Helpers/Number.php b/application/Helpers/Number.php → app/Helpers/Number.php
diff --git a/application/Helpers/Paginator.php → app/Helpers/Paginator.php b/application/Helpers/Paginator.php → app/Helpers/Paginator.php
diff --git a/application/Helpers/Password.php → app/Helpers/Password.php b/application/Helpers/Password.php → app/Helpers/Password.php
diff --git a/application/Helpers/PhpMailer/Exception.php → app/Helpers/PhpMailer/Exception.php b/application/Helpers/PhpMailer/Exception.php → app/Helpers/PhpMailer/Exception.php
diff --git a/application/Helpers/PhpMailer/Mail.php → app/Helpers/PhpMailer/Mail.php b/application/Helpers/PhpMailer/Mail.php → app/Helpers/PhpMailer/Mail.php
diff --git a/application/Helpers/PhpMailer/PhpMailer.php → app/Helpers/PhpMailer/PhpMailer.php b/application/Helpers/PhpMailer/PhpMailer.php → app/Helpers/PhpMailer/PhpMailer.php
diff --git a/application/Helpers/PhpMailer/Pop3.php → app/Helpers/PhpMailer/Pop3.php b/application/Helpers/PhpMailer/Pop3.php → app/Helpers/PhpMailer/Pop3.php
diff --git a/application/Helpers/PhpMailer/Smtp.php → app/Helpers/PhpMailer/Smtp.php b/application/Helpers/PhpMailer/Smtp.php → app/Helpers/PhpMailer/Smtp.php
diff --git a/application/Helpers/RainCaptcha.php → app/Helpers/RainCaptcha.php b/application/Helpers/RainCaptcha.php → app/Helpers/RainCaptcha.php
diff --git a/application/Helpers/Request.php → app/Helpers/Request.php b/application/Helpers/Request.php → app/Helpers/Request.php
diff --git a/application/Helpers/Session.php → app/Helpers/Session.php b/application/Helpers/Session.php → app/Helpers/Session.php
diff --git a/application/Helpers/SimpleCurl.php → app/Helpers/SimpleCurl.php b/application/Helpers/SimpleCurl.php → app/Helpers/SimpleCurl.php
diff --git a/application/Helpers/TableBuilder.php → app/Helpers/TableBuilder.php b/application/Helpers/TableBuilder.php → app/Helpers/TableBuilder.php
diff --git a/application/Helpers/Tags.php → app/Helpers/Tags.php b/application/Helpers/Tags.php → app/Helpers/Tags.php
diff --git a/application/Helpers/Url.php → app/Helpers/Url.php b/application/Helpers/Url.php → app/Helpers/Url.php
diff --git a/application/Helpers/page_eloq.md → app/Helpers/page_eloq.md b/application/Helpers/page_eloq.md → app/Helpers/page_eloq.md
diff --git a/application/Models/index.html → app/Models/index.html b/application/Models/index.html → app/Models/index.html
diff --git a/application/files/password.php → app/files/password.php b/application/files/password.php → app/files/password.php
diff --git a/application/language/de/Welcome.php → app/language/de/Welcome.php b/application/language/de/Welcome.php → app/language/de/Welcome.php
diff --git a/application/language/en/Welcome.php → app/language/en/Welcome.php b/application/language/en/Welcome.php → app/language/en/Welcome.php
diff --git a/application/language/fr/Welcome.php → app/language/fr/Welcome.php b/application/language/fr/Welcome.php → app/language/fr/Welcome.php
diff --git a/application/language/it/Welcome.php → app/language/it/Welcome.php b/application/language/it/Welcome.php → app/language/it/Welcome.php
diff --git a/application/language/nl/Welcome.php → app/language/nl/Welcome.php b/application/language/nl/Welcome.php → app/language/nl/Welcome.php
diff --git a/application/language/pl/Welcome.php → app/language/pl/Welcome.php b/application/language/pl/Welcome.php → app/language/pl/Welcome.php
diff --git a/application/language/ro/Welcome.php → app/language/ro/Welcome.php b/application/language/ro/Welcome.php → app/language/ro/Welcome.php
diff --git a/application/language/ru/Welcome.php → app/language/ru/Welcome.php b/application/language/ru/Welcome.php → app/language/ru/Welcome.php
diff --git a/...templates/default/css/bootstrap-theme.css → ...templates/default/css/bootstrap-theme.css b/...templates/default/css/bootstrap-theme.css → ...templates/default/css/bootstrap-theme.css
diff --git a/...lates/default/css/bootstrap-theme.css.map → ...lates/default/css/bootstrap-theme.css.map b/...lates/default/css/bootstrap-theme.css.map → ...lates/default/css/bootstrap-theme.css.map
diff --git a/...lates/default/css/bootstrap-theme.min.css → ...lates/default/css/bootstrap-theme.min.css b/...lates/default/css/bootstrap-theme.min.css → ...lates/default/css/bootstrap-theme.min.css
diff --git a/...ation/templates/default/css/bootstrap.css → app/templates/default/css/bootstrap.css b/...ation/templates/default/css/bootstrap.css → app/templates/default/css/bootstrap.css
diff --git a/...n/templates/default/css/bootstrap.css.map → app/templates/default/css/bootstrap.css.map b/...n/templates/default/css/bootstrap.css.map → app/templates/default/css/bootstrap.css.map
diff --git a/...n/templates/default/css/bootstrap.min.css → app/templates/default/css/bootstrap.min.css b/...n/templates/default/css/bootstrap.min.css → app/templates/default/css/bootstrap.min.css
diff --git a/application/templates/default/css/style.css → app/templates/default/css/style.css b/application/templates/default/css/style.css → app/templates/default/css/style.css
diff --git a/...lt/fonts/glyphicons-halflings-regular.eot → ...lt/fonts/glyphicons-halflings-regular.eot b/...lt/fonts/glyphicons-halflings-regular.eot → ...lt/fonts/glyphicons-halflings-regular.eot
diff --git a/...lt/fonts/glyphicons-halflings-regular.svg → ...lt/fonts/glyphicons-halflings-regular.svg b/...lt/fonts/glyphicons-halflings-regular.svg → ...lt/fonts/glyphicons-halflings-regular.svg
diff --git a/...lt/fonts/glyphicons-halflings-regular.ttf → ...lt/fonts/glyphicons-halflings-regular.ttf b/...lt/fonts/glyphicons-halflings-regular.ttf → ...lt/fonts/glyphicons-halflings-regular.ttf
diff --git a/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff b/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/application/templates/default/footer.php → app/templates/default/footer.php b/application/templates/default/footer.php → app/templates/default/footer.php
@@ -2,10 +2,6 @@
 
 use Helpers\Assets;
 use Helpers\Url;
-use Helpers\Hooks;
-
-//initialise hooks
-$hooks = Hooks::get();
 ?>
 
 </div>
@@ -17,11 +13,6 @@
 	'//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js'
 ));
 
-//hook for plugging in javascript
-$hooks->run('js');
-
-//hook for plugging in code into the footer
-$hooks->run('footer');
 ?>
 
 </body>

diff --git a/application/templates/default/header.php → app/templates/default/header.php b/application/templates/default/header.php → app/templates/default/header.php
@@ -2,21 +2,13 @@
 
 use Helpers\Assets;
 use Helpers\Url;
-use Helpers\Hooks;
-
-//initialise hooks
-$hooks = Hooks::get();
 ?>
 <!DOCTYPE html>
 <html lang="<?php echo LANGUAGE_CODE; ?>">
 <head>
 
 	<!-- Site meta -->
 	<meta charset="utf-8">
-	<?php
-	//hook for plugging in meta tags
-	$hooks->run('meta');
-	?>
 	<title><?php echo $data['title'].' - '.SITETITLE; //SITETITLE defined in app/Core/Config.php ?></title>
 
 	<!-- CSS -->
@@ -26,15 +18,9 @@
 		Url::templatePath() . 'css/style.css',
 	));
 
-	//hook for plugging in css
-	$hooks->run('css');
 	?>
 
 </head>
 <body>
-<?php
-//hook for running code after body tag
-$hooks->run('afterBody');
-?>
 
 <div class="container">
diff --git a/...ication/templates/default/js/bootstrap.js → app/templates/default/js/bootstrap.js b/...ication/templates/default/js/bootstrap.js → app/templates/default/js/bootstrap.js
diff --git a/...ion/templates/default/js/bootstrap.min.js → app/templates/default/js/bootstrap.min.js b/...ion/templates/default/js/bootstrap.min.js → app/templates/default/js/bootstrap.min.js
diff --git a/application/templates/default/js/jquery.js → app/templates/default/js/jquery.js b/application/templates/default/js/jquery.js → app/templates/default/js/jquery.js
diff --git a/application/templates/default/js/npm.js → app/templates/default/js/npm.js b/application/templates/default/js/npm.js → app/templates/default/js/npm.js
diff --git a/application/views/error/404.php → app/views/error/404.php b/application/views/error/404.php → app/views/error/404.php
diff --git a/application/views/welcome/subpage.php → app/views/welcome/subpage.php b/application/views/welcome/subpage.php → app/views/welcome/subpage.php
diff --git a/application/views/welcome/welcome.php → app/views/welcome/welcome.php b/application/views/welcome/welcome.php → app/views/welcome/welcome.php
diff --git a/composer.json b/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "simple-mvc-framework/framework",
+    "type": "project",
+    "description": "Framework for PHP 5.4+",
+    "homepage": "https://github.com/simple-mvc-framework/framework",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "David Carr",
+            "email": "dave@daveismyname.com",
+            "homepage": "http://daveismyname.com",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": ">=5.4.0"
+    },
+    "autoload": {
+        "psr-4": {"": "app/"},
+        "files": ["app/files/password.php"]
+    },
+    "minimum-stability": "dev"
+}
diff --git a/composer.lock b/composer.lock
diff --git a/index.php b/index.php
@@ -57,16 +57,11 @@
 
 //create alias for Router
 use Core\Router;
-use Helpers\Hooks;
 use Helpers\Session;
 
 //define routes
 Router::any('', 'Controllers\Welcome@index');
 
-//module routes
-$hooks = Hooks::get();
-$hooks->run('routes');
-
 //if no route found
 Router::error('Core\Error@index');
 

diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
@@ -351,7 +351,7 @@ private function findFileWithExtension($class, $ext)
             foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }
@@ -361,7 +361,7 @@ private function findFileWithExtension($class, $ext)
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -380,7 +380,7 @@ private function findFileWithExtension($class, $ext)
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -390,7 +390,7 @@ private function findFileWithExtension($class, $ext)
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                 return $file;
             }
         }