From 4faf9477bb6df589625f6b23972f5f5e316137aa Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <krivchikovda@gmail.com>
Date: Thu, 3 Apr 2014 14:06:37 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=B0=D0=BD=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BB=D0=BE=D0=B0=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/app.php                                | 21 ++---------
 .../{controller.php => Controller.php}        |  0
 ground/classes/{model.php => Model.php}       |  0
 ground/classes/singleton.php                  | 35 -------------------
 ground/models/{category.php => Category.php}  |  0
 ground/models/{point.php => Point.php}        |  0
 public/index.php                              | 23 ++++++++----
 7 files changed, 20 insertions(+), 59 deletions(-)
 rename ground/classes/{controller.php => Controller.php} (100%)
 rename ground/classes/{model.php => Model.php} (100%)
 delete mode 100644 ground/classes/singleton.php
 rename ground/models/{category.php => Category.php} (100%)
 rename ground/models/{point.php => Point.php} (100%)

diff --git a/ground/app.php b/ground/app.php
index b673594..14e24a6 100644
--- a/ground/app.php
+++ b/ground/app.php
@@ -31,15 +31,6 @@ class App
 		}
 	}
 
-	/**
-	 * Загружает класс контроллера.
-	 * @param string $controllerName
-	 */
-	private static function loadController($controllerName)
-	{
-		include_once 'controllers/' . strtolower($controllerName) . '.php';
-	}
-
 	/**
 	 * Основной метод для запуска приложения.
 	 * @param array $config
@@ -50,21 +41,15 @@ class App
 		self::$config = is_array($config) ? $config : array();
 		self::parseUrl();
 
-		//var_dump(self::$controller, self::$action);die;
-
 		if (self::getConfig('DB'))
 		{
 			try
 			{
 				$confDB = self::getConfig('DB');
 				self::$DB = new PDO('mysql:host=' . $confDB['host'] . ';dbname=' . $confDB['dbname'].';charset=utf8;', $confDB['user'], $confDB['password']);
-
-				foreach (glob(App::getBasedir() . "models/*.php") as $filename)
-				{
-					include_once $filename;
-				}
-			} catch (PDOException $e)
-			{
+			}
+            catch (PDOException $e)
+            {
 				echo $e->getMessage();
 			}
 		}
diff --git a/ground/classes/controller.php b/ground/classes/Controller.php
similarity index 100%
rename from ground/classes/controller.php
rename to ground/classes/Controller.php
diff --git a/ground/classes/model.php b/ground/classes/Model.php
similarity index 100%
rename from ground/classes/model.php
rename to ground/classes/Model.php
diff --git a/ground/classes/singleton.php b/ground/classes/singleton.php
deleted file mode 100644
index c89fe56..0000000
--- a/ground/classes/singleton.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-// Базовый синглтон
-
-abstract class Singleton
-{
-
-    protected static $_instance;
-
-    private function __construct(){
-        /**
-         * При этом в функцию можно вписать
-         * свой код инициализации. Также можно
-         * использовать деструктор класса.
-         * Эти функции работают по прежднему,
-         * только не доступны вне класса
-         */
-    }
-
-     private function __clone(){
-    }
-    /**
-     * Статическая функция, которая возвращает
-     * экземпляр класса или создает новый при
-     * необходимости
-     *
-     * @return SingletonTest
-     */
-    public static function getInstance() {
-        if (null === self::$_instance) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-}
\ No newline at end of file
diff --git a/ground/models/category.php b/ground/models/Category.php
similarity index 100%
rename from ground/models/category.php
rename to ground/models/Category.php
diff --git a/ground/models/point.php b/ground/models/Point.php
similarity index 100%
rename from ground/models/point.php
rename to ground/models/Point.php
diff --git a/public/index.php b/public/index.php
index 3d17759..fee0709 100644
--- a/public/index.php
+++ b/public/index.php
@@ -4,12 +4,23 @@
 
 function __autoload($className)
 {
-    $dirname = dirname(__FILE__) . '/../';
-	$fileName = strpos($className, 'Controller') ? $dirname . 'ground/controllers/' . $className . '.php' : $dirname . 'ground/classes/' . strtolower($className) . '.php';
-	if (file_exists($fileName))
-		include $fileName;
-	else
-		App::error404 ('load class '.$className);
+    $dirs = array('classes','models','controllers');
+
+    $loaded = flase;
+    foreach ($dirs as $dir) {
+        $fileName = dirname(__FILE__) . '/../ground/' . $dir. '/' . $className . '.php';
+
+        if (file_exists($fileName)){
+            $loaded = (bool) include $fileName;
+        }
+    }
+
+	if (!$loaded){
+        App::error404 ('load class '.$className);
+        return false;
+    }
+
+    return true;
 }
 
 include_once dirname(__FILE__) . '/../ground/app.php';