Merge lp:~ajavier-lopez/moondragon/bugs-2.0 into lp:moondragon/rising

[Andrés Javier López]

solucionando bugs de la version

[Andrés Javier López (ajavier-lopez)]

importar los arreglos de bugs a la rama principal

[Andrés Javier López (ajavier-lopez)]

review: Approve

=== added directory 'app'
=== renamed directory 'include/controllers' => 'app/controllers'
=== renamed directory 'include/models' => 'app/models'
=== renamed directory 'tasks' => 'app/tasks'
=== renamed directory 'include/views' => 'app/views'
=== modified file 'include/conf/libraries.inc'
--- include/conf/libraries.inc	2009-07-30 00:18:12 +0000
+++ include/conf/libraries.inc	2010-01-28 01:21:15 +0000
@@ -29,6 +29,6 @@
  
 //Se importan las librerías
 
-# Libs::import( 'TestLib' );
+Libs::import( 'Mailer' );
  
 ?>

=== modified file 'include/conf/paths.inc'
--- include/conf/paths.inc	2009-11-06 01:05:59 +0000
+++ include/conf/paths.inc	2010-01-28 01:21:15 +0000
@@ -31,13 +31,13 @@
 
 define( 'CONF', 'include/conf' );
 define( 'LIB', 'include/lib' );
-define( 'CONTROLLERS', 'include/controllers' );
-define( 'MODELS', 'include/models' );
-define( 'VIEW', 'include/views' );
+define( 'CONTROLLERS', 'app/controllers' );
+define( 'MODELS', 'app/models' );
+define( 'VIEWS', 'app/views' );
 define( 'JS', 'js' );
 define( 'STYLES', 'styles' );
 define( 'LOGS', 'logs' );
-define( 'TASKS', 'tasks' );
+define( 'TASKS', 'app/tasks' );
 define( 'TPL', 'templates');
 define( 'PAGES', 'templates/pages');
  

=== modified file 'include/conf/registry.inc'
--- include/conf/registry.inc	2009-11-05 22:53:17 +0000
+++ include/conf/registry.inc	2010-01-28 01:21:15 +0000
@@ -35,6 +35,8 @@
 Registry::setConst( 'DEFAULT_VIEW', 'Core' );
 Registry::setConst( 'DEFAULT_CONTROLLER', 'Core' );
 Registry::setConst( 'DEFAULT_PAGE', 'standard' );
+Registry::setConst( 'MESSAGE_PAGE', 'message' );
+
 
 // Controla el comportamiento del sistema en caso de que se pierda la conexión con la base de datos
 // Si esta opción esta seleccionada como verdadera se muestra una página de error

=== modified file 'include/lib/core/class.controller.php'
--- include/lib/core/class.controller.php	2009-11-21 21:26:52 +0000
+++ include/lib/core/class.controller.php	2010-01-28 01:21:15 +0000
@@ -149,8 +149,16 @@
 		
 		if( !( class_exists( $model ) && is_subclass_of( $model, 'Model' ) ) )
 		{
-			trigger_error( 'No existe el modelo '.$model , E_USER_NOTICE );
-			$model = Registry::get( 'DEFAULT_MODEL' ).'Model';
+			if( file_exists( MODELS.'/class.'.strtolower($model).'.php' ) )
+			{
+				include_once MODELS.'/class.'.strtolower($model).'.php';
+			}
+			
+			if( !( class_exists( $model ) && is_subclass_of( $model, 'Model' ) ) )
+			{
+				trigger_error( 'No existe el modelo '.$model , E_USER_NOTICE );
+				$model = Registry::get( 'DEFAULT_MODEL' ).'Model';
+			}
 		}
 		
 		if( !($this->model instanceof $model) )
@@ -176,7 +184,16 @@
 		
 		if( !( class_exists( $view ) && is_subclass_of( $view, 'View' ) ) )
 		{
-			$view = Registry::get( 'DEFAULT_VIEW' ).'View';
+			if( file_exists( VIEWS.'/class.'.strtolower($view).'.php' ) )
+			{
+				include_once VIEWS.'/class.'.strtolower($view).'.php';
+			}
+			
+			if( !( class_exists( $view ) && is_subclass_of( $view, 'View' ) ) )
+			{
+				trigger_error( 'No existe la vista '.$view , E_USER_NOTICE );
+				$view = Registry::get( 'DEFAULT_VIEW' ).'View';
+			}
 		}
 	
 		if( !($this->view instanceof $view) )
@@ -213,6 +230,10 @@
 			$task = 'unexistent';
 		}
 		
+		$mdview = $this->getView();
+		$_buffer = Buffer::getInstance();
+		$_buffer->start( 'salida' );
+		
 		if( $task == '' )
 		{
 			$default_task = $this->default_task;
@@ -222,6 +243,8 @@
 		{
 			$this->$task();
 		}
+		
+		$_buffer->end();
 	}
 
 	//**********************************************************************************
@@ -234,13 +257,6 @@
 	 * @return void
 	 */
 	abstract protected function display();
-
-	/**
-	 * Procesamiento de errores por defecto
-	 * @abstract
-	 * @return void
-	 */
-	abstract protected function error();
 	
 	/**
 	 * Procesamiento de secciones no autorizadas
@@ -248,10 +264,8 @@
 	 */
 	protected function unauthorized()
 	{
-		// Agrega variable global con mensaje de sección no autorizada
-		Vars::set( 'Error_Message', 'No esta autorizado a ver esta sección' ); // @todo localizar contenido
-		
-		$this->error();
+		$view = $this->getView();
+		$view->message( 'No esta autorizado a ver esta sección' ); // @todo localizar contenido
 	}
 	
 	/**
@@ -260,10 +274,8 @@
 	 */
 	protected function unexistent()
 	{
-		// Agrega variable global con mensaje de sección inexistente
-		Vars::set( 'Error_Message', 'La sección seleccionada no existe' ); // @todo localizar contenido
-		
-		$this->error();
+		$view = $this->getView();
+		$view->message( 'La sección seleccionada no existe' ); // @todo localizar contenido
 	}
 	
 	/**
@@ -272,8 +284,8 @@
 	 */
 	protected function offline()
 	{
-		Vars::set( 'Error_Message', 'Imposible conectarse con la base de datos' ); // @todo localizar contenido		
-		$this->error();
+		$view = $this->getView();
+		$view->message( 'Imposible conectarse con la base de datos' ); // @todo localizar contenido		
 	}
 
 	/**

=== modified file 'include/lib/core/class.corecontroller.php'
--- include/lib/core/class.corecontroller.php	2009-11-20 20:26:24 +0000
+++ include/lib/core/class.corecontroller.php	2010-01-28 01:21:15 +0000
@@ -46,12 +46,7 @@
 		
 		if( file_exists( TASKS.'/'.$name.'.php' ) )
 		{
-			$mdview = $this->getView();
-			$_buffer = Buffer::getInstance();
-			
-			$_buffer->start( 'salida' );
 			include TASKS.'/'.$name.'.php';
-			$_buffer->end();
 		}
 		else
 		{
@@ -71,39 +66,10 @@
 	protected function display()
 	{
 		$_section = Registry::get( 'section' );
-		
-		$mdview = $this->getView();
-		$_buffer = Buffer::getInstance();
-		$_buffer->start( 'salida' );
-		
 		if( file_exists( TASKS.'/'.$_section.'.php' ) )
 		{
 			include TASKS.'/'.$_section.'.php';
 		}
-		
-		$_buffer->end();
-	}
-	
-	/**
-	 * (non-PHPdoc)
-	 * @see include/lib/core/Controller#error()
-	 */
-	protected function error()
-	{
-		$view = $this->getView();
-		if( $view instanceof HTMLView )
-		{
-			$view->setPage( 'error' );
-		}
-		else
-		{
-			trigger_error( 'La vista utilizada no es heredada de HTMLView', E_USER_NOTICE );
-		}
-		
-		$buffer = Buffer::getInstance();
-		
-		$view->addVar( 'system_warning', $buffer->getContent( 'e_warning', false ) );
-		$view->addVar( 'system_notice', $buffer->getContent( 'e_notice', false ) );
 	}
 }
  

