Refactorizar codigo

Luraguse · Mar 9, 2013 · ac348b8 · ac348b8
1 parent c01de3a
commit ac348b8
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 481 deletions.
diff --git a/application/models/career.php b/application/models/career.php
@@ -4,7 +4,6 @@ class Career extends Model {
     protected $has_many = array("news", "videos");
     protected $has_one = array("main_pic");
 
-
     function __construct() {
         parent::__construct();
     }

diff --git a/library/shared.php → library/bootstrap.class.php b/library/shared.php → library/bootstrap.class.php
diff --git a/library/bootstrap.php b/library/bootstrap.php
diff --git a/library/combinararchivos.class.php b/library/combinararchivos.class.php
@@ -208,5 +208,4 @@ protected function getFile() {
         }
         return $this->getRutaArchivo();
     }
-}
-?>
+}
diff --git a/library/combinarcss.class.php b/library/combinarcss.class.php
@@ -49,18 +49,6 @@ private function array_de_variables($id_template, $id_cliente) {
      * @return string Regresa el link al css.
      */
     public function regresarCss() {
-        /*
-        if(file_exists($this->_ruta_para_archivo)) {
-            if ($this->_fecha_de_modificacion_archivo < $this->_fecha_modificacion_template) {
-                $this->guardar_archivo($this->_ruta_para_archivo, $this->parse_archivos($this->_lista_de_archivos, $this->_array_de_valores));
-            }
-        } else {
-            $this->guardar_archivo($this->_ruta_para_archivo, $this->parse_archivos($this->_lista_de_archivos, $this->_array_de_valores));
-        }
-        return "<a href='".$this->_ruta_para_archivo."'>CSS Creado</a>";
-         */
         return $this->getFile();
     }
-}
-
-?>
+}
diff --git a/library/combinarjs.class.php b/library/combinarjs.class.php
@@ -15,16 +15,5 @@ function __construct() {
 
     public function regresarJs() {
         return $this->getFile();
-        /*
-        if(file_exists($this->_ruta_para_archivo)) {
-            if($this->comparar_fechas_de_modificacion($this->_lista_de_archivos, $this->_ruta_para_archivo)) {
-               $this->guardar_archivo($this->_ruta_para_archivo, $this->combinar_contenido_de_archivos($this->_lista_de_archivos)); 
-            }
-        } else {
-            $this->guardar_archivo($this->_ruta_para_archivo, $this->combinar_contenido_de_archivos($this->_lista_de_archivos));
-        }
-        return $this->_ruta_para_archivo;
-        */
     }
-}
-?>
+}
diff --git a/library/connection.class.php b/library/connection.class.php
@@ -4,7 +4,7 @@ class Connection{
 
     private $connection;
 
-	public function __construct($DB_TYPE, $DB_HOST, $DB_NAME, $DB_USER, $DB_PASS) {
+	public function __construct($DB_TYPE = "mysql", $DB_HOST = DB_HOST, $DB_NAME = DB_NAME, $DB_USER = DB_USER, $DB_PASS = DB_PASSWORD) {
 		$this->connect($DB_TYPE, $DB_HOST, $DB_NAME, $DB_USER, $DB_PASS);
 	}
 

diff --git a/library/controller.class.php b/library/controller.class.php
@@ -1,35 +1,35 @@
 <?php
 class Controller {
-    protected $_controller;
-    protected $_action;
-    protected $_template;
-    protected $_model;
+    protected $controller;
+    protected $action;
+    protected $template;
+    protected $model;
 
     public $doNotRenderHeader;
     public $render;
 
     function __construct($controller, $action) {
-        $this->_controller = ucfirst($controller);
-        $this->_action = $action;
+        $this->controller = ucfirst($controller);
+        $this->action = $action;
 
         $model = ucfirst($controller);
         $this->doNotRenderHeader = 0;
         $this->render = 1;
-        $this->_model = new $model();
-        $this->_template = new Template($controller, $action);
+        $this->model = new $model();
+        $this->template = new Template($controller, $action);
     }
 
     public function Buscar() {
-        return $this->_model->Buscar();
+        return $this->model->Buscar();
     }
 
     function set($name, $value) {
-        $this->_template->set($name,$value);
+        $this->template->set($name,$value);
     }
 
     function __destruct() {
         if($this->render) {
-            $this->_template->render($this->doNotRenderHeader);
+            $this->template->render($this->doNotRenderHeader);
         }
     }
 }
diff --git a/library/database.class.php b/library/database.class.php
@@ -1,9 +1,4 @@
 <?php
-
-class Database extends PDO {
-
-	public function __construct($DB_TYPE, $DB_HOST, $DB_NAME, $DB_USER, $DB_PASS) {
-		parent::__construct($DB_TYPE.':host='.$DB_HOST.';dbname='.$DB_NAME, $DB_USER, $DB_PASS);
-		parent::setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-	}
+class DataBase {
+
 }
diff --git a/library/html.class.php b/library/html.class.php
@@ -1,8 +1,6 @@
 <?php
 
 class HTML {
-	private $js = array();
-    public $CombinarJs;
 
 	function shortenUrls($data) {
 		$data = preg_replace_callback('@(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.]*(\?\S+)?)?)?)@', array(get_class($this), '_fetchTinyUrl'), $data);

diff --git a/library/model.class.php b/library/model.class.php
@@ -1,18 +1,18 @@
 <?php
 class Model {
-    protected $_model;
+    protected $ModelName;
     protected $Buscar;
 
     public $Sanitize = array();
     public $Validate = array();
-    public $_jsFiles;
+    public $jsFiles;
     public $CombinarJs;
 
     function __construct() {
-        //$this->buscar = new SQLQuery(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-        $this->Connection = new Connection( $DB_TYPE = "mysql", $DB_HOST = DB_HOST, $DB_NAME = DB_NAME, $DB_USER = DB_USER, $DB_PASS = DB_PASSWORD);
-        $this->Buscar = new Busqueda($this->Connection, strtolower(get_class($this)));
-        $this->_model = get_class($this);
+        $this->ModelName = get_class($this);
+        $this->Connection = new Connection();
+        $this->Buscar = new Busqueda($this->Connection, strtolower($this->ModelName));
+        $this->DataBase = new DataBase($this->Connection, strtolower($this->ModelName));
     }
 
     public function Buscar() {