Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
renamed Clansuite\CMS to Clansuite\Application
  • Loading branch information
jakoch committed Sep 2, 2012
1 parent 184ef2d commit 04726d1
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Clansuite/Core/Mvc/ModuleController.php
Expand Up @@ -10,6 +10,6 @@ class ModuleController extends \Koch\Module\Controller
*/
public function getClansuiteConfig()
{
return $this->config = \Clansuite\CMS::getClansuiteConfig();
return $this->config = \Clansuite\Application::getClansuiteConfig();
}
}
2 changes: 1 addition & 1 deletion framework/Koch/Config/Config.php
Expand Up @@ -56,7 +56,7 @@ public function __construct()
{
// if empty get from Clansuite_CMS
if (empty($this->config)) {
$this->config = \Clansuite\CMS::getClansuiteConfig();
$this->config = \Clansuite\Application::getClansuiteConfig();
}
}

Expand Down
2 changes: 0 additions & 2 deletions framework/Koch/Exception/Errorhandler.php
Expand Up @@ -32,8 +32,6 @@
* Koch Framework - Class for Errorhandling
*
* Sets up a custom Errorhandler.
* @see Clansuite\CMS::initialize_Errorhandling()
*
* @example
* <code>
* 1) trigger_error('Errormessage', E_ERROR_TYPE);
Expand Down
2 changes: 1 addition & 1 deletion framework/Koch/Http/HttpResponse.php
Expand Up @@ -234,7 +234,7 @@ public static function sendResponse()
}

// make it possible to attach HTML content to the body directly before flushing the response
\Clansuite\CMS::triggerEvent('onBeforeResponse', array('content' => self::$content));
// \Clansuite\Application::triggerEvent('onBeforeResponse', array('content' => self::$content));

// Finally echo the response body
echo self::getContent();
Expand Down
4 changes: 2 additions & 2 deletions framework/Koch/Module/Controller.php
Expand Up @@ -81,7 +81,7 @@ public function __construct(HttpRequestInterface $request, HttpResponseInterface
{
$this->request = $request;
$this->response = $response;
$this->doctrine_em = \Clansuite\CMS::getEntityManager();
$this->doctrine_em = \Clansuite\Application::getEntityManager();
}

/**
Expand Down Expand Up @@ -255,7 +255,7 @@ public static function getConfigValue($keyname, $default_one = null, $default_tw
*/
public static function getInjector()
{
return \Clansuite\CMS::getInjector();
return \Clansuite\Application::getInjector();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion framework/Koch/Router/Router.php
Expand Up @@ -102,7 +102,7 @@ public function __construct(HttpRequestInterface $request)
$this->request = $request;

// Set config object to the router for later access to config variables.
$this->config = \Clansuite\CMS::getClansuiteConfig();
$this->config = \Clansuite\Application::getClansuiteConfig();

// get URI from request, clean it and set it as a class property
$this->uri = self::prepareRequestURI($request->getRequestURI());
Expand Down
8 changes: 4 additions & 4 deletions framework/Koch/Session/Session.php
Expand Up @@ -228,7 +228,7 @@ public function session_close()
public function session_read( $session_id )
{
try {
$em = \Clansuite\CMS::getEntityManager();
$em = \Clansuite\Application::getEntityManager();
$query = $em->createQuery('SELECT s.session_data, s.session_starttime
FROM \Entities\Session s
WHERE s.session_name = :name
Expand Down Expand Up @@ -274,7 +274,7 @@ public function session_write($session_id, $data)
/**
* Try to INSERT Session Data or REPLACE Session Data in case session_id already exists
*/
$em = \Clansuite\CMS::getEntityManager();
$em = \Clansuite\Application::getEntityManager();

$query = $em->createQuery(
'UPDATE \Entities\Session s
Expand Down Expand Up @@ -323,7 +323,7 @@ public function session_destroy($session_id)
/**
* Delete session from DB
*/
$em = \Clansuite\CMS::getEntityManager();
$em = \Clansuite\Application::getEntityManager();

$query = $em->createQuery(
'DELETE \Entities\Session s
Expand Down Expand Up @@ -369,7 +369,7 @@ public function session_gc($maxlifetime = 30)
$sessionlifetime = $maxlifetime * 60;
$expire_time = time() + $sessionlifetime;

$em = \Clansuite\CMS::getEntityManager();
$em = \Clansuite\Application::getEntityManager();

$query = $em->createQuery(
'DELETE \Entities\Session s
Expand Down
2 changes: 1 addition & 1 deletion framework/Koch/User/GuestUser.php
Expand Up @@ -58,7 +58,7 @@ public static function instantiate()

public function __construct()
{
$this->config = \Clansuite\CMS::getInjector()->instantiate('Koch\Config\Config');
$this->config = \Clansuite\Application::getInjector()->instantiate('Koch\Config\Config');

/**
* Fill $_SESSION[user] with Guest-User-infos
Expand Down
4 changes: 2 additions & 2 deletions framework/Koch/View/Helper/Smarty/function.load_module.php
Expand Up @@ -49,8 +49,8 @@ function smarty_function_load_module($params, $smarty)

// Instantiate Class
$controller = new $classname(
\Clansuite\CMS::getInjector()->instantiate('Koch\Http\HttpRequest'),
\Clansuite\CMS::getInjector()->instantiate('Koch\Http\HttpResponse')
\Clansuite\Application::getInjector()->instantiate('Koch\Http\HttpRequest'),
\Clansuite\Application::getInjector()->instantiate('Koch\Http\HttpResponse')
);
$controller->setView($smarty);
#$controller->setModel($module);
Expand Down
4 changes: 2 additions & 2 deletions tests/bootstrap.php
Expand Up @@ -86,8 +86,8 @@

// acquire clansuite path constants
include dirname(__DIR__) . '/application/CMS.php';
\Clansuite\CMS::define_ConstantsAndPaths();
\Clansuite\CMS::initialize_Loader();
\Clansuite\Application::define_ConstantsAndPaths();
\Clansuite\Application::initialize_Loader();

\Koch\Localization\Utf8::initialize();

Expand Down

0 comments on commit 04726d1

Please sign in to comment.