=== modified file 'include/lib/core/class.htmlview.php'
--- include/lib/core/class.htmlview.php	2009-11-04 16:37:44 +0000
+++ include/lib/core/class.htmlview.php	2010-01-28 01:21:15 +0000
@@ -86,6 +86,14 @@
 	public function show()
 	{
 		$this->display();
+		$buffer = Buffer::getInstance();
+		
+		$message = $buffer->getContent( 'message' );
+		
+		if( $message != '' )
+		{
+			$this->addVar( 'message', $message );
+		}
 		
 		$page = new Page( $this->page );
 		$page->setVars( $this->getVars() );
@@ -97,7 +105,6 @@
 			$page->addTemplate( $name, $tpl );
 		}
 		
-		$buffer = Buffer::getInstance();
 		$content =  $buffer->getContent( 'salida' );
 		
 		if( ErrorHandler::$has_errors )
@@ -116,6 +123,17 @@
 		
 		return $page->show();
 	}
+	
+	/**
+	 * (non-PHPdoc)
+	 * @see include/lib/core/View#message()
+	 */
+	public function message( $string )
+	{
+		$this->setPage( Registry::get( 'MESSAGE_PAGE' ));
+		$buffer = Buffer::getInstance();
+		$buffer->write( 'message', $string, true );
+	}
 		
 	/**
 	 * Agrega una plantilla a la vista

=== modified file 'include/lib/core/class.template.php'
--- include/lib/core/class.template.php	2009-11-20 20:39:27 +0000
+++ include/lib/core/class.template.php	2010-01-28 01:21:15 +0000
@@ -250,7 +250,8 @@
 	public static function load( $template, $vars = array() )
 	{
 		$tpl = new self( $template );
-		$tpl->setVars( $vars );
+		$vars_array = array_merge(  Vars::getVars(), $vars );
+		$tpl->setVars( $vars_array );
 		return $tpl->show();
 	}
 }

=== modified file 'include/lib/core/class.view.php'
--- include/lib/core/class.view.php	2009-11-20 20:26:24 +0000
+++ include/lib/core/class.view.php	2010-01-28 01:21:15 +0000
@@ -87,7 +87,9 @@
 	 */	
 	public function getVars()
 	{
-		$vars = array_merge(  Vars::getVars(), $this->vars );
+		// Esta mezcla es redundante con la que sucede en Template
+		// pero se deja así en caso de que la vista no este basada en plantillas 
+		$vars = array_merge( Vars::getVars(), $this->vars );
 		return $vars;
 	}
 	
@@ -102,6 +104,13 @@
 	 */
 	abstract public function show();
 	
+	/**
+	 * Publica un mensaje
+	 * @param string $string
+	 * @return void
+	 */
+	abstract public function message( $string );
+	
 	//**********************************************************************************
 	// Métodos privados	
 	//**********************************************************************************

=== modified file 'include/lib/core/functions.core.php'
--- include/lib/core/functions.core.php	2009-11-20 20:39:27 +0000
+++ include/lib/core/functions.core.php	2010-01-28 01:21:15 +0000
@@ -85,6 +85,17 @@
 }
 
 /**
+ * Guarda un mensaje para el usuario
+ * @param string $string
+ * @return void
+ */
+function md_message( $string )
+{
+	$buffer = Buffer::getInstance();
+	$buffer->write( 'message', $string."\n" );
+}
+
+/**
  * Redirecciona la página a otra ubicación
  * @param string $location
  * @return void

=== modified file 'index.php'
--- index.php	2009-11-06 01:35:39 +0000
+++ index.php	2010-01-28 01:21:15 +0000
@@ -91,7 +91,7 @@
 
 if( !($view instanceof View) )
 {
-	$view_name = Registry::get('DEFAULT_VIEW');
+	$view_name = Registry::get('DEFAULT_VIEW').'View';
 	$view = new $view_name();
 }
 

=== added file 'templates/pages/message.tpl'
--- templates/pages/message.tpl	1970-01-01 00:00:00 +0000
+++ templates/pages/message.tpl	2010-01-28 01:21:15 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>[#:section_name] - [#:title]</title>
+</head>
+<body>
+<p>[#:message]</p>
+</body>
+</html>

=== added directory 'templates/tools'