cleaned project, repaired router
This commit is contained in:
parent
2156d3f5c6
commit
bffe0f1660
16 changed files with 1172 additions and 1440 deletions
|
@ -1,51 +1,40 @@
|
|||
<?php
|
||||
/**
|
||||
* Autoloader
|
||||
* Loads class files automatically when they are needed.
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
class Katharsis_Autoload
|
||||
{
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
protected static $_classLocations = array(
|
||||
'library',
|
||||
'application/controller',
|
||||
'application/model'
|
||||
);
|
||||
|
||||
/**
|
||||
* Registering autoload method
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function init()
|
||||
{
|
||||
spl_autoload_register('Katharsis_Autoload::autoload');
|
||||
}
|
||||
|
||||
/**
|
||||
* Actual autoload method. Loads class files automatically when they are needed
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function autoload($classname)
|
||||
{
|
||||
$name = str_replace("_", DIRECTORY_SEPARATOR, $classname);
|
||||
|
||||
foreach(self::$_classLocations as $location)
|
||||
{
|
||||
if(file_exists($location . DIRECTORY_SEPARATOR . $name . ".php"))
|
||||
{
|
||||
require_once $location . DIRECTORY_SEPARATOR . $name . ".php";
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
die('Autoload: could not load class "' . $classname . '"');
|
||||
}
|
||||
}
|
||||
<?php
|
||||
class Katharsis_Autoload
|
||||
{
|
||||
protected static $_classLocations = array(
|
||||
'library',
|
||||
'application/controller',
|
||||
'application/model'
|
||||
);
|
||||
|
||||
public static function init()
|
||||
{
|
||||
spl_autoload_register('Katharsis_Autoload::autoload');
|
||||
}
|
||||
|
||||
public static function autoload($classname)
|
||||
{
|
||||
if($location = self::findClass($classname))
|
||||
{
|
||||
require_once $location;
|
||||
return;
|
||||
}
|
||||
|
||||
throw new exception('Autoload: could not load class "' . $classname . '"');
|
||||
}
|
||||
|
||||
public static function findClass($classname)
|
||||
{
|
||||
$name = str_replace("_", DIRECTORY_SEPARATOR, $classname);
|
||||
|
||||
foreach(self::$_classLocations as $location)
|
||||
{
|
||||
if(file_exists($location . DIRECTORY_SEPARATOR . $name . ".php"))
|
||||
{
|
||||
return $location . DIRECTORY_SEPARATOR . $name . ".php";
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
?>
|
|
@ -1,29 +1,23 @@
|
|||
<?php require_once('library/Katharsis/Autoload.php');
|
||||
/**
|
||||
* Bootstrap Class
|
||||
* Central application routing entity
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
class Katharsis_Bootstrap
|
||||
{
|
||||
/**
|
||||
* Central application routing method
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function run()
|
||||
{
|
||||
$router = Katharsis_ControllerRouting::getInstance();
|
||||
|
||||
$router->init();
|
||||
|
||||
Katharsis_Controller_Plugin::preControllerHook();
|
||||
|
||||
$router->route();
|
||||
|
||||
Katharsis_Controller_Plugin::postControllerHook();
|
||||
}
|
||||
}
|
||||
<?php
|
||||
require_once('library/Katharsis/Autoload.php');
|
||||
|
||||
class Katharsis_Bootstrap
|
||||
{
|
||||
public static function init()
|
||||
{
|
||||
$router = Katharsis_ControllerRouting::getInstance();
|
||||
$router->init();
|
||||
}
|
||||
|
||||
public static function run()
|
||||
{
|
||||
$router = Katharsis_ControllerRouting::getInstance();
|
||||
|
||||
Katharsis_Controller_Plugin::preControllerHook();
|
||||
|
||||
$router->route();
|
||||
|
||||
Katharsis_Controller_Plugin::postControllerHook();
|
||||
}
|
||||
}
|
||||
?>
|
|
@ -1,105 +1,57 @@
|
|||
<?php
|
||||
/**
|
||||
* Abstract Controller
|
||||
* All controllers must extend this class.
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
abstract class Katharsis_Controller_Abstract
|
||||
{
|
||||
/**
|
||||
* @var Katharsis_Db5
|
||||
*/
|
||||
protected $_con;
|
||||
|
||||
/**
|
||||
* @var Katharsis_View
|
||||
*/
|
||||
protected $_view;
|
||||
|
||||
/**
|
||||
* Instances class attributes, calles init method
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public final function __construct()
|
||||
{
|
||||
$this->_con = Katharsis_DatabaseConnector::getConnection();
|
||||
$this->_view = Katharsis_View::getInstance();
|
||||
$this->init();
|
||||
}
|
||||
|
||||
/**
|
||||
* Overwrite this method instead of using a constructor
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function init()
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* If subclass hasn't got a __call method, this exception will be thrown
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __call($action, $params)
|
||||
{
|
||||
throw new Katharsis_Exception('Action "' . $action . '" doesn\'t exist.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a specific request parameter
|
||||
*
|
||||
* @param string $key
|
||||
* @return mixed
|
||||
*/
|
||||
protected function _getParam($key)
|
||||
{
|
||||
$params = Katharsis_Request::getParams();
|
||||
if(array_key_exists($key,$params))
|
||||
{
|
||||
return $params[$key];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all request parameters
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function _getAllParams()
|
||||
{
|
||||
return Katharsis_Request::getParams();
|
||||
}
|
||||
|
||||
/**
|
||||
* Forward to an other action
|
||||
*
|
||||
* @param string $action
|
||||
* @param string $controller
|
||||
* @param array $getParams
|
||||
* @return void
|
||||
*/
|
||||
protected function _location($action, $controller = null, $getParams = null)
|
||||
{
|
||||
if($controller === null)
|
||||
{
|
||||
$controller = Katharsis_Request::getControllerName();
|
||||
}
|
||||
|
||||
$paramstring = "";
|
||||
if($getParams !== null)
|
||||
{
|
||||
foreach($getParams as $key => $value)
|
||||
{
|
||||
$paramstring .= "/" . (string) $key . "/" . (string) $value;
|
||||
}
|
||||
}
|
||||
|
||||
header("location: " . $this->_view->base . "/" . $controller . "/" . $action . $paramstring);
|
||||
}
|
||||
}
|
||||
<?php
|
||||
abstract class Katharsis_Controller_Abstract
|
||||
{
|
||||
protected $_con;
|
||||
protected $_view;
|
||||
|
||||
public final function __construct()
|
||||
{
|
||||
$this->_con = Katharsis_DatabaseConnector::getConnection();
|
||||
$this->_view = Katharsis_View::getInstance();
|
||||
$this->init();
|
||||
}
|
||||
|
||||
public function init()
|
||||
{
|
||||
}
|
||||
|
||||
public function __call($action, $params)
|
||||
{
|
||||
throw new Katharsis_Exception('Die von Ihnen angeforderte Seite (Action) "' . substr($action, 0, -6) . '" konnte nicht gefunden werden.');
|
||||
}
|
||||
|
||||
protected function _getParam($key)
|
||||
{
|
||||
$params = Katharsis_Request::getParams();
|
||||
if(array_key_exists($key,$params))
|
||||
{
|
||||
return $params[$key];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
protected function _getAllParams()
|
||||
{
|
||||
return Katharsis_Request::getParams();
|
||||
}
|
||||
|
||||
protected function _location($action, $controller = null, $getParams = null)
|
||||
{
|
||||
if($controller === null)
|
||||
{
|
||||
$controller = Katharsis_Request::getControllerName();
|
||||
}
|
||||
|
||||
$paramstring = "";
|
||||
if($getParams !== null)
|
||||
{
|
||||
foreach($getParams as $key => $value)
|
||||
{
|
||||
$paramstring .= "/" . (string) $key . "/" . (string) $value;
|
||||
}
|
||||
}
|
||||
|
||||
header("location: " . $this->_view->base . "/" . $controller . "/" . $action . $paramstring);
|
||||
}
|
||||
}
|
||||
?>
|
|
@ -1,53 +1,27 @@
|
|||
<?php
|
||||
/**
|
||||
* Central Plugin Class
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
class Katharsis_Controller_Plugin
|
||||
{
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
protected static $_plugins;
|
||||
|
||||
/**
|
||||
* Register all plugins with this method
|
||||
* Plugins will be called in the same order as they have been registered
|
||||
*
|
||||
* @param object $object - an instance of your plugin
|
||||
* @return void
|
||||
*/
|
||||
public static function registerPlugin($object)
|
||||
{
|
||||
self::$_plugins[] = $object;
|
||||
}
|
||||
|
||||
/**
|
||||
* Processes preController methods of all plugins
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function preControllerHook()
|
||||
{
|
||||
foreach(self::$_plugins as $plugin)
|
||||
{
|
||||
$plugin->preController();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Processes postController methods of all plugins
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function postControllerHook()
|
||||
{
|
||||
foreach(self::$_plugins as $plugin)
|
||||
{
|
||||
$plugin->postController();
|
||||
}
|
||||
}
|
||||
}
|
||||
<?php
|
||||
class Katharsis_Controller_Plugin
|
||||
{
|
||||
protected static $_plugins;
|
||||
|
||||
public static function registerPlugin($object)
|
||||
{
|
||||
self::$_plugins[] = $object;
|
||||
}
|
||||
|
||||
public static function preControllerHook()
|
||||
{
|
||||
foreach(self::$_plugins as $plugin)
|
||||
{
|
||||
$plugin->preController();
|
||||
}
|
||||
}
|
||||
|
||||
public static function postControllerHook()
|
||||
{
|
||||
foreach(self::$_plugins as $plugin)
|
||||
{
|
||||
$plugin->postController();
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
|
@ -1,36 +1,19 @@
|
|||
<?php
|
||||
/**
|
||||
* Abstract Controller Plugin
|
||||
* All controller plugins must extend this class.
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
abstract class Katharsis_Controller_Plugin_Abstract
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->_con = Katharsis_DatabaseConnector::getConnection();
|
||||
}
|
||||
|
||||
/**
|
||||
* Overwrite this method, if you want something to be processed
|
||||
* _before_ the controller is called
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function preController()
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Overwrite this method, if you want something to be processed
|
||||
* _after_ the controller was called
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function postController()
|
||||
{
|
||||
}
|
||||
}
|
||||
<?php
|
||||
abstract class Katharsis_Controller_Plugin_Abstract
|
||||
{
|
||||
protected $_con;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->_con = Katharsis_DatabaseConnector::getConnection();
|
||||
}
|
||||
|
||||
public function preController()
|
||||
{
|
||||
}
|
||||
|
||||
public function postController()
|
||||
{
|
||||
}
|
||||
}
|
||||
?>
|
21
library/Katharsis/Controller/Plugin/AutoScriptControl.php
Normal file
21
library/Katharsis/Controller/Plugin/AutoScriptControl.php
Normal file
|
@ -0,0 +1,21 @@
|
|||
<?php
|
||||
class Katharsis_Controller_Plugin_AutoScriptControl extends Katharsis_Controller_Plugin_Abstract
|
||||
{
|
||||
public function preController()
|
||||
{
|
||||
$view = Katharsis_View::getInstance();
|
||||
|
||||
$view->autoScriptFile = false;
|
||||
|
||||
|
||||
|
||||
$scriptName = ucfirst(Katharsis_Request::getControllerName()) . '/' . strtolower(Katharsis_Request::getActionName());
|
||||
$autoScriptFile = 'scripts/DidgeridooArtwork/' . $scriptName . '.js';
|
||||
$sl = DIRECTORY_SEPARATOR;
|
||||
|
||||
if(file_exists(getcwd() . $sl . str_replace('/', $sl, $autoScriptFile)))
|
||||
{
|
||||
$view->autoScriptFile = $view->base . '/' . $autoScriptFile;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,33 +1,20 @@
|
|||
<?php
|
||||
/**
|
||||
* Autorender Controller Plugin
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
class Katharsis_Controller_Plugin_Autorender extends Katharsis_Controller_Plugin_Abstract
|
||||
{
|
||||
/**
|
||||
* Renders a controller/action.phtml template automaticly after processing controller
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function postController()
|
||||
{
|
||||
|
||||
$view = Katharsis_View::getInstance();
|
||||
|
||||
$view->controllerAction = false;
|
||||
|
||||
$templateName = strtolower(Katharsis_Request::getControllerName()) . DIRECTORY_SEPARATOR . strtolower(Katharsis_Request::getActionName());
|
||||
|
||||
if(file_exists('application/view' . DIRECTORY_SEPARATOR . $templateName . '.phtml'))
|
||||
{
|
||||
$view->controllerAction = $templateName;
|
||||
}
|
||||
|
||||
$view = Katharsis_View::getInstance();
|
||||
echo $view->render('main');
|
||||
}
|
||||
}
|
||||
<?php
|
||||
class Katharsis_Controller_Plugin_Autorender extends Katharsis_Controller_Plugin_Abstract
|
||||
{
|
||||
public function postController()
|
||||
{
|
||||
$view = Katharsis_View::getInstance();
|
||||
|
||||
$view->stageContent = false;
|
||||
|
||||
$templateName = ucfirst(Katharsis_Request::getControllerName()) . DIRECTORY_SEPARATOR . strtolower(Katharsis_Request::getActionName());
|
||||
|
||||
if(file_exists(getcwd() . '/application/view' . DIRECTORY_SEPARATOR . $templateName . '.phtml'))
|
||||
{
|
||||
$view->stageContent = $view->render($templateName);
|
||||
}
|
||||
|
||||
echo $view->render('main');
|
||||
}
|
||||
}
|
||||
?>
|
|
@ -1,136 +1,102 @@
|
|||
<?php
|
||||
/**
|
||||
* Controller Router
|
||||
* Specific routing entity
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
class Katharsis_ControllerRouting
|
||||
{
|
||||
/**
|
||||
* @var Katharsis_ControllerRouting
|
||||
*/
|
||||
protected static $_instance = null;
|
||||
|
||||
/**
|
||||
* Singleton. Returns the same instance every time
|
||||
*
|
||||
* @return Katharsis_ControllerRouting
|
||||
*/
|
||||
public static function getInstance()
|
||||
{
|
||||
if(self::$_instance === null)
|
||||
{
|
||||
self::$_instance = new self();
|
||||
}
|
||||
return self::$_instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets default controller and action names
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function __construct()
|
||||
{
|
||||
Katharsis_Request::setControllerName('index');
|
||||
Katharsis_Request::setActionName('index');
|
||||
}
|
||||
|
||||
/**
|
||||
* Initiates routing process
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function init()
|
||||
{
|
||||
$paramstring = "";
|
||||
$baseUrl = preg_replace('#(.*/)[^/]+#', '\1', $_SERVER['SCRIPT_NAME']);
|
||||
|
||||
if(preg_match("~.*" . $baseUrl . "([^/\?]+)/([^/\?]+)/*([^\?]*)~", $_SERVER['REQUEST_URI'], $matches))
|
||||
{
|
||||
$controller = $matches[1];
|
||||
$action = $matches[2];
|
||||
$paramstring = $matches[3];
|
||||
$params = $this->_buildParams($paramstring);
|
||||
|
||||
Katharsis_Request::setControllerName($controller);
|
||||
Katharsis_Request::setActionName($action);
|
||||
} else if(preg_match("~.*" . $baseUrl . "([^/\?]+)/*([^\?]*)~", $_SERVER['REQUEST_URI'], $matches))
|
||||
{
|
||||
$controller = $matches[1];
|
||||
$paramstring = $matches[2];
|
||||
$params = $this->_buildParams($paramstring);
|
||||
|
||||
Katharsis_Request::setControllerName($controller);
|
||||
} else
|
||||
{
|
||||
if(array_key_exists('controller', $_GET))
|
||||
{
|
||||
$controller = $_GET['controller'];
|
||||
Katharsis_Request::setControllerName($controller);
|
||||
}
|
||||
|
||||
if(array_key_exists('action', $_GET))
|
||||
{
|
||||
$action = $_GET['action'];
|
||||
Katharsis_Request::setActionName($action);
|
||||
}
|
||||
|
||||
$params = $_GET;
|
||||
}
|
||||
|
||||
Katharsis_Request::setParams($params);
|
||||
|
||||
Katharsis_View::getInstance()->requestHook();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Routing processing method
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function route()
|
||||
{
|
||||
$controllerName = ucfirst(Katharsis_Request::getControllerName()) . 'Controller';
|
||||
$action = Katharsis_Request::getActionName() . 'Action';
|
||||
|
||||
if(class_exists($controllerName))
|
||||
{
|
||||
$controllerObject = new $controllerName();
|
||||
|
||||
$controllerObject->$action();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Splits parameters to an array and returns them
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function _buildParams($string)
|
||||
{
|
||||
$params = array();
|
||||
if(trim($string) !== '')
|
||||
{
|
||||
$urlparams = explode("/", $string);
|
||||
|
||||
for($i = 0; $i < count($urlparams); $i=$i+2)
|
||||
{
|
||||
if(array_key_exists($i+1, $urlparams))
|
||||
{
|
||||
$params[$urlparams[$i]] = $urlparams[$i+1];
|
||||
} else
|
||||
{
|
||||
$params[$urlparams[$i]] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $params;
|
||||
}
|
||||
}
|
||||
<?php
|
||||
class Katharsis_ControllerRouting
|
||||
{
|
||||
protected static $_instance = null;
|
||||
|
||||
public static function getInstance()
|
||||
{
|
||||
if(self::$_instance === null)
|
||||
{
|
||||
self::$_instance = new self();
|
||||
}
|
||||
return self::$_instance;
|
||||
}
|
||||
|
||||
protected function __construct()
|
||||
{
|
||||
Katharsis_Request::setControllerName('index');
|
||||
Katharsis_Request::setActionName('index');
|
||||
}
|
||||
|
||||
public function init()
|
||||
{
|
||||
$paramstring = "";
|
||||
$baseUrl = preg_replace('#(.*/)[^/]+#', '\1', $_SERVER['SCRIPT_NAME']);
|
||||
|
||||
if(preg_match("~/([^/\?]+)/([^/\?]+)/*([^\?]*)~", $_SERVER['REQUEST_URI'], $matches))
|
||||
{
|
||||
$controller = $matches[1];
|
||||
$action = $matches[2];
|
||||
$paramstring = $matches[3];
|
||||
$params = $this->_buildParams($paramstring);
|
||||
|
||||
Katharsis_Request::setControllerName($controller);
|
||||
Katharsis_Request::setActionName($action);
|
||||
}
|
||||
else if(preg_match("~/([^/\?]+)/*([^\?]*)~", $_SERVER['REQUEST_URI'], $matches))
|
||||
{
|
||||
$controller = $matches[1];
|
||||
$paramstring = $matches[2];
|
||||
$params = $this->_buildParams($paramstring);
|
||||
|
||||
Katharsis_Request::setControllerName($controller);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(array_key_exists('controller', $_GET))
|
||||
{
|
||||
$controller = $_GET['controller'];
|
||||
Katharsis_Request::setControllerName($controller);
|
||||
}
|
||||
|
||||
if(array_key_exists('action', $_GET))
|
||||
{
|
||||
$action = $_GET['action'];
|
||||
Katharsis_Request::setActionName($action);
|
||||
}
|
||||
|
||||
$params = $_GET;
|
||||
}
|
||||
|
||||
Katharsis_Request::setParams($params);
|
||||
|
||||
Katharsis_View::getInstance()->requestHook();
|
||||
}
|
||||
|
||||
public function route()
|
||||
{
|
||||
$controllerName = ucfirst(Katharsis_Request::getControllerName()) . 'Controller';
|
||||
$action = Katharsis_Request::getActionName() . 'Action';
|
||||
|
||||
if(class_exists($controllerName))
|
||||
{
|
||||
$controllerObject = new $controllerName();
|
||||
|
||||
$controllerObject->$action();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected function _buildParams($string)
|
||||
{
|
||||
$params = array();
|
||||
if(trim($string) !== '')
|
||||
{
|
||||
$urlparams = explode("/", $string);
|
||||
|
||||
for($i = 0; $i < count($urlparams); $i=$i+2)
|
||||
{
|
||||
if(array_key_exists($i+1, $urlparams))
|
||||
{
|
||||
$params[$urlparams[$i]] = $urlparams[$i+1];
|
||||
} else
|
||||
{
|
||||
$params[$urlparams[$i]] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $params;
|
||||
}
|
||||
}
|
||||
?>
|
|
@ -1,130 +1,92 @@
|
|||
<?php
|
||||
/**
|
||||
* Database Connector
|
||||
* controls database connections
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
class Katharsis_DatabaseConnector
|
||||
{
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
public static $_conns = array();
|
||||
|
||||
/**
|
||||
* Reading ini file information and connecting
|
||||
*
|
||||
* @param string $requestedName
|
||||
* @return Katharsis_Db5
|
||||
*/
|
||||
protected static function connect($requestedName = null)
|
||||
{
|
||||
$ini = parse_ini_file('config/database.config.ini', true);
|
||||
if($ini !== array())
|
||||
{
|
||||
$conInformation = self::_selectConnection($ini, $requestedName);
|
||||
return self::_realConnect($conInformation);
|
||||
} else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Connects to all connections in config file
|
||||
*
|
||||
* @param string $requestedName
|
||||
* @return void
|
||||
*/
|
||||
public static function connectAll()
|
||||
{
|
||||
$groups = parse_ini_file('config/database.config.ini', true);
|
||||
|
||||
foreach($groups as $iniName => $conInformation)
|
||||
{
|
||||
if(preg_match("~^connection:([^:]+)~", $iniName, $matches))
|
||||
{
|
||||
self::getConnection($matches[1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Calling Katharsis Db connecting method
|
||||
*
|
||||
* @param string $requestedName
|
||||
* @return Katharsis_Db5
|
||||
*/
|
||||
protected static function _realConnect($conInformation)
|
||||
{
|
||||
$con = new Katharsis_Db5($conInformation['host'], $conInformation['user'], $conInformation['password'], $conInformation['database']);
|
||||
|
||||
self::$_conns[$conInformation['name']]['connection'] = $con;
|
||||
self::$_conns[$conInformation['name']]['info'] = $conInformation;
|
||||
|
||||
return $con;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns specified or default connection
|
||||
*
|
||||
* @param string $requestedName
|
||||
* @return Katharsis_Db5
|
||||
*/
|
||||
public static function getConnection($requestedName = null)
|
||||
{
|
||||
if($requestedName === null)
|
||||
{
|
||||
foreach(self::$_conns as $con)
|
||||
{
|
||||
if($con['info']['default'] === true)
|
||||
{
|
||||
return $con['connection'];
|
||||
}
|
||||
}
|
||||
return self::connect(null);
|
||||
} else
|
||||
{
|
||||
if(in_array($requestedName, array_keys(self::$_conns)))
|
||||
{
|
||||
return self::$_conns[$requestedName]['connection'];
|
||||
}
|
||||
return self::connect($requestedName);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an array of connection information
|
||||
*
|
||||
* @param array $ini
|
||||
* @param string $requestedName
|
||||
* @return array
|
||||
*/
|
||||
protected static function _selectConnection($ini, $requestedName = null)
|
||||
{
|
||||
foreach($ini as $name => $connectionInfo)
|
||||
{
|
||||
if($requestedName === null)
|
||||
{
|
||||
if(preg_match("~^connection:([^:]+):default~", $name, $matches))
|
||||
{
|
||||
$connectionInfo['name'] = $matches[1];
|
||||
$connectionInfo['default'] = true;
|
||||
return $connectionInfo;
|
||||
}
|
||||
} else
|
||||
{
|
||||
if(preg_match("~^connection:" . $requestedName . ".*~", $name))
|
||||
{
|
||||
$connectionInfo['default'] = false;
|
||||
$connectionInfo['name'] = $requestedName;
|
||||
return $connectionInfo;
|
||||
}
|
||||
}
|
||||
}
|
||||
throw new Katharsis_Exception('Could not find database connection information for "' . $requestedName . '"');
|
||||
}
|
||||
}
|
||||
<?php
|
||||
class Katharsis_DatabaseConnector
|
||||
{
|
||||
public static $_conns = array();
|
||||
|
||||
protected static function connect($requestedName = null)
|
||||
{
|
||||
$ini = parse_ini_file('config/database.config.ini', true);
|
||||
if($ini !== array())
|
||||
{
|
||||
$conInformation = self::_selectConnection($ini, $requestedName);
|
||||
return self::_realConnect($conInformation);
|
||||
} else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static function connectAll($requestedName = null)
|
||||
{
|
||||
$groups = parse_ini_file('config/database.config.ini', true);
|
||||
|
||||
foreach($groups as $iniName => $conInformation)
|
||||
{
|
||||
if(preg_match("~^connection:([^:]+)~", $iniName, $matches))
|
||||
{
|
||||
self::getConnection($matches[1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected static function _realConnect($conInformation)
|
||||
{
|
||||
//$con = new PDO('mysql:host=' . $conInformation['host'] . ';dbname=' . $conInformation['database'], $conInformation['user'], $conInformation['password']);
|
||||
|
||||
|
||||
$con = new Katharsis_Db5($conInformation['host'], $conInformation['user'], $conInformation['password'], $conInformation['database']);
|
||||
|
||||
self::$_conns[$conInformation['name']]['connection'] = $con;
|
||||
self::$_conns[$conInformation['name']]['info'] = $conInformation;
|
||||
|
||||
return $con;
|
||||
}
|
||||
|
||||
public static function getConnection($requestedName = null)
|
||||
{
|
||||
if($requestedName === null)
|
||||
{
|
||||
foreach(self::$_conns as $con)
|
||||
{
|
||||
if($con['info']['default'] === true)
|
||||
{
|
||||
return $con['connection'];
|
||||
}
|
||||
}
|
||||
return self::connect(null);
|
||||
} else
|
||||
{
|
||||
if(in_array($requestedName, array_keys(self::$_conns)))
|
||||
{
|
||||
return self::$_conns[$requestedName]['connection'];
|
||||
}
|
||||
return self::connect($requestedName);
|
||||
}
|
||||
}
|
||||
|
||||
protected static function _selectConnection($ini, $requestedName = null)
|
||||
{
|
||||
foreach($ini as $name => $connectionInfo)
|
||||
{
|
||||
if($requestedName === null)
|
||||
{
|
||||
if(preg_match("~^connection:([^:]+):default~", $name, $matches))
|
||||
{
|
||||
$connectionInfo['name'] = $matches[1];
|
||||
$connectionInfo['default'] = true;
|
||||
return $connectionInfo;
|
||||
}
|
||||
} else
|
||||
{
|
||||
if(preg_match("~^connection:" . $requestedName . ".*~", $name))
|
||||
{
|
||||
$connectionInfo['default'] = false;
|
||||
$connectionInfo['name'] = $requestedName;
|
||||
return $connectionInfo;
|
||||
}
|
||||
}
|
||||
}
|
||||
throw new Katharsis_Exception('Could not find database connection information for "' . $requestedName . '"');
|
||||
}
|
||||
}
|
||||
?>
|
File diff suppressed because it is too large
Load diff
|
@ -1,11 +1,4 @@
|
|||
<?php
|
||||
/**
|
||||
* Katharsis Exception
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
class Katharsis_Exception extends Exception
|
||||
{
|
||||
<?php
|
||||
class Katharsis_Exception extends Exception
|
||||
{
|
||||
}
|
|
@ -1,36 +1,16 @@
|
|||
<?php
|
||||
/**
|
||||
* Abstract Model
|
||||
* All models must extend this class.
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
abstract class Katharsis_Model_Abstract
|
||||
{
|
||||
/**
|
||||
* @var Katharsis_Db5
|
||||
*/
|
||||
protected $_con;
|
||||
|
||||
/**
|
||||
* Instances class attributes, calles init method
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public final function __construct()
|
||||
{
|
||||
$this->_con = Katharsis_DatabaseConnector::getConnection();
|
||||
$this->init();
|
||||
}
|
||||
|
||||
/**
|
||||
* Overwrite this method instead of using a constructor
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function init()
|
||||
{
|
||||
}
|
||||
}
|
||||
<?php
|
||||
abstract class Katharsis_Model_Abstract
|
||||
{
|
||||
protected $_con;
|
||||
|
||||
public final function __construct()
|
||||
{
|
||||
$this->_con = Katharsis_DatabaseConnector::getConnection();
|
||||
$this->init();
|
||||
}
|
||||
|
||||
public function init()
|
||||
{
|
||||
}
|
||||
}
|
||||
?>
|
|
@ -1,93 +1,44 @@
|
|||
<?php
|
||||
/**
|
||||
* Katharsis Request
|
||||
* Represents a http call
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
class Katharsis_Request
|
||||
{
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected static $_controller;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected static $_action;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
protected static $_params = array();
|
||||
|
||||
/**
|
||||
* Set name of controller
|
||||
*
|
||||
* @param string $name
|
||||
* @return void
|
||||
*/
|
||||
public static function setControllerName($name)
|
||||
{
|
||||
self::$_controller = $name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set name of action
|
||||
*
|
||||
* @param string $name
|
||||
* @return void
|
||||
*/
|
||||
public static function setActionName($name)
|
||||
{
|
||||
self::$_action = $name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set parameters
|
||||
*
|
||||
* @param array $params
|
||||
* @return void
|
||||
*/
|
||||
public static function setParams($params)
|
||||
{
|
||||
foreach($_POST as $key => $value)
|
||||
{
|
||||
$params[$key] = $value;
|
||||
}
|
||||
self::$_params = $params;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get controller name
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function getControllerName()
|
||||
{
|
||||
return self::$_controller;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get action name
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function getActionName()
|
||||
{
|
||||
return self::$_action;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get parameter array
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public static function getParams()
|
||||
{
|
||||
return self::$_params;
|
||||
}
|
||||
}
|
||||
<?php
|
||||
class Katharsis_Request
|
||||
{
|
||||
protected static $_controller = null;
|
||||
protected static $_action = null;
|
||||
protected static $_params = array();
|
||||
|
||||
public static function setControllerName($name)
|
||||
{
|
||||
self::$_controller = $name;
|
||||
}
|
||||
|
||||
public static function setActionName($name)
|
||||
{
|
||||
self::$_action = $name;
|
||||
}
|
||||
|
||||
public static function setParams($params)
|
||||
{
|
||||
foreach($_POST as $key => $value)
|
||||
{
|
||||
$params[$key] = $value;
|
||||
}
|
||||
self::$_params = $params;
|
||||
|
||||
}
|
||||
|
||||
public static function getControllerName()
|
||||
{
|
||||
return self::$_controller;
|
||||
}
|
||||
|
||||
public static function getActionName()
|
||||
{
|
||||
return self::$_action;
|
||||
}
|
||||
|
||||
|
||||
public static function getParams()
|
||||
{
|
||||
return self::$_params;
|
||||
}
|
||||
}
|
||||
?>
|
|
@ -1,101 +1,73 @@
|
|||
<?php
|
||||
/**
|
||||
* Katharsis View
|
||||
* Controls anything related to the display level
|
||||
*
|
||||
* @author Karl Pannek <info@katharsis.in>
|
||||
* @version 0.5.2
|
||||
* @package Katharsis
|
||||
*/
|
||||
class Katharsis_View
|
||||
{
|
||||
/**
|
||||
* @var Katharsis_View
|
||||
*/
|
||||
protected static $_instance = null;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
protected $_params = array();
|
||||
|
||||
/**
|
||||
* Singleton. Returns the same instance every time
|
||||
*
|
||||
* @return Katharsis_View
|
||||
*/
|
||||
public static function getInstance()
|
||||
{
|
||||
if(self::$_instance === null)
|
||||
{
|
||||
self::$_instance = new self();
|
||||
}
|
||||
return self::$_instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets base application path
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function __construct()
|
||||
{
|
||||
$base = preg_replace('/(.+)\/[^\/]+/', '\1', $_SERVER['SCRIPT_NAME']);
|
||||
$this->_params['base'] = $base != $_SERVER['SCRIPT_NAME'] ? $base : '';
|
||||
}
|
||||
|
||||
/**
|
||||
* Magical get method, gets specific param
|
||||
*
|
||||
* @param string $name
|
||||
* @return string
|
||||
*/
|
||||
public function __get($name)
|
||||
{
|
||||
if(array_key_exists($name, $this->_params))
|
||||
{
|
||||
return $this->_params[$name];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Magical set method, sets specific param
|
||||
*
|
||||
* @param string name
|
||||
* @param string value
|
||||
*/
|
||||
public function __set($name, $value)
|
||||
{
|
||||
$this->_params[$name] = $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Template rendering method
|
||||
*
|
||||
* @param string $template
|
||||
* @return string
|
||||
*/
|
||||
public function render($template)
|
||||
{
|
||||
ob_start();
|
||||
if(file_exists('application/view/' . $template . '.phtml'))
|
||||
{
|
||||
include('application/view/' . $template . '.phtml');
|
||||
}
|
||||
$output = ob_get_contents();
|
||||
ob_end_clean();
|
||||
|
||||
return $output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets Request params into View params
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function requestHook()
|
||||
{
|
||||
$this->_params['params'] = Katharsis_Request::getParams();
|
||||
}
|
||||
}
|
||||
<?php
|
||||
class Katharsis_View
|
||||
{
|
||||
protected static $_instance = null;
|
||||
protected $_items = array();
|
||||
|
||||
public static function getInstance()
|
||||
{
|
||||
if(self::$_instance === null)
|
||||
{
|
||||
self::$_instance = new self();
|
||||
}
|
||||
return self::$_instance;
|
||||
}
|
||||
|
||||
protected function __construct()
|
||||
{
|
||||
$base = preg_replace('/(.+)\/[^\/]+/', '\1', $_SERVER['SCRIPT_NAME']);
|
||||
$this->_items['base'] = $base != $_SERVER['SCRIPT_NAME'] ? $base : '';
|
||||
}
|
||||
|
||||
public function __get($name)
|
||||
{
|
||||
if(array_key_exists($name, $this->_items))
|
||||
{
|
||||
if(is_array($this->_items[$name]))
|
||||
{
|
||||
return (array) $this->_items[$name];
|
||||
}
|
||||
return $this->_items[$name];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public function __set($name, $value)
|
||||
{
|
||||
$this->_items[$name] = $value;
|
||||
}
|
||||
|
||||
public function render($template)
|
||||
{
|
||||
ob_start();
|
||||
if(file_exists('application/view/' . $template . '.phtml'))
|
||||
{
|
||||
include('application/view/' . $template . '.phtml');
|
||||
}
|
||||
$output = ob_get_contents();
|
||||
ob_end_clean();
|
||||
|
||||
return $output;
|
||||
}
|
||||
|
||||
public function requestHook()
|
||||
{
|
||||
}
|
||||
|
||||
public function _getParam($key)
|
||||
{
|
||||
$params = Katharsis_Request::getParams();
|
||||
if(array_key_exists($key,$params))
|
||||
{
|
||||
return $params[$key];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public function formatDate($date)
|
||||
{
|
||||
$date = explode("-", $date);
|
||||
return $date[2] . '.' . $date[1] . '.' . $date[0];
|
||||
}
|
||||
}
|
||||
?>
|
|
@ -1,4 +1,7 @@
|
|||
RewriteEngine On
|
||||
|
||||
RewriteBase /
|
||||
|
||||
RewriteCond %{REQUEST_FILENAME} -s [OR]
|
||||
RewriteCond %{REQUEST_FILENAME} -l [OR]
|
||||
RewriteCond %{REQUEST_FILENAME} -d
|
||||
|
|
|
@ -23,6 +23,7 @@ Katharsis_Controller_Plugin::registerPlugin(new DidgeridooArtwork_Controller_Plu
|
|||
|
||||
|
||||
try {
|
||||
Katharsis_Bootstrap::init();
|
||||
Katharsis_Bootstrap::run();
|
||||
} catch(Exception $e)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue