Changeset 4599


Ignore:
Timestamp:
08/27/10 23:01:58 (18 months ago)
Author:
vain
Message:
  • minor change to all security constant checks
  • fixed the non rewrite routing
Location:
trunk
Files:
9 added
240 edited

Legend:

Unmodified
Added
Removed

  • trunk/.htaccess

    r4576 r4599  
    1313    RewriteRule !\.(js|ico|gif|jpg|png|css)$ /index.php [QSA,L] 
    1414</IfModule> 
     15 
     16# disable direct access to text, log and template files 
     17<FilesMatch "(\.txt|\.log$|\.tpl$)"> 
     18order allow,deny 
     19deny from all 
     20</FilesMatch> 
    1521 
    1622<IfModule mod_php5.c> 

  • trunk/configuration/events.config.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/acm.class.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/bbcode.core.php

    r4578 r4599  
    3232 
    3333//Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/bootstrap/clansuite.loader.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/bootstrap/clansuite.version.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/breadcrumb.core.php

    r4578 r4599  
    3333 
    3434# Security Handler 
    35 if (defined('IN_CS') == false) 
     35if (defined('IN_CS') === false) 
    3636{ 
    3737    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/cache/apc.cache.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/cache/eaccelerator.cache.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/cache/file.cache.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/cache/memcached.cache.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/cache/xcache.cache.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/config.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    127127        if(false === is_object($this->confighandler)) 
    128128        { 
    129             $this->confighandler = Clansuite_Config_Factory::getConfiguration($filename); 
     129             $this->confighandler = Clansuite_Config_Factory::getHandler($filename); 
    130130        } 
    131131 

  • trunk/core/config/config.base.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/config/db.config.php

    r4578 r4599  
    3333 
    3434# Security Handler 
    35 if(defined('IN_CS') == false) 
     35if(defined('IN_CS') === false) 
    3636{ 
    3737    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/config/ini.config.php

    r4578 r4599  
    3434 
    3535# Security Handler 
    36 if (defined('IN_CS') == false) 
     36if (defined('IN_CS') === false) 
    3737{ 
    3838    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/config/xml.config.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/config/yaml.config.php

    r4578 r4599  
    3333 
    3434# Security Handler 
    35 if(defined('IN_CS') == false) 
     35if(defined('IN_CS') === false) 
    3636{ 
    3737    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/cronjobs.core.php

    r4578 r4599  
    3333# Security Handler 
    3434/** 
    35  * f (defined('IN_CS') == false) 
     35 * f (defined('IN_CS') === false) 
    3636 { 
    3737 * ie('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/cronjobs/dump.cronjob.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/debug/debug.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/debug/doctrineprofiler.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/debug/xdebug.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/dispatcher.core.php

    r4597 r4599  
    7575        #$renderengine = $route->getRenderEngine(); 
    7676 
    77         Clansuite_Debug::firebug($route); 
     77        #Clansuite_Debug::firebug($route); 
    7878        #unset($route); 
    7979 

  • trunk/core/doctrine.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/doorkeeper.core.php

    r4578 r4599  
    3030 
    3131# Security Handler 
    32 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3333{ 
    3434    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/errorhandler.core.php

    r4578 r4599  
    3232 
    3333//Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/eventdispatcher.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/events/AuthenticationLogging.event.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/events/BlockIps.event.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/exception.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/factories/cache.factory.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/factories/config.factory.php

    r4578 r4599  
    3030 
    3131# Security Handler 
    32 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3333{ 
    3434    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    5454     *  .config.xml 
    5555     *  .config.yaml 
     56     *  .info.php 
    5657     * 
    5758     * @param $configfile string path to configuration file 
    … …  
    6364        $adapter = ''; 
    6465 
    65         $extension = mb_substr($configfile, -11); 
    66  
    67         /* if ($extension == '.config.ini.php') 
    68          { 
    69          * type = 'ini'; 
    70          } */ 
     66        # use the filename only to detect adapter 
     67        $configfile = basename($configfile); 
     68        preg_match('^(.config.php|.config.xml|.config.yaml|.info.php)$^', $configfile, $extension); 
     69        $extension = $extension[0]; 
    7170 
    7271        # the fileextensions .config.php means it's an .ini file 
    7372        # the content of the file IS NOT a php-array as you might think 
    74         if($extension == '.config.php') 
     73        if($extension == '.config.php' or $extension == '.info.php') 
    7574        { 
    7675            $adapter = 'ini'; # @todo change this to 'php' (read/write of php-array) 
    … …  
    8685        else 
    8786        { 
    88             throw new Clansuite_Exception('No handler for that type of configuration file found.'); 
     87            throw new Clansuite_Exception('No handler for that type of configuration file found (' . $extension .')'); 
    8988        } 
    9089 
    … …  
    103102    public static function getConfiguration($configfile) 
    104103    { 
     104        $handler = self::getHandler($configfile); 
     105        return $handler::readConfig($configfile); 
     106    } 
     107 
     108    public static function getHandler($configfile) 
     109    { 
    105110        $type = self::determineConfigurationHandlerTypeBy($configfile); 
    106111        $handler = self::getConfigurationHandler($type); 
    107         return $handler::readConfig($configfile); 
     112        return $handler; 
    108113    } 
    109114 
    … …  
    130135            { 
    131136                # instantiate and return the specific confighandler with the $configfile to read 
    132                 return new $class(); 
     137                #return new $class(); 
     138                return $class::getInstance(); 
    133139            } 
    134140            else 

  • trunk/core/factories/logger.factory.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/factories/renderer.factory.php

    r4578 r4599  
    3030 
    3131# Security Handler 
    32 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3333{ 
    3434    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/feed.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{  
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/files/download.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/files/file.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/files/upload.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/filtermanager.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/filters/getuser.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/htmltidy.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/languageviaget.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{  
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/maintenance.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{  
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/permissions.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{  
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/phpdebugconsole.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{  
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/processcronjobs.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/sessionsecurity.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{  
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/setmodulelanguage.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/filters/smartymoves.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/startupchecks.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/statistics.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/filters/themeviaget.filter.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/flashmessages.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/frontcontroller.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/functions.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/functions/shorturl.function.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/functions/utf8_to_html.function.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/httprequest.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/httpresponse.core.php

    r4597 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/inputfilter.core.php

    r4578 r4599  
    3131 
    3232//Security Handler 
    33 if(defined('IN_CS') == false) 
     33if(defined('IN_CS') === false) 
    3434{ 
    3535    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/localization.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/logger.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/logger/devnull.logger.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/logger/email.logger.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    5151 * @subpackage  Logger 
    5252 */ 
    53 class Clansuite_Logger_Email extends Clansuite_Logger implements Clansuite_Logger_Interface 
     53class Clansuite_Logger_Email implements Clansuite_Logger_Interface 
    5454{ 
    5555    private $config; 

  • trunk/core/logger/file.logger.php

    r4596 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/logger/firebug.logger.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    6161 * @subpackage  Logger 
    6262 */ 
    63 class Clansuite_Logger_Firebug extends Clansuite_Logger implements Clansuite_Logger_Interface 
     63class Clansuite_Logger_Firebug implements Clansuite_Logger_Interface 
    6464{ 
    6565    private static $instance = null; 

  • trunk/core/mailer.core.php

    r4578 r4599  
    3232 
    3333//Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/modulecontroller.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    141141    public function getModuleConfig($filename = null) 
    142142    { 
    143         $inj = self::getInjector()->instantiate('Clansuite_Config'); 
    144         $res = $inj->readModuleConfig($filename); 
    145         return $res; 
     143        $config = self::getInjector()->instantiate('Clansuite_Config'); 
     144        $moduleconfig = $config->readModuleConfig($filename); 
     145        return $moduleconfig; 
    146146    } 
    147147 

  • trunk/core/moduledecorator.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/moduleinfocontroller.core.php

    r4578 r4599  
    3030 
    3131# Security Handler 
    32 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3333{ 
    3434    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    106106            # get the modulename, so strip the path info 
    107107            $modulename = str_replace( ROOT_MOD, '', $modulepath); 
     108            # $modulename_by_dirname = str_replace( ROOT . 'modules' . DS ,'', $module_path); 
    108109 
    109110            # create array with pieces of information about a module 
    … …  
    118119 
    119120            # hasInfo 
    120             if(is_file($modulepath . DS . $modulename.'.info.php') === true) 
    121             { 
    122                 self::$modulesinfo[$modulename]['info'] = Clansuite_CMS::getInjector()->instantiate('Clansuite_Config') 
    123                                                           ->readConfig( $modulepath . DS . $modulename.'.info.php' ); 
     121            $module_infofile = $modulepath . DS . $modulename . '.info.php'; 
     122            $config_object = Clansuite_CMS::getInjector()->instantiate('Clansuite_Config'); 
     123            if(is_file($module_infofile) === true) 
     124            { 
     125                #Clansuite_Debug::firebug($module_infofile); 
     126 
     127                self::$modulesinfo[$modulename]['info'] = $config_object->readConfig($module_infofile); 
    124128            } 
    125             else # if the info file for a module does not exists yet, create it 
    126             { 
    127                 Clansuite_CMS::getInjector()->instantiate('Clansuite_Config') 
    128                 ->writeConfig( $modulepath . DS . $modulename.'.info.php' ); 
     129            else # create file in DEV MODE 
     130            { 
     131                # if the info file for a module does not exists yet, create it 
     132                $config_object->writeConfig($module_infofile); 
    129133            } 
    130134 
    … …  
    146150        } 
    147151        ksort(self::$modulesinfo); 
    148         #Clansuite_Debug::printR(self::$modulesinfos); 
     152 
    149153        return self::$modulesinfo; 
    150154    } 
    … …  
    152156    public static function getModuleInformations($module = null) 
    153157    { 
    154          # check if the infos of this specific module were catched before 
     158        # check if the infos of this specific module were catched before 
    155159        if($module === false and isset(self::$modulesinfo[$module]) === null) 
    156160        { 
    157             Clansuite_Debug::printR(self::$modulesinfo); 
    158161            return self::$modulesinfo[$module]; 
    159162        } 
    … …  
    164167            return self::scanModuleInformations(); 
    165168        } 
    166         # fetch infos for the requested $module 
    167         else 
     169        else # fetch infos for the requested $module 
    168170        { 
    169171            return self::scanModuleInformations($module); 
    … …  
    213215    { 
    214216        return Clansuite_CMS::getInjector()->instantiate('Clansuite_Config') 
    215                 ->readConfig( ROOT . 'configuration' . DS . 'modules.config.php' ); 
     217                ->readConfig(ROOT . 'configuration' . DS . 'modules.config.php'); 
    216218    } 
    217219 

  • trunk/core/preprocessor.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    174174        # remove clansuite security line from whole string 
    175175        # @todo remove 4 lines when "if (defined('IN_CS')" is found 
    176         $string = str_replace("if (defined('IN_CS') == false){ die('Clansuite not loaded. Direct Access forbidden.'); }" . PHP_EOL, "", $string); 
    177         $string = str_replace("if (defined('IN_CS') == false) { die('Clansuite not loaded. Direct Access forbidden.'); }", '', $string); 
     176        $string = str_replace("if (defined('IN_CS') === false){ die('Clansuite not loaded. Direct Access forbidden.'); }" . PHP_EOL, "", $string); 
     177        $string = str_replace("if (defined('IN_CS') === false) { die('Clansuite not loaded. Direct Access forbidden.'); }", '', $string); 
    178178 
    179179        # remove php opening tag from whole string 

  • trunk/core/remotefetch.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/renderer/csv.renderer.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/renderer/json.renderer.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/renderer/pdf.renderer.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/renderer/php.renderer.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/renderer/phptal.renderer.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/renderer/renderer.base.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/renderer/serialized.renderer.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/renderer/smarty.renderer.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/renderer/xslt.renderer.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/renderer/xtemplate.renderer.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.' ); 

  • trunk/core/responseencode.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/router.core.php

    r4598 r4599  
    226226    { 
    227227        # detects if RewriteEngine is active and calls the proper URLParser for extraction of uri segments 
    228         if(true === $this->isRewriteEngineOn()) 
     228        if(true === $this->isRewriteEngineOn() and !isset($_GET['mod']) and !isset($_GET['sub'])) 
    229229        { 
    230230            $this->UrlParser_Rewrite($this->uri); 
    … …  
    426426    public function NoRewriteRoute() 
    427427    { 
    428         $route = new Clansuite_TargetRoute(); 
    429  
    430428        # Controller 
    431429        if(isset($this->uri_segments['mod'])) 
    432430        { 
    433             $route->setController($this->uri_segments['mod']); 
     431            Clansuite_TargetRoute::setController($this->uri_segments['mod']); 
    434432            unset($this->uri_segments['mod']); 
    435433        } 
    … …  
    438436        if(isset($this->uri_segments['sub'])) 
    439437        { 
    440             $route->setSubController($this->uri_segments['sub']); 
     438            Clansuite_TargetRoute::setSubController($this->uri_segments['sub']); 
    441439            unset($this->uri_segments['sub']); 
    442440        } 
    … …  
    445443        if(isset($this->uri_segments['action'])) 
    446444        { 
    447             $route->setAction($this->uri_segments['action']); 
     445            Clansuite_TargetRoute::setAction($this->uri_segments['action']); 
    448446            unset($this->uri_segments['action']); 
    449447        } 
    … …  
    452450        if(count($this->uri_segments) > 0) 
    453451        { 
    454             $route->setParameters($this->uri_segments); 
     452            Clansuite_TargetRoute::setParameters($this->uri_segments); 
    455453            unset($this->uri_segments); 
    456454        } 
    457455 
    458         return $route; 
     456        if(Clansuite_TargetRoute::dispatchable() === true) 
     457        { 
     458            return Clansuite_TargetRoute::getInstance(); 
     459        } 
    459460    } 
    460461 

  • trunk/core/security.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/session.core.php

    r4578 r4599  
    3232 
    3333//Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/user.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{  
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/blockcontainer.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{  
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/datagrid.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/datagridcol.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/datagridcols/checkbox.column.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/datagridcols/date.column.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/datagridcols/editbutton.column.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/datagridcols/email.column.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/datagridcols/image.column.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/datagridcols/integer.column.php

    r4578 r4599  
    3333 
    3434# Security Handler 
    35 if (defined('IN_CS') == false) 
     35if (defined('IN_CS') === false) 
    3636{ 
    3737    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/datagridcols/link.column.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/datagridcols/string.column.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/form.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorator.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/form/div.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/form/errors.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/form/fieldset.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/form/form.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/form/label.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/form/list.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/form/tab.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/form/table.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/formelement/description.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/formelement/div.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/formelement/formelement.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/formelement/label.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formdecorators/formelement/none.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelement.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/button.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/buttonbar.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/cancelbutton.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/captcha.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/checkbox.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/checkboxlist.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/confirmsubmitbutton.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/errors.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/file.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/hidden.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/image.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/imagebutton.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/input.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/jqconfirmsubmitbutton.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/jqselectcolor.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/jqselectdate.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/jqselectimage.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/label.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/multiselect.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/password.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/radio.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/radiolist.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/recaptcha.form.php

    r4578 r4599  
    3333 
    3434# Security Handler 
    35 if (defined('IN_CS') == false) 
     35if (defined('IN_CS') === false) 
    3636{ 
    3737    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/resetbutton.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/securitytoken.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/select.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/selectcolor.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/selectcountry.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/selectdate.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/selectlanguage.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/selectyesno.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/simplecaptcha.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/submitbutton.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/text.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/textarea.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/timetoken.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/uploadajax.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/uploadapc.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/uploadify.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/wysiwygckeditor.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/wysiwygmarkitup.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/wysiwygnicedit.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formelements/wysiwygtinymce.form.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formgenerator.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/formvalidation.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/html.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/javascripts.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/layout.core.php

    r4578 r4599  
    3232 
    3333# Security Handler 
    34 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/core/viewhelper/smarty/function.currentmodule.php

    r4284 r4599  
    88/** 
    99 * Smarty Currentmodule 
    10  * Displays they name of the current module 
     10 * 
     11 * Displays the name of the current module 
    1112 * 
    1213 * Examples: 
    … …  
    2627function smarty_function_currentmodule($params, $smarty) 
    2728{ 
    28     return Clansuite_Module_Controller_Resolver::getModuleName(); 
     29    return Clansuite_TargetRoute::getModuleName(); 
    2930} 
    3031?> 

  • trunk/modules/account/account.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/account/controller/account.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: account.module.php 2741 2009-01-20 16:35:21Z vain $ 
    … …  
    3532 
    3633# Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Account 
    4845 */ 
    49 class Clansuite_Module_Account_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Account_Admin extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        $this->getModuleConfig(); 
    … …  
    150147 
    151148        # display formgenerator object 
    152         #clansuite_xdebug::printR($form); 
     149        #Clansuite_Debug::printR($form); 
    153150 
    154151        $form->addElement('submitbutton')->setName('Save'); 
    … …  
    156153 
    157154        # display form html 
    158         #clansuite_xdebug::printR($form->render()); 
     155        #Clansuite_Debug::printR($form->render()); 
    159156 
    160157        # assign the html of the form to the view 

  • trunk/modules/account/controller/account.module.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633# Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Account 
    4845 */ 
    49 class Clansuite_Module_Account extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Account extends Clansuite_Module_Controller 
    5047{ 
    5148    /** 
    5249     * Module_Admin -> Execute 
    5350     */ 
    54     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     51    public function initializeModule() 
    5552    { 
    5653        # read module config 
    … …  
    103100 
    104101        # Get Objects 
    105         $request = $this->injector->instantiate('Clansuite_HttpRequest'); 
    106         $config = $this->injector->instantiate('Clansuite_Config'); 
    107         $user = $this->injector->instantiate('Clansuite_User'); 
     102        $config = $this->getClansuiteConfig(); 
     103        $user = $this->getInjector()->instantiate('Clansuite_User'); 
    108104 
    109105        # Get Input Variables 
    110         $nick        = $request->getParameterFromPost('nickname'); 
    111         $email       = $request->getParameterFromPost('email'); 
    112         $password    = $request->getParameterFromPost('password'); 
    113         $remember_me = $request->getParameterFromPost('remember_me'); 
    114         $submit      = $request->getParameterFromPost('submit'); 
    115         $referer     = $request->getParameterFromGet('referer'); 
     106        $nick        = $this->request->getParameterFromPost('nickname'); 
     107        $email       = $this->request->getParameterFromPost('email'); 
     108        $password    = $this->request->getParameterFromPost('password'); 
     109        $remember_me = $this->request->getParameterFromPost('remember_me'); 
     110        $submit      = $this->request->getParameterFromPost('submit'); 
     111        $referer     = $this->request->getParameterFromGet('referer'); 
    116112 
    117113        # Init Error Array 
    … …  
    214210        { 
    215211            # log the user OUT 
    216             $this->injector->instantiate('Clansuite_User')->logoutUser(); 
     212            $this->getInjector()->instantiate('Clansuite_User')->logoutUser(); 
    217213            $this->flashmessage('success', _('Logout successfull. Have a nice day. Goodbye.')); 
    218214            $this->redirect(WWW_ROOT, 3, 200); 
    … …  
    231227    { 
    232228        # Request Controller 
    233         $request = $this->injector->instantiate('Clansuite_HttpRequest'); 
    234         $security = $this->injector->instantiate('Clansuite_Security'); 
    235         $config = $this->injector->instantiate('Clansuite_Config'); 
     229        $request = $this->getHttpRequest(); 
     230        $security = $this->getInjector()->instantiate('Clansuite_Security'); 
     231        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
    236232        $view = $this->getView(); 
    237233 
    238         $user = $this->injector->instantiate('Clansuite_User'); 
     234        $user = $this->getInjector()->instantiate('Clansuite_User'); 
    239235 
    240236        # Get Inputvariables from $_POST 
    241         $nick       = $request->getParameter('nick'); 
    242         $email      = $request->getParameter('email'); 
    243         $email2     = $request->getParameter('email2'); 
    244         $pass       = $request->getParameter('password'); 
    245         $pass2      = $request->getParameter('password2'); 
    246         $submit     = $request->getParameter('submit'); 
    247         $captcha    = $request->getParameter('captcha'); 
     237        $nick       = $this->request->getParameter('nick'); 
     238        $email      = $this->request->getParameter('email'); 
     239        $email2     = $this->request->getParameter('email2'); 
     240        $pass       = $this->request->getParameter('password'); 
     241        $pass2      = $this->request->getParameter('password2'); 
     242        $submit     = $this->request->getParameter('submit'); 
     243        $captcha    = $this->request->getParameter('captcha'); 
    248244 
    249245        # Set Error Array 
    … …  
    389385 
    390386        // Request Controller 
    391         $request = $this->injector->instantiate('Clansuite_HttpRequest'); 
     387        $request = $this->getHttpRequest(); 
    392388 
    393389        // Input validation 
    394         $input = $this->injector->instantiate('input'); 
     390        $input = $this->getInjector()->instantiate('input'); 
    395391 
    396392        // Get Inputvariables from $_POST 
    397         $email  = $request->getParameter('email'); 
    398         $submit = $request->getParameter('submit'); 
     393        $email  = $this->request->getParameter('email'); 
     394        $submit = $this->request->getParameter('submit'); 
    399395 
    400396        // Perform checks on Inputvariables & Form filled? 
    … …  
    483479    { 
    484480        # Request Controller 
    485         $request = $this->injector->instantiate('Clansuite_HttpRequest'); 
     481        $request = $this->getHttpRequest(); 
    486482 
    487483        # Inputvariables 
    … …  
    532528    { 
    533529        // Request Controller 
    534         $request = $this->injector->instantiate('Clansuite_HttpRequest'); 
    535         #$validation = $this->injector->instantiate('Clansuite_Validation'); 
    536         $config = $this->injector->instantiate('Clansuite_Config'); 
    537         $security = $this->injector->instantiate('Clansuite_Security'); 
     530        $request = $this->getHttpRequest(); 
     531        #$validation = $this->getInjector()->instantiate('Clansuite_Validation'); 
     532        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
     533        $security = $this->getInjector()->instantiate('Clansuite_Security'); 
    538534        $error = array(); 
    539535 
    540         $email = $request->getParameter('email'); 
    541         $pass = $request->getParameter('password'); 
    542         $submit = $request->getParameter('submit'); 
     536        $email = $this->request->getParameter('email'); 
     537        $pass = $this->request->getParameter('password'); 
     538        $submit = $this->request->getParameter('submit'); 
    543539        if( !empty($submit) ) 
    544540        { 
    … …  
    623619    { 
    624620        // Request Controller 
    625         $request = $this->injector->instantiate('Clansuite_HttpRequest'); 
    626         $input = $this->injector->instantiate('input'); 
     621        $request = $this->getHttpRequest(); 
     622        $input = $this->getInjector()->instantiate('input'); 
    627623 
    628624        $user_id = (int) $request->getParameter('user_id'); 
    … …  
    677673    private function _send_activation_email($email, $nick, $user_id, $code) 
    678674    { 
    679         $config = $this->injector->instantiate('Clansuite_Config'); 
    680         $this->injector->register('Clansuite_Mailer'); 
    681         $mailer = $this->injector->instantiate('Clansuite_Mailer'); 
     675        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
     676        $this->getInjector()->register('Clansuite_Mailer'); 
     677        $mailer = $this->getInjector()->instantiate('Clansuite_Mailer'); 
    682678 
    683679        $to_address     = '"' . $nick . '" <' . $email . '>'; 
    … …  
    710706    private function _send_password_email($email, $nick, $user_id, $code) 
    711707    { 
    712         $config = $this->injector->instantiate('Clansuite_Config'); 
    713         $this->injector->register('Clansuite_Mailer'); 
     708        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
     709        $this->getInjector()->register('Clansuite_Mailer'); 
    714710        return true; 
    715         $mailer = $this->injector->instantiate('Clansuite_Mailer'); 
     711        $mailer = $this->getInjector()->instantiate('Clansuite_Mailer'); 
    716712 
    717713        $to_address     = '"' . $nick . '" <' . $email . '>'; 
    … …  
    800796 
    801797        # Debugging Form Object 
    802         #clansuite_xdebug::printR($form); 
     798        #Clansuite_Debug::printR($form); 
    803799 
    804800        # Debugging Form HTML Output 
    805         #clansuite_xdebug::printR($form->render()); 
     801        #Clansuite_Debug::printR($form->render()); 
    806802 
    807803        # assign the html of the form to the view 
    … …  
    847843 
    848844        # Debugging Form Object 
    849         #clansuite_xdebug::printR($form); 
     845        #Clansuite_Debug::printR($form); 
    850846 
    851847        # Debugging Form HTML Output 
    852         #clansuite_xdebug::printR($form->render()); 
     848        #Clansuite_Debug::printR($form->render()); 
    853849 
    854850        # assign the html of the form to the view 
    … …  
    893889 
    894890        # Debugging Form Object 
    895         #clansuite_xdebug::printR($form); 
     891        #Clansuite_Debug::printR($form); 
    896892 
    897893        # Debugging Form HTML Output 
    898         #clansuite_xdebug::printR($form->render()); 
     894        #Clansuite_Debug::printR($form->render()); 
    899895 
    900896        # assign the html of the form to the view 

  • trunk/modules/categories/categories.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/categories/controller/categories.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633# Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Categories 
    4845 */ 
    49 class Clansuite_Module_Categories_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Categories_Admin extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        parent::initModel('categories'); 
    … …  
    223220    { 
    224221        $request = $this->getHttpRequest(); 
    225         $delete  = $request->getParameter('delete', 'P'); 
     222        $delete  = $this->request->getParameter('delete', 'P'); 
    226223 
    227224        if(isset($delete)) 
    … …  
    333330 
    334331        # display formgenerator object 
    335         #clansuite_xdebug::printR($form); 
     332        #Clansuite_Debug::printR($form); 
    336333 
    337334        $form->addElement('submitbutton')->setName('Save'); 
    … …  
    339336 
    340337        # display form html 
    341         #clansuite_xdebug::printR($form->render()); 
     338        #Clansuite_Debug::printR($form->render()); 
    342339 
    343340        # assign the html of the form to the view 
    … …  
    354351 
    355352        # Get Configuration from Injector 
    356         $config = $this->injector->instantiate('Clansuite_Config'); 
     353        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
    357354 
    358355        # write config 

  • trunk/modules/controlcenter/controller/controlcenter.module.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-Andrï¿œ Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-Andrï¿œ Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633# Security Handler 
    37 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  ControlCenter 
    4845 */ 
    49 class Clansuite_Module_ControlCenter extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_ControlCenter extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        parent::initModel('menu'); 
    … …  
    6360        $view->assign( 'shortcuts', $images ); 
    6461        $view->assign( 'newsfeed', $this->assignFeedContent()); 
    65         $view->assign( 'security', $this->assignSecurityInfos()); 
     62        $view->assign( 'errorlog', $this->assignErrorlogInfos()); 
    6663 
    6764        $this->display(); 
    … …  
    7168    { 
    7269        # Set Pagetitle and Breadcrumbs 
    73         Clansuite_Breadcrumb::add( _('Report Bugs &amp; Issues'), '/index.php??mod=controlcenter&amp;action=bugs'); 
     70        Clansuite_Breadcrumb::add( _('Report Bugs &amp; Issues'), '/index.php?mod=controlcenter&amp;action=bugs'); 
    7471 
    7572        $this->display(); 
    … …  
    9289    } 
    9390 
    94     private function assignSecurityInfos() 
     91    private function assignErrorlogInfos() 
    9592    { 
    9693        include ROOT_CORE . 'logger/file.logger.php'; 
    … …  
    205202 
    206203        # display formgenerator object 
    207         #clansuite_xdebug::printR($form); 
     204        #Clansuite_Debug::printR($form); 
    208205 
    209206        $form->addElement('submitbutton')->setName('Save'); 
    … …  
    211208 
    212209        # display form html 
    213         #clansuite_xdebug::printR($form->render()); 
     210        #Clansuite_Debug::printR($form->render()); 
    214211 
    215212        # assign the html of the form to the view 
    … …  
    226223 
    227224        # Get Configuration from Injector 
    228         $config = $this->injector->instantiate('Clansuite_Config'); 
     225        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
    229226 
    230227        # write config 

  • trunk/modules/controlcenter/view/security.tpl

    r4464 r4599  
    66    <tr style="height: 15px;"> 
    77        <td style="min-width: 120px; color: black; background-color: #CC1717;" width="33%" valign="bottom"> 
    8             <b>&nbsp;&raquo; Clansuite Security</b> 
     8            <b>&nbsp;&raquo; Clansuite Errorlog</b> 
    99        </td> 
    1010        <td nowrap="nowrap" style="background-image:url('{$www_root}/modules/controlcenter/images/red-triangle.gif'); background-repeat: no-repeat;"> 
    … …  
    2424                        <tr valign="top"> 
    2525                            <td> 
    26                                 <!-- Assign Data of Clansuite Security --> 
    27                                 {$security} 
     26                                <!-- Assign Data of Clansuite Errorlog --> 
     27                                {$errorlog} 
    2828                            </td> 
    2929                        </tr> 

  • trunk/modules/cronjobs/controller/cronjobs.admin.php

    r4506 r4599  
    2727    * @author     Jens-André Koch <vain@clansuite.com> 
    2828    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3029    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
    3230    * 
    3331    * @version    SVN: $Id: index.module.php 2873 2009-03-27 01:50:12Z vain $ 
    … …  
    3533 
    3634# Security Handler 
    37 if (defined('IN_CS') == false) 
     35if (defined('IN_CS') === false) 
    3836{ 
    3937    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4745 * @subpackage  Cronjobs 
    4846 */ 
    49 class Clansuite_Module_Cronjobs_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     47class Clansuite_Module_Cronjobs_Admin extends Clansuite_Module_Controller 
    5048{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     49    public function initializeModule() 
    5250    { 
    5351 

  • trunk/modules/cronjobs/cronjobs.menu.php

    r4454 r4599  
    2929    * 
    3030    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
     31    *  
    3232    * 
    3333    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3535 
    3636//Security Handler 
    37 if(defined('IN_CS') == false) 
     37if(defined('IN_CS') === false) 
    3838{ 
    3939    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/doctrine/controller/doctrine.admin.php

    r4567 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    7067 * @subpackage  Administration 
    7168 */ 
    72 class Clansuite_Module_Doctrine_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     69class Clansuite_Module_Doctrine_Admin extends Clansuite_Module_Controller 
    7370{ 
    7471    /** 
    … …  
    8077     * Module_Doctrine_Admin -> Execute 
    8178     */ 
    82     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     79    public function initializeModule() 
    8380    { 
    8481        Doctrine_Core::setPath( ROOT_LIBRARIES . 'doctrine/' ); 
    … …  
    8784         * Setup Paths depending on a specific module or the core 
    8885         */ 
    89         $bool = $request->issetParameter('modulename'); 
     86        $bool = $this->request->issetParameter('modulename'); 
    9087        if(isset($bool)) 
    9188        { 
    92             self::$options = self::setupDoctrinePaths($request->getParameterFromGet('modulename')); 
     89            self::$options = self::setupDoctrinePaths($this->request->getParameterFromGet('modulename')); 
    9390        } 
    9491        else 
    … …  
    182179    public function action_admin_show() 
    183180    { 
    184         $this->prepareOutput(); 
     181        $this->display(); 
    185182    } 
    186183 

  • trunk/modules/doctrine/doctrine.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/downloads/controller/downloads.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633# Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Downloads 
    4845 */ 
    49 class Clansuite_Module_Downloads_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Downloads_Admin extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350    } 
    … …  
    9794 
    9895        # display formgenerator object 
    99         #clansuite_xdebug::printR($form);  
     96        #Clansuite_Debug::printR($form);  
    10097         
    10198        $form->addElement('submitbutton')->setName('Save'); 
    … …  
    103100         
    104101        # display form html 
    105         #clansuite_xdebug::printR($form->render()); 
     102        #Clansuite_Debug::printR($form->render()); 
    106103         
    107104        # assign the html of the form to the view 
    … …  
    118115 
    119116        # Get Configuration from Injector 
    120         $config = $this->injector->instantiate('Clansuite_Config'); 
     117        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
    121118         
    122119        # write config 

  • trunk/modules/downloads/controller/downloads.module.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: downloads.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633# Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Downloads 
    4845 */ 
    49 class Clansuite_Module_Downloads extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Downloads extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        parent::initModel('downloads'); 
    … …  
    6259        $downloads = Doctrine::getTable('CsDownloads')->findAll()->toArray(); 
    6360 
    64         #clansuite_xdebug::printr($downloads); 
     61        #Clansuite_Debug::printr($downloads); 
    6562 
    6663        $view = $this->getView(); 

  • trunk/modules/downloads/downloads.menu.php

    r4376 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633# Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/flashchart/controller/flashchart.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
    … …  
    3532 
    3633# Security Handler 
    37 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4845 * @subpackage  Flashchart 
    4946 */ 
    50 class Clansuite_Module_Flashchart_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     47class Clansuite_Module_Flashchart_Admin extends Clansuite_Module_Controller 
    5148{ 
    52     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     49    public function initializeModule() 
    5350    { 
    5451        $this->getModuleConfig(); 

  • trunk/modules/forum/controller/forum.admin.php

    r4506 r4599  
    11<?php 
    2 /** 
    3  * ClanSuite Forum Admin Module (Backend) 
    4  * (forum) 
    5  * 
    6  * @license    GPL 
    7  * @author     Florian Wolf 
    8  * @link       http://www.clansuite.com 
    9  * @version    SVN: $Id: $ 
    10  */ 
     2   /** 
     3    * Clansuite - just an eSports CMS 
     4    * Jens-André Koch © 2005 - onwards 
     5    * http://www.clansuite.com/ 
     6    * 
     7    * This file is part of "Clansuite - just an eSports CMS". 
     8    * 
     9    * LICENSE: 
     10    * 
     11    *    This program is free software; you can redistribute it and/or modify 
     12    *    it under the terms of the GNU General Public License as published by 
     13    *    the Free Software Foundation; either version 2 of the License, or 
     14    *    (at your option) any later version. 
     15    * 
     16    *    This program is distributed in the hope that it will be useful, 
     17    *    but WITHOUT ANY WARRANTY; without even the implied warranty of 
     18    *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     19    *    GNU General Public License for more details. 
     20    * 
     21    *    You should have received a copy of the GNU General Public License 
     22    *    along with this program; if not, write to the Free Software 
     23    *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
     24    * 
     25    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
     26    * @author     Jens-André Koch <vain@clansuite.com> 
     27    * @copyright  Jens-André Koch (2005 - onwards) 
     28    * @link       http://www.clansuite.com 
     29    * 
     30    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
     31    */ 
    1132 
    1233# Security Handler 
    13 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    1435{ 
    1536    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    2344 * @subpackage  Forum 
    2445 */ 
    25 class Clansuite_Module_Forum_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Forum_Admin extends Clansuite_Module_Controller 
    2647{ 
    27     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    2849    { 
    2950        $this->getModuleConfig(); 
    … …  
    157178 
    158179        # display formgenerator object 
    159         #clansuite_xdebug::printR($form); 
     180        #Clansuite_Debug::printR($form); 
    160181 
    161182        $form->addElement('submitbutton')->setName('Save'); 
    … …  
    163184 
    164185        # display form html 
    165         #clansuite_xdebug::printR($form->render()); 
     186        #Clansuite_Debug::printR($form->render()); 
    166187 
    167188        # assign the html of the form to the view 
    … …  
    178199 
    179200        # Get Configuration from Injector 
    180         $config = $this->injector->instantiate('Clansuite_Config'); 
     201        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
    181202 
    182203        # write config 

  • trunk/modules/forum/controller/forum.module.php

    r4506 r4599  
    11<?php 
    2 /** 
    3  * ClanSuite Forum Module (Frontend) 
    4  * (forum) 
    5  * 
    6  * @license    GPL 
    7  * @author     Florian Wolf 
    8  * @link       http://www.clansuite.com 
    9  * @version    SVN: $Id: $ 
    10  */ 
     2   /** 
     3    * Clansuite - just an eSports CMS 
     4    * Jens-André Koch © 2005 - onwards 
     5    * http://www.clansuite.com/ 
     6    * 
     7    * This file is part of "Clansuite - just an eSports CMS". 
     8    * 
     9    * LICENSE: 
     10    * 
     11    *    This program is free software; you can redistribute it and/or modify 
     12    *    it under the terms of the GNU General Public License as published by 
     13    *    the Free Software Foundation; either version 2 of the License, or 
     14    *    (at your option) any later version. 
     15    * 
     16    *    This program is distributed in the hope that it will be useful, 
     17    *    but WITHOUT ANY WARRANTY; without even the implied warranty of 
     18    *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     19    *    GNU General Public License for more details. 
     20    * 
     21    *    You should have received a copy of the GNU General Public License 
     22    *    along with this program; if not, write to the Free Software 
     23    *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
     24    * 
     25    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
     26    * @author     Jens-André Koch <vain@clansuite.com> 
     27    * @copyright  Jens-André Koch (2005 - onwards) 
     28    * @link       http://www.clansuite.com 
     29    * 
     30    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
     31    */ 
    1132 
    1233# Security Handler 
    13 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    1435{ 
    1536    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    2344 * @subpackage  Forum 
    2445 */ 
    25 class Clansuite_Module_Forum extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Forum extends Clansuite_Module_Controller 
    2647{ 
    27     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    2849    {   
    2950        $this->getModuleConfig(); 

  • trunk/modules/forum/forum.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/gallery/controller/gallery.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
    3229    * 
    3330    * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
    … …  
    3532 
    3633# Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Gallery 
    4845 */ 
    49 class Clansuite_Module_Gallery_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Gallery_Admin extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        parent::initModel('gallery'); 
    … …  
    9895 
    9996        # get valid $_POST params 
    100         $album['name']             = $request->getParameter('album_name'); 
    101         $album['description']    = $request->getParameter('album_description'); 
    102         $album['position']         = $request->getParameter('album_position'); 
    103         $album['thumb']            = $request->getParameter('album_thumb'); 
     97        $album['name']             = $this->request->getParameter('album_name'); 
     98        $album['description']    = $this->request->getParameter('album_description'); 
     99        $album['position']         = $this->request->getParameter('album_position'); 
     100        $album['thumb']            = $this->request->getParameter('album_thumb'); 
    104101 
    105102        # create new gallery album - return int 

  • trunk/modules/gallery/controller/gallery.module.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    32  
    3329    * 
    3430    * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
    … …  
    3632 
    3733# Security Handler 
    38 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3935{ 
    4036    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4844 * @subpackage  Gallery 
    4945 */ 
    50 class Clansuite_Module_Gallery extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Gallery extends Clansuite_Module_Controller 
    5147{ 
    52     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5349    { 
    5450        $this->getModuleConfig(); 

  • trunk/modules/gallery/gallery.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/games/controller/games.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
     28    * @link       http://www.clansuite.com 
    2929    * 
    30     * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
     30    * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
    3231    */ 
    3332 
    3433# Security Handler 
    35 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3635{ 
    3736    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4544 * @subpackage  Games 
    4645 */ 
    47 class Clansuite_Module_Games_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Games_Admin extends Clansuite_Module_Controller 
    4847{ 
    49     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5049    { 
    5150        parent::initModel('games'); 
    … …  
    8786 
    8887        # display formgenerator object 
    89         #clansuite_xdebug::printR($form);  
     88        #Clansuite_Debug::printR($form);  
    9089         
    9190        $form->addElement('submitbutton')->setName('Save'); 
    … …  
    9392         
    9493        # display form html 
    95         #clansuite_xdebug::printR($form->render()); 
     94        #Clansuite_Debug::printR($form->render()); 
    9695         
    9796        # assign the html of the form to the view 
    … …  
    108107 
    109108        # Get Configuration from Injector 
    110         $config = $this->injector->instantiate('Clansuite_Config'); 
     109        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
    111110         
    112111        # write config 

  • trunk/modules/games/games.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: games.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/guestbook/controller/guestbook.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633# Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Guestbook 
    4845 */ 
    49 class Clansuite_Module_Guestbook_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Guestbook_Admin extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        parent::initModel('guestbook'); 
    … …  
    6158 
    6259        // SmartyColumnSort -- Easy sorting of html table columns. 
    63         include ROOT_LIBRARIES . '/smarty/libs/SmartyColumnSort.class.php'); 
     60        include ROOT_LIBRARIES . '/smarty/libs/SmartyColumnSort.class.php'; 
    6461        // A list of database columns to use in the table. 
    6562        $columns = array( 'gb_id', 'gb_added', 'gb_nick', 'gb_email', 'gb_icq', 'gb_website', 'gb_town', 'gb_text', 'gb_admincomment', 'gb_ip'); 
    … …  
    7976 
    8077        # fetch the BBCode formatter object 
    81         $bbcode = new Clansuite_Bbcode($this->injector); 
     78        $bbcode = new Clansuite_Bbcode($this->getInjector()); 
    8279 
    8380        # Transform RAW text from DB to BB-formatted Text 
    … …  
    147144        $form->setElementDecorator('div')->setClass('Formline'); 
    148145        #$form->setElementDecorator('description'); 
    149         #clansuite_xdebug::printR($form->getFormelements()); 
     146        #Clansuite_Debug::printR($form->getFormelements()); 
    150147 
    151148        $form->addElement('textarea')->setCols('70')->setLabel('textarea label'); 
    … …  
    157154*/ 
    158155        # Debugging Form Object 
    159         #clansuite_xdebug::printR($form); 
     156        #Clansuite_Debug::printR($form); 
    160157 
    161158        # Debugging Form HTML Output 
    162         #clansuite_xdebug::printR($form->render()); 
     159        #Clansuite_Debug::printR($form->render()); 
    163160 
    164161        # assign the html of the form to the view 
    … …  
    378375 
    379376        # display formgenerator object 
    380         #clansuite_xdebug::printR($form); 
     377        #Clansuite_Debug::printR($form); 
    381378 
    382379        $form->addElement('submitbutton')->setName('Save'); 
    … …  
    384381 
    385382        # display form html 
    386         #clansuite_xdebug::printR($form->render()); 
     383        #Clansuite_Debug::printR($form->render()); 
    387384 
    388385        # assign the html of the form to the view 

  • trunk/modules/guestbook/controller/guestbook.module.php

    r4506 r4599  
    22   /** 
    33    * Clansuite - just an eSports CMS 
    4     * Jens-André Koch © 2005 - onwards 
     4    * Jens-André Koch © 2005 - onwards 
    55    * http://www.clansuite.com/ 
    66    * 
    … …  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    27     * @author     Jens-André Koch   <vain@clansuite.com> 
    28     * @author     Florian Wolf      <xsign.dll@clansuite.com> 
    29     * @copyright  Jens-André Koch (2005 - onwards), Florian Wolf (2006-2007) 
    30     * 
     26    * @author     Jens-André Koch  <vain@clansuite.com> 
     27    * @copyright  Jens-André Koch (2005 - onwards) 
    3128    * @link       http://www.clansuite.com 
    32     * @link       http://gna.org/projects/clansuite 
    33  
    3429    * 
    3530    * @version    SVN: $Id$ 
    … …  
    3732 
    3833# Security Handler 
    39 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    4035{ 
    4136    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4540 * This is the Clansuite Module Class - Guestbook 
    4641 * 
    47  * @author     Jens-André Koch <vain@clansuite.com> 
    48  * @copyright  Jens-André Koch (2005 - onwards) 
    49  
     42 * @author     Jens-André Koch <vain@clansuite.com>, Florian Wolf <xsign.dll@clansuite.com> 
     43 * @copyright  Jens-André Koch (2005 - onwards), Florian Wolf (2006-2007) 
    5044 * 
    5145 * @category    Clansuite 
    … …  
    5347 * @subpackage  Guestbook 
    5448 */ 
    55 class Clansuite_Module_Guestbook extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     49class Clansuite_Module_Guestbook extends Clansuite_Module_Controller 
    5650{ 
    5751    /** 
    5852     * Module_Guestbook -> Execute 
    5953     */ 
    60     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     54    public function initializeModule() 
    6155    { 
    6256        parent::initModel('guestbook'); 
    … …  
    7064        # Defining initial variables 
    7165        # Pager Chapter in Doctrine Manual  -> http://www.phpdoctrine.org/documentation/manual/0_10?one-page#utilities 
    72         $currentPage = $this->injector->instantiate('Clansuite_HttpRequest')->getParameter('page'); 
     66        $currentPage = $this->getHttpRequest()->getParameter('page'); 
    7367        $resultsPerPage = 3; 
    7468 
    … …  
    119113            #$SmartyPaginate->assign($tpl); 
    120114 
    121             $bbcode = new Clansuite_Bbcode($this->injector); 
     115            $bbcode = new Clansuite_Bbcode($this->getInjector()); 
    122116 
    123117            // Set 'not specified's 

  • trunk/modules/guestbook/guestbook.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/index/controller/index.module.php

    r4552 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633# Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Index 
    4845 */ 
    49 class Clansuite_Module_Index extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Index extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
    52     { 
    53     } 
    54  
    5548    public function action_show() 
    5649    { 

  • trunk/modules/matches/controller/matches.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
     28    * @link       http://www.clansuite.com 
    2929    * 
    30     * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
     30    * @version    SVN: $Id: index.module.php 4552 2010-07-05 15:25:44Z vain $ 
    3231    */ 
    3332 
    3433# Security Handler 
    35 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3635{ 
    3736    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4544 * @subpackage  Matches 
    4645 */ 
    47 class Clansuite_Module_Matches_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Matches_Admin extends Clansuite_Module_Controller 
    4847{ 
    49     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5049    { 
    51  
     50        return; 
    5251    } 
    5352     
    … …  
    112111 
    113112        # display formgenerator object 
    114         #clansuite_xdebug::printR($form);  
     113        #Clansuite_Debug::printR($form);  
    115114         
    116115        $form->addElement('submitbutton')->setName('Save'); 
    … …  
    118117         
    119118        # display form html 
    120         #clansuite_xdebug::printR($form->render()); 
     119        #Clansuite_Debug::printR($form->render()); 
    121120         
    122121        # assign the html of the form to the view 
    … …  
    133132 
    134133        # Get Configuration from Injector 
    135         $config = $this->injector->instantiate('Clansuite_Config'); 
     134        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
    136135         
    137136        # write config 

  • trunk/modules/matches/controller/matches.module.php

    r4506 r4599  
    2222    * 
    2323    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    24     * 
    25     * @author     Jens-André Koch   <vain@clansuite.com> 
    26     * @author     Florian Wolf      <xsign.dll@clansuite.com> 
    27     * @copyright  Jens-André Koch (2005 - onwards), Florian Wolf (2006-2007) 
    28     * 
     24    * @author     Jens-André Koch <vain@clansuite.com> 
     25    * @copyright  Jens-André Koch (2005 - onwards) 
    2926    * @link       http://www.clansuite.com 
    30     * @link       http://gna.org/projects/ 
    3127    * 
    3228    * @version    SVN: $Id$ 
    … …  
    3430 
    3531# Security Handler 
    36 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3733{ 
    3834    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4642 * @subpackage  Matches 
    4743 */ 
    48 class Clansuite_Module_Matches extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     44class Clansuite_Module_Matches extends Clansuite_Module_Controller 
    4945{ 
    50     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     46    public function initializeModule() 
    5147    { 
    5248        parent::initModel('matches'); 
    … …  
    6157        $matches = Doctrine::getTable('CsMatches')->findAll()->toArray(); 
    6258 
    63         #clansuite_xdebug::printr($matches); 
     59        #Clansuite_Debug::printr($matches); 
    6460 
    6561        $view = $this->getView(); 

  • trunk/modules/matches/matches.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/menu/controller/menu.admin.php

    r4506 r4599  
    2222    * 
    2323    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    24     * 
    2524    * @author     Jens-André Koch <vain@clansuite.com> 
    26     * @copyright  Copyleft: All rights reserved. Jens-André Koch (2005-onwards) 
    27     * 
     25    * @copyright  Jens-André Koch (2005 - onwards) 
    2826    * @link       http://www.clansuite.com 
    29     * @link       http://gna.org/projects/ 
    3027    * 
    3128    * @version    SVN: $Id: menueditor.module.php 2248 2008-07-12 01:48:54Z vain $ 
    … …  
    3330 
    3431# Security Handler 
    35 if (defined('IN_CS') == false) 
     32if (defined('IN_CS') === false) 
    3633{ 
    3734    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4542 * @subpackage  Menu 
    4643 */ 
    47 class Clansuite_Module_Menu_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     44class Clansuite_Module_Menu_Admin extends Clansuite_Module_Controller 
    4845{ 
    49     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     46    public function initializeModule() 
    5047    { 
    5148        parent::initModel('menu'); 
    … …  
    126123        Clansuite_Breadcrumb::add( _('About Clansuite'), '/index.php?mod=menu&amp;sub=admin&amp;action=menueditor2'); 
    127124 
    128         #clansuite_xdebug::printR($treeObject); 
     125        #Clansuite_Debug::printR($treeObject); 
    129126 
    130127 
    … …  
    159156        #$tree = $treeObject->fetchRoots(); 
    160157 
    161         Clansuite_Xdebug::firebug($this->getTree('CsAdminmenuShortcuts')); 
     158        Clansuite_Debug::firebug($this->getTree('CsAdminmenuShortcuts')); 
    162159 
    163160        $treeObject = Doctrine::getTable('CsAdminmenuShortcuts')->getTree(); 
    … …  
    176173            foreach($treeObject->fetchTree($options) as $node) 
    177174            { 
    178                 Clansuite_Xdebug::firebug($node->toArray()); 
     175                Clansuite_Debug::firebug($node->toArray()); 
    179176 
    180177                # If we are on the item of the same level, closing <li> tag before printing item 
    … …  
    207204        $html .= "</ul>"; 
    208205 
    209         Clansuite_Xdebug::firebug($html); 
     206        Clansuite_Debug::firebug($html); 
    210207 
    211208        # assign the html of the tree to the view 
    … …  
    229226         */ 
    230227        # initalize request 
    231         $request = $this->injector->instantiate('Clansuite_HttpRequest'); 
     228        $request = $this->getHttpRequest(); 
    232229        # fetch the container variable from post 
    233         $menu    = $request->getParameter('container','POST'); 
     230        $menu    = $this->request->getParameter('container','POST'); 
    234231 
    235232        # Check if we have some $menu values to insert 
    … …  
    270267        foreach ( $menu as $key => $value ) 
    271268        { 
    272             #clansuite_xdebug::printR($value); 
     269            #Clansuite_Debug::printR($value); 
    273270 
    274271            # fetch activerecord of the adminmenu 
    … …  
    743740                                    ->execute(); 
    744741 
    745             #clansuite_xdebug::printR($result); 
     742            #Clansuite_Debug::printR($result); 
    746743        } 
    747744 

  • trunk/modules/menu/controller/menu.module.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
    3229    * 
    3330    * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
    … …  
    3532 
    3633# Security Handler 
    37 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Menu 
    4845 */ 
    49 class Clansuite_Module_Menu extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Menu extends Clansuite_Module_Controller 
    5047{ 
    5148    /** 
    5249     * Module_Menu -> Execute 
    5350     */ 
    54     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     51    public function initializeModule() 
    5552    { 
    5653        parent::initModel('menu'); 

  • trunk/modules/menu/menu.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/mibbitirc/controller/mibbitirc.module.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
    3229    * 
    3330    * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
    … …  
    3532 
    3633# Security Handler 
    37 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Mibbitirc 
    4845 */ 
    49 class Clansuite_Module_Mibbitirc extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Mibbitirc extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        $this->getModuleConfig(); 

  • trunk/modules/mibbitirc/mibbitirc.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/modulemanager/controller/modulemanager.admin.php

    r4506 r4599  
    2222    * 
    2323    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    24     * 
    2524    * @author     Jens-André Koch <vain@clansuite.com> 
    2625    * @copyright  Copyleft: All rights reserved. Jens-André Koch (2005-onwards) 
    27     * 
    2826    * @link       http://www.clansuite.com 
    29     * @link       http://gna.org/projects/ 
    3027    * 
    3128    * @version    SVN: $Id: news.admin.php 3747 2009-11-20 14:59:46Z vain $ 
    … …  
    3330 
    3431# Security Handler 
    35 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3633{ 
    3734    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4643 */ 
    4744 
    48 class Clansuite_Module_Modulemanager_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     45class Clansuite_Module_Modulemanager_Admin extends Clansuite_Module_Controller 
    4946{ 
    50     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     47    public function initializeModule() 
    5148    { 
    5249        $this->getModuleConfig(); 
    53     } 
    54  
    55     /** 
    56      * Get a list of all the module directories 
    57      * 
    58      * @todo figure out, if SPL recursivedirectoryiterator is faster 
    59      * @return array 
    60      */ 
    61     private static function getModuleDirsList() 
    62     { 
    63         return glob( ROOT_MOD . '[a-zA-Z]*', GLOB_ONLYDIR); 
    6450    } 
    6551 
    … …  
    7561        Clansuite_Breadcrumb::add( _('Show'), '/index.php?mod=modulemanager&amp;sub=admin&amp;action=show'); 
    7662 
    77         # Init vars 
    78         $modules = array(); 
    79         $number_of_modules = 0; 
    80  
    81         # Scan all modules 
    82         $module_dirs = self::getModuleDirsList(); 
    83  
    84         foreach( $module_dirs as $module_path ) 
    85         { 
    86             $modulename_by_dirname = str_replace( ROOT . 'modules' . DS ,'', $module_path); 
    87  
    88             # increase the module counter 
    89             $modules_summary['counter'] = ++$number_of_modules; 
    90  
    91             # use the module counter to create an numerical indexed array for the module informations 
    92             $modules[$number_of_modules]['dir_id']  = $number_of_modules;           # assign dir_id, identifier relative to the modules directory 
    93             $modules[$number_of_modules]['name']    = $modulename_by_dirname; 
    94             $modules[$number_of_modules]['path']    = $module_path; 
    95  
    96             # hasConfig 
    97             # hasInfo 
    98             # hasMenu 
    99             # hasRoutes 
    100  
    101             $moduleinfo = new Clansuite_ModuleInfoController($modulename_by_dirname); 
    102             $moduleinfo_array = $moduleinfo->getModuleInformations(); 
    103             #Clansuite_Xdebug::printR($moduleinfo); 
    104             #Clansuite_Xdebug::printR($moduleinfo_array); 
    105  
    106             $arrayname = $modulename_by_dirname.'_info'; 
    107  
    108             if($arrayname == 'core') 
    109             #clansuite_xdebug::printR($moduleinfo_array); 
    110  
    111             if(is_array($moduleinfo_array) and isset($moduleinfo_array[$arrayname])) 
    112             { 
    113                 $modules[$number_of_modules]['info'] = $moduleinfo_array[$arrayname]; 
    114             } 
    115             elseif(is_bool($moduleinfo_array)) 
    116             { 
    117                 $modules[$number_of_modules]['info'] = $moduleinfo_array; 
    118             } 
    119         } 
     63        $moduleinfo = new Clansuite_ModuleInfoController($modulename_by_dirname); 
     64        $modules_info_array = $moduleinfo->getModuleInformations(); 
     65        $modules_summary = $modules_info_array['yy_summary']; 
     66        array_pop($modules_info_array); 
    12067 
    12168        # Fetch view and assign vars 
    12269        $view = $this->getView(); 
    12370 
    124         $view->assign('modules', $modules); 
    125  
    12671        $view->assign('modules_summary', $modules_summary); 
     72        $view->assign('modules', $modules_info_array); 
    12773 
    12874        $this->display(); 
    … …  
    204150        $module_dirs = self::getModuleDirsList(); 
    205151 
    206         Clansuite_Xdebug::firebug($module_dirs); 
     152        Clansuite_Debug::firebug($module_dirs); 
    207153        exit; 
    208154 
    … …  
    229175 
    230176        # request init 
    231         $request = $this->injector->instantiate('Clansuite_HttpRequest'); 
     177        $request = $this->getHttpRequest(); 
    232178        # get parameter for module data 
    233         $mod = $request->getParameter('m'); 
     179        $mod = $this->request->getParameter('m'); 
    234180        var_dump($mod); 
    235181 
    … …  
    337283        Clansuite_Breadcrumb::add( _('Create'), '/index.php?mod=modulemanager&amp;sub=admin&amp;action=create'); 
    338284 
    339         $request = $this->injector->instantiate('Clansuite_HttpRequest'); 
    340         $mod = $request->getParameter('mod_data'); 
     285        $request = $this->getHttpRequest(); 
     286        $mod = $this->request->getParameter('mod_data'); 
    341287 
    342288        if($mod) 
    … …  
    428374            $view = $this->getView(); 
    429375            $mod = array(); 
    430             $mod['modulename'] = $request->getParameter('modulename'); 
    431             $mod['classname']  = $request->getParameter('classname'); 
     376            $mod['modulename'] = $this->request->getParameter('modulename'); 
     377            $mod['classname']  = $this->request->getParameter('classname'); 
    432378            $view->assign( 'mod', $mod ); 
    433379        } 

  • trunk/modules/modulemanager/modulemanager.menu.php

    r4454 r4599  
    2929    * 
    3030    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
     31    *  
    3232    * 
    3333    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3535 
    3636//Security Handler 
    37 if(defined('IN_CS') == false) 
     37if(defined('IN_CS') === false) 
    3838{ 
    3939    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/modulemanager/view/action_admin_show.tpl

    r4356 r4599  
    2323     
    2424    <tr> 
    25         <td class="cell1">{$module.dir_id}</td> 
     25        <td class="cell1">{$module.id}</td> 
    2626        <td class="cell1" width="150" align="center">{* {image url="`$module.icon`"} *} {$module.name|capitalize}</td> 
    27         <td class="cell2">{if isset($module.info.version)} {$module.info.version} {else} Add {/if}</td> 
    28         <td class="cell1">{if isset($module.info.description) and empty($module.info.description) == false} {$module.info.description} {else} Add {/if}</td> 
     27        <td class="cell2">{if isset($module.info.version)} {$module.info.version} {else} -- {/if}</td> 
     28        <td class="cell1">{if isset($module.info.description) and empty($module.info.description) == false} {$module.info.description} {else} -- {/if}</td> 
    2929        <td class="cell2"> 
    3030         

  • trunk/modules/news/controller/news.admin.php

    r4506 r4599  
    2222    * 
    2323    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    24     * 
    2524    * @author     Jens-André Koch <vain@clansuite.com> 
    26     * @copyright  Copyleft: All rights reserved. Jens-Andrï¿œ Koch (2005-onwards) 
    27     * 
     25    * @copyright  Jens-André Koch (2005 - onwards) 
    2826    * @link       http://www.clansuite.com 
    29     * @link       http://gna.org/projects/clansuite 
    3027    * 
    3128    * @version    SVN: $Id$ 
    … …  
    3330 
    3431# Security Handler 
    35 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3633{ 
    3734    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4542 * @subpackage  News 
    4643 */ 
    47 class Clansuite_Module_News_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     44class Clansuite_Module_News_Admin extends Clansuite_Module_Controller 
    4845{ 
    4946    public $_Statusmap = array(); 
    5047 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        parent::initModel('news'); 
    … …  
    185182    public function manipulateValues(&$_ArrayReference) 
    186183    { 
    187         #Clansuite_Xdebug::firebug($_ArrayReference['news_status']); 
     184        #Clansuite_Debug::firebug($_ArrayReference['news_status']); 
    188185        if(isset($this->_Statusmap[$_ArrayReference['news_status']])) 
    189186        { 
    … …  
    349346    { 
    350347        $request = $this->getHttpRequest(); 
    351         $aDelete  = $request->getParameter('Checkbox'); 
     348        $aDelete  = $this->request->getParameter('Checkbox'); 
    352349 
    353350        if(isset($aDelete) && is_array($aDelete)) 

  • trunk/modules/news/controller/news.module.php

    r4561 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    32     * 
     29    *  
    3330    * @version    SVN: $Id$ 
    3431    */ 
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  News 
    4845 */ 
    49 class Clansuite_Module_News extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_News extends Clansuite_Module_Controller 
    5047{ 
    5148    /** 
    5249     * Module_News -> Execute 
    5350     */ 
    54     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     51    public function initializeModule() 
    5552    { 
    5653        # read module config 
    … …  
    8178 
    8279        # Defining initial variables 
    83         $currentPage = (int) $this->getHttpRequest()->getParameter('page'); 
    84         $category    = (int) $this->getHttpRequest()->getParameter('cat'); 
     80        $currentPage = (int) $this->request->getParameterFromGet('page'); 
     81        $category    = (int) $this->request->getParameterFromGet('cat'); 
    8582 
    8683        # if cat is no set, we need a query to show all news regardless which category, 
    … …  
    123120      * 
    124121      */ 
    125      public function action_showone() 
     122     public function action_showone($params) 
    126123     { 
    127124        # Get Render Engine 
    128125        $view = $this->getView(); 
    129126 
    130         $news_id = (int) $this->getHttpRequest()->getParameter('id'); 
    131         if($news_id == null) { $news_id = 1;  } 
     127        Clansuite_Debug::firebug($params); 
     128 
     129        $news_id = (int) $params['id']; #(int) $this->request->getParameterFromGet('id'); 
     130        if($news_id === null) { $news_id = 1;  } 
    132131 
    133132        $news = Doctrine::getTable('CsNews')->fetchSingleNews($news_id); 
    134133 
    135134        # Debugging SQL Request 
    136         #clansuite_xdebug::printR($news); 
     135        #Clansuite_Debug::printR($news); 
    137136 
    138137        # if a news was found 
    … …  
    142141            Clansuite_Breadcrumb::add( _('Viewing Single News: ') . $news['news_title'] , '/index.php?mod=news&amp;action=show'); 
    143142 
    144             Clansuite_Xdebug::firebug($news); 
     143            #Clansuite_Debug::firebug($news); 
    145144 
    146145            # UTF8 to HTML 
    147             $news[$i]['news_title'] = mb_convert_encoding( $news[$i]['news_title'] , 'UTF-8', 'HTML-ENTITIES'); 
    148             $news[$i]['news_body'] = mb_convert_encoding( $news[$i]['news_body'] , 'UTF-8', 'HTML-ENTITIES'); 
     146            #$news[$i]['news_title'] = mb_convert_encoding( $news[$i]['news_title'] , 'UTF-8', 'HTML-ENTITIES'); 
     147            #$news[$i]['news_body'] = mb_convert_encoding( $news[$i]['news_body'] , 'UTF-8', 'HTML-ENTITIES'); 
    149148 
    150149            # Assign News 
    … …  
    157156             * you could also access the values via {$news.} in the tpl. 
    158157             */ 
    159             if ( !empty($news['CsComments']) ) 
     158            if(false === empty($news['CsComments'])) 
    160159            { 
    161160                # Assign News 

  • trunk/modules/news/news.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/news/view/action_archive.tpl

    r3874 r4599  
    4242                    <input type="hidden" value="{$singlenews.news_id}" name="delete[]" /> 
    4343                    <input type="hidden" value="{$singlenews.news_id}" name="ids[]" /> 
    44                     <input type="button" value="{t}Edit news{/t}" onclick='Dialog.info({url: "index.php?mod=news&amp;sub=admin&amp;action=edit&amp;id={$singlenews.news_id}&amp;front=1", options: {method: "get"}}, {className: "alphacube", width:900, height: 600});' /> <input type="submit" name="submit" value="{t}Delete{/t}" /> 
     44                    <input type="button" value="{t}Edit news{/t}" /> <input type="submit" name="submit" value="{t}Delete{/t}" /> 
    4545                </form> 
    4646            {/if} 

  • trunk/modules/rssreader/controller/rssreader.admin.php

    r4376 r4599  
    2222    * 
    2323    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    24     * 
    2524    * @author     Jens-André Koch <vain@clansuite.com> 
    26     * @copyright  Copyleft: All rights reserved. Jens-André Koch (2005-onwards) 
    27     * 
     25    * @copyright  Jens-André Koch (2005 - onwards) 
    2826    * @link       http://www.clansuite.com 
    29     * @link       http://gna.org/projects/clansuite 
    30  
    3127    * 
    3228    * @version    SVN: $Id: rssreader.admin.php 2750 2009-01-21 21:49:15Z vain $ 
    … …  
    3430 
    3531# Security Handler 
    36 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3733{ 
    3834    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4642 * @subpackage  Rssreader 
    4743 */ 
    48 class Clansuite_Module_Rssreader_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     44class Clansuite_Module_Rssreader_Admin extends Clansuite_Module_Controller 
    4945{ 
    5046 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     47    public function initializeModule() 
    5248    { 
    5349    } 

  • trunk/modules/rssreader/controller/rssreader.module.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: rssreader.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Rssreader 
    4845 */ 
    49 class Clansuite_Module_Rssreader extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Rssreader extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350    } 

  • trunk/modules/rssreader/rssreader.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: rssreader.menu.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/settings/controller/settings.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: renderer.base.core.php 2614 2008-12-05 21:18:45Z vain $ 
    … …  
    3532 
    3633# Security Handler 
    37 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Settings 
    4845 */ 
    49 class Clansuite_Module_Settings_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Settings_Admin extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350    } 
    … …  
    117114 
    118115        # Get Configuration from Injector 
    119         $config = $this->injector->instantiate('Clansuite_Config'); 
     116        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
    120117 
    121         #clansuite_xdebug::printr($config->confighandler); 
     118        #Clansuite_Debug::printr($config->confighandler); 
    122119 
    123120        $config->confighandler->writeConfig( ROOT_CONFIG . 'clansuite.config.php', $data); 

  • trunk/modules/settings/settings.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/shockvoiceviewer/controller/shockvoiceviewer.module.php

    r4383 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    32  
    3329    * 
    3430    * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
    … …  
    3632 
    3733# Security Handler 
    38 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3935{ 
    4036    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4844 * @subpackage  Shockvoiceviewer 
    4945 */ 
    50 class Clansuite_Module_Shockvoiceviewer extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Shockvoiceviewer extends Clansuite_Module_Controller 
    5147{ 
    52     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5349    { 
    5450        #$this->moduleconfig = $this->getModuleConfig(); 

  • trunk/modules/shockvoiceviewer/library/shockvoice.class.php

    r4359 r4599  
    2929    * 
    3030    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
     31 
    3232    * 
    3333    * @version    SVN: $Id$ 
    … …  
    9393        $xmldata .= '</sv>'; 
    9494 
    95         #clansuite_xdebug::printr($xmldata); 
     95        #Clansuite_Debug::printr($xmldata); 
    9696 
    9797        # parse XML 
    … …  
    110110        xml_parser_free($this->parser); 
    111111 
    112         #clansuite_xdebug::printr($this->shockvoice); 
     112        #Clansuite_Debug::printr($this->shockvoice); 
    113113 
    114114        # if there is nothing to output 
    … …  
    190190                        break; 
    191191                } 
    192                 #clansuite_xdebug::printr($attributes); 
     192                #Clansuite_Debug::printr($attributes); 
    193193            } 
    194194        } 
    … …  
    222222                ); 
    223223            } 
    224             #clansuite_xdebug::printr($this->shockvoice['channels']); 
     224            #Clansuite_Debug::printr($this->shockvoice['channels']); 
    225225        } 
    226226        elseif ($name == 'USER') 
    … …  
    234234                    'image' => $this->getUserImage($element['status']) 
    235235            ); 
    236             #clansuite_xdebug::printr($this->shockvoice['users']); 
     236            #Clansuite_Debug::printr($this->shockvoice['users']); 
    237237        } 
    238238    } 

  • trunk/modules/shockvoiceviewer/shockvoiceviewer.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/shoutbox/controller/shoutbox.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Shoutbox 
    4845 */ 
    49 class Clansuite_Module_Shoutbox_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Shoutbox_Admin extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350    } 
    … …  
    8380 
    8481        # display formgenerator object 
    85         #clansuite_xdebug::printR($form); 
     82        #Clansuite_Debug::printR($form); 
    8683 
    8784        $form->addElement('submitbutton')->setName('Save'); 
    … …  
    8986 
    9087        # display form html 
    91         #clansuite_xdebug::printR($form->render()); 
     88        #Clansuite_Debug::printR($form->render()); 
    9289 
    9390        # assign the html of the form to the view 
    … …  
    107104 
    108105        # Get Configuration from Injector 
    109         $config = $this->injector->instantiate('Clansuite_Config'); 
     106        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
    110107 
    111108        # write config 

  • trunk/modules/shoutbox/controller/shoutbox.module.php

    r4376 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Shoutbox 
    4845 */ 
    49 class Clansuite_Module_Shoutbox extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Shoutbox extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        parent::initModel('shoutbox'); 

  • trunk/modules/shoutbox/shoutbox.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/staticpages/controller/staticpages.admin.php

    r4506 r4599  
    2222    * 
    2323    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    24     * 
    2524    * @author     Jens-André Koch <vain@clansuite.com> 
    26     * @copyright  Copyleft: All rights reserved. Jens-André Koch (2005-onwards) 
    27     * 
     25    * @copyright  Jens-André Koch (2005 - onwards) 
    2826    * @link       http://www.clansuite.com 
    29     * @link       http://gna.org/projects/clansuite 
    3027    * 
    3128    * @version    SVN: $Id: news.module.php 2006 2008-05-07 09:08:40Z xsign $ 
    … …  
    3330 
    3431# Security Handler 
    35 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3633{ 
    3734    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4542 * @subpackage  Staticpages 
    4643 */ 
    47 class Clansuite_Module_Staticpages_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     44class Clansuite_Module_Staticpages_Admin extends Clansuite_Module_Controller 
    4845{ 
    49     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     46    public function initializeModule() 
    5047    { 
    5148        parent::initModel('staticpages'); 
    … …  
    207204        else 
    208205        { 
    209             $info  
     206            # $info 
    210207        } 
    211208 
    … …  
    242239 
    243240        # display formgenerator object 
    244         #clansuite_xdebug::printR($form); 
     241        #Clansuite_Debug::printR($form); 
    245242 
    246243        $form->addElement('submitbutton')->setName('Save'); 
    … …  
    248245 
    249246        # display form html 
    250         #clansuite_xdebug::printR($form->render()); 
     247        #Clansuite_Debug::printR($form->render()); 
    251248 
    252249        # assign the html of the form to the view 

  • trunk/modules/staticpages/controller/staticpages.module.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    32  
    3329    * 
    3430    * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
    … …  
    3632 
    3733# Security Handler 
    38 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3935{ 
    4036    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4541 * 
    4642 */ 
    47 class Clansuite_Module_Staticpages extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     43class Clansuite_Module_Staticpages extends Clansuite_Module_Controller 
    4844{ 
    4945    /** 
    5046     * Module_Staticpages -> Execute 
    5147     */ 
    52     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5349    { 
    5450        # read module config 
    … …  
    6359    public function action_show() 
    6460    { 
    65         $page = (string) $this->injector->instantiate('Clansuite_HttpRequest')->getParameter('page'); 
     61        $page = (string) $this->request->getParameterFromGet('page'); 
     62 
     63        var_dump($page); 
    6664 
    6765        // if no page is requested, show overview 
    … …  
    7573 
    7674        // get inputfilter class 
    77         #$input = $this->injector->instantiate('Clansuite_Inputfilter'); 
     75        #$input = $this->getInjector()->instantiate('Clansuite_Inputfilter'); 
    7876 
    7977        // check if page was set and is sanitized # and $input->check( $page, 'is_abc|is_int|is_custom', '_\s' ) 

  • trunk/modules/staticpages/staticpages.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/statistics/controller/statistics.admin.php

    r4506 r4599  
    2222    * 
    2323    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    24     * 
    2524    * @author     Jens-André Koch <vain@clansuite.com> 
    26     * @copyright  Copyleft: All rights reserved. Jens-André Koch (2005-onwards) 
    27     * 
     25    * @copyright  Jens-André Koch (2005 - onwards) 
    2826    * @link       http://www.clansuite.com 
    29     * @link       http://gna.org/projects/ 
    3027    * 
    3128    * @version    SVN: $Id: news.admin.php 3815 2009-12-09 19:11:23Z vain $ 
    … …  
    3330 
    3431# Security Handler 
    35 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3633{ 
    3734    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4542 * @subpackage  Statistics 
    4643 */ 
    47 class Clansuite_Module_Statistics_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     44class Clansuite_Module_Statistics_Admin extends Clansuite_Module_Controller 
    4845{ 
    49     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     46    public function initializeModule() 
    5047    { 
    5148    } 
    … …  
    108105 
    109106        # Get Configuration from Injector 
    110         $config = $this->injector->instantiate('Clansuite_Config'); 
     107        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
    111108 
    112109        # write config 

  • trunk/modules/statistics/controller/statistics.module.php

    r4361 r4599  
    11<?php 
    2 /** 
    3  * Clansuite - just an eSports CMS 
    4  * Jens-André Koch © 2005 - onwards 
    5  * http://www.clansuite.com/ 
    6  * 
    7  * This file is part of "Clansuite - just an eSports CMS". 
    8  * 
    9  * LICENSE: 
    10  * 
    11  *    This program is free software; you can redistribute it and/or modify 
    12  *    it under the terms of the GNU General Public License as published by 
    13  *    the Free Software Foundation; either version 2 of the License, or 
    14  *    (at your option) any later version. 
    15  * 
    16  *    This program is distributed in the hope that it will be useful, 
    17  *    but WITHOUT ANY WARRANTY; without even the implied warranty of 
    18  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    19  *    GNU General Public License for more details. 
    20  * 
    21  *    You should have received a copy of the GNU General Public License 
    22  *    along with this program; if not, write to the Free Software 
    23  *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
    24  * 
    25  * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26  * 
    27  * @author     Jens-André Koch <vain@clansuite.com> 
    28  * @copyright  Jens-André Koch (2005 - onwards) 
    29  * 
    30  * @link       http://www.clansuite.com 
    31  * @link       http://gna.org/projects/clansuite 
    32  * 
    33  * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
    34  */ 
     2   /** 
     3    * Clansuite - just an eSports CMS 
     4    * Jens-André Koch © 2005 - onwards 
     5    * http://www.clansuite.com/ 
     6    * 
     7    * LICENSE: 
     8    * 
     9    *    This program is free software; you can redistribute it and/or modify 
     10    *    it under the terms of the GNU General Public License as published by 
     11    *    the Free Software Foundation; either version 2 of the License, or 
     12    *    (at your option) any later version. 
     13    * 
     14    *    This program is distributed in the hope that it will be useful, 
     15    *    but WITHOUT ANY WARRANTY; without even the implied warranty of 
     16    *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     17    *    GNU General Public License for more details. 
     18    * 
     19    *    You should have received a copy of the GNU General Public License 
     20    *    along with this program; if not, write to the Free Software 
     21    *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
     22    * 
     23    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
     24    * @author     Jens-André Koch <vain@clansuite.com> 
     25    * @copyright  Jens-André Koch (2005 - onwards) 
     26    * @link       http://www.clansuite.com 
     27    * 
     28    * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
     29    */ 
    3530 
    3631# Security Handler 
    37 if (defined('IN_CS') == false) { die('Clansuite not loaded. Direct Access forbidden.');} 
     32if(defined('IN_CS') === false) 
     33{ 
     34    die('Clansuite not loaded. Direct Access forbidden.'); 
     35} 
    3836 
    3937/** 
    … …  
    4442 * @subpackage  Clansuite_Module_Statistics 
    4543 */ 
    46 class Clansuite_Module_Statistics extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     44class Clansuite_Module_Statistics extends Clansuite_Module_Controller 
    4745{ 
    4846    /** 
    4947     * Clansuite_Module_Statistics 
    5048     */ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     49    public function initializeModule() 
    5250    { 
    5351    } 

  • trunk/modules/statistics/statistics.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/systeminfo/controller/systeminfo.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    32  
    3329    * 
    3430    * @version    SVN: $Id: index.module.php 2625 2008-12-09 00:04:43Z vain $ 
    … …  
    3632 
    3733# Security Handler 
    38 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3935{ 
    4036    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4844 * @subpackage  Systeminfo 
    4945 */ 
    50 class Clansuite_Module_Systeminfo_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Systeminfo_Admin extends Clansuite_Module_Controller 
    5147{ 
    52     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5349    { 
    5450        $this->getModuleConfig(); 
    … …  
    6359        $this->getView()->setLayoutTemplate('index.tpl'); 
    6460 
    65         $sysinfo = array_merge($this->assembleSystemInfos(), 
    66                 $this->assembleDatabaseInfos()); 
     61        $sysinfo = array_merge($this->assembleSystemInfos(), $this->assembleDatabaseInfos()); 
    6762 
    6863        $this->getView()->assign('sysinfos', $sysinfo); 
    … …  
    245240 
    246241        # Get APC Cache 
    247         $cache_apc = Clansuite_Cache_Factory::getCache('apc', $this->getInjector()); 
     242        $cache_apc = Clansuite_Cache_Factory::getCache('apc'); 
    248243 
    249244        # Assign Data to the View 

  • trunk/modules/systeminfo/systeminfo.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/teams/controller/teams.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Teams 
    4845 */ 
    49 class Clansuite_Module_Teams_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Teams_Admin extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350    } 

  • trunk/modules/teams/teams.menu.php

    r4376 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/teamspeakviewer/controller/teamspeakviewer.module.php

    r4506 r4599  
    2222    * 
    2323    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    24     * 
    2524    * @author     Jens-André Koch <vain@clansuite.com> 
    26     * @copyright  Copyleft: All rights reserved. Jens-André Koch (2005-onwards) 
    27     * 
     25    * @copyright  Jens-André Koch (2005 - onwards) 
    2826    * @link       http://www.clansuite.com 
    29     * @link       http://gna.org/projects/ 
    3027    * 
    3128    * @version    SVN: $Id: news.module.php 2345 2008-08-02 04:35:23Z vain $ 
    … …  
    3330 
    3431# Security Handler 
    35 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3633{ 
    3734    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4542 * @subpackage  TeamspeakViewer 
    4643 */ 
    47 class Clansuite_Module_Teamspeakviewer extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     44class Clansuite_Module_Teamspeakviewer extends Clansuite_Module_Controller 
    4845{ 
    4946    /** 
    5047     * Module_Teamspeakviewer -> Execute 
    5148     */ 
    52     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     49    public function initializeModule() 
    5350    { 
    5451        # load library / init libacts2 
    … …  
    10299        $ts3 = new Clansuite_Teamspeak3_ServerQueryInterface($server_ip, $server_queryport, $vserver_id); 
    103100        $ts3->selectVirtualServer(1); 
    104         #clansuite_xdebug::printR($ts3->serverViewer()); 
    105         #clansuite_xdebug::printR($ts3->version()); # ok 
    106         #clansuite_xdebug::printR($ts3->channellist()); 
    107         #clansuite_xdebug::printR($ts3->instanceinfo()); # ok 
    108         #clansuite_xdebug::printR($ts3->serverinfo()); # ??? what is wrong here?? no return values 
     101        #Clansuite_Debug::printR($ts3->serverViewer()); 
     102        #Clansuite_Debug::printR($ts3->version()); # ok 
     103        #Clansuite_Debug::printR($ts3->channellist()); 
     104        #Clansuite_Debug::printR($ts3->instanceinfo()); # ok 
     105        #Clansuite_Debug::printR($ts3->serverinfo()); # ??? what is wrong here?? no return values 
    109106        #$ts3->close(); 
    110107 
    111         #clansuite_xdebug::printR($serverinfo); 
     108        #Clansuite_Debug::printR($serverinfo); 
    112109 
    113110        $view->assign('serverinfo', $serverinfo); 

  • trunk/modules/teamspeakviewer/libraries/teamspeak3.lib.php

    r4356 r4599  
    2222    * 
    2323    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    24     * 
    2524    * @author     Jens-André Koch <vain@clansuite.com> 
    2625    * @copyright  Copyleft: All rights reserved. Jens-André Koch (2005-onwards) 
    27     * 
    2826    * @link       http://www.clansuite.com 
    29     * @link       http://gna.org/projects/clansuite 
    3027    * 
    3128    * @version    SVN: $Id$ 
    … …  
    388385            while(strpos($data, 'msg=') === false); 
    389386 
    390             #clansuite_xdebug::printR($data); 
     387            #Clansuite_Debug::printR($data); 
    391388 
    392389            # now check if the server response data contains an error 
    … …  
    512509        $response .= $this->ServerQueryCommand('channellist -topic -flags -voice -limits'); 
    513510        $response .= $this->ServerQueryCommand('clientlist -uid -away -voice -groups'); 
    514         #clansuite_xdebug::printR($this->toArray($response)); 
     511        #Clansuite_Debug::printR($this->toArray($response)); 
    515512 
    516513        return $response; 
    … …  
    527524        $response .= $this->ServerQueryCommand('use sid='.$this->getVirtualServerID()); 
    528525        $response .= $this->ServerQueryCommand('serverlist -all'); 
    529         #clansuite_xdebug::printR($this->toArray($response)); 
     526        #Clansuite_Debug::printR($this->toArray($response)); 
    530527 
    531528        return $response; 

  • trunk/modules/teamspeakviewer/teamspeakviewer.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/templatemanager/controller/templatemanager.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633# Security Handler 
    37 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Templatemanager 
    4845 */ 
    49 class Clansuite_Module_Templatemanager_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Templatemanager_Admin extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        $this->getModuleConfig(); 
    … …  
    7774        $view->assign('templateeditor_modulename',  $tplmod); 
    7875 
    79         clansuite_xdebug::firebug( ROOT_MOD . $tplmod . DS. 'view' .DS . '*.tpl' ); 
     76        Clansuite_Debug::firebug( ROOT_MOD . $tplmod . DS. 'view' .DS . '*.tpl' ); 
    8077 
    8178        $templates = $this->getTemplatesOfModule($tplmod); 
    … …  
    121118        $file     = $this->getHttpRequest()->getParameter('file', 'G'); 
    122119 
    123         Clansuite_Xdebug::firebug($file); 
     120        Clansuite_Debug::firebug($file); 
    124121 
    125122        # check if we edit a module template or a theme template 
    … …  
    128125            $tplmod = ucfirst(stripslashes($tplmod)); 
    129126            $view->assign('templateeditor_modulename',  $tplmod); 
    130             Clansuite_Xdebug::firebug($tplmod); 
     127            Clansuite_Debug::firebug($tplmod); 
    131128        } 
    132129        elseif(isset($tpltheme)) 
    … …  
    134131            $tpltheme = stripslashes($tpltheme); 
    135132            $view->assign('templateeditor_themename',   $tpltheme); 
    136             Clansuite_Xdebug::firebug($tpltheme); 
     133            Clansuite_Debug::firebug($tpltheme); 
    137134        } 
    138135 
    … …  
    191188    public function action_admin_save() 
    192189    { 
    193         #Clansuite_Xdebug::printR($this->getHttpRequest()); 
     190        #Clansuite_Debug::printR($this->getHttpRequest()); 
    194191 
    195192        $tplfilename    = (string) $this->getHttpRequest()->getParameter('templateeditor_absolute_filename'); 

  • trunk/modules/templatemanager/controller/templatemanager.module.php

    r4376 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    28     * @copyright  Copyleft: All rights reserved. Jens-André Koch (2005-onwards) 
    29     * 
     27    * @copyright  Jens-André Koch (2005 - onwards) 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633# Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Templatemanager 
    4845 */ 
    49 class Clansuite_Module_Templatemanager extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Templatemanager extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        $this->getModuleConfig(); 

  • trunk/modules/templatemanager/templatemanager.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/thememanager/controller/thememanager.admin.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
    3229    * 
    3330    * @version    SVN: $Id: users.module.php 2634 2008-12-12 22:07:48Z vain $ 
    … …  
    3532 
    3633# Security Handler 
    37 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Thememanager 
    4845 */ 
    49 class Clansuite_Module_Thememanager_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Thememanager_Admin extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
     50        $this->getModuleConfig(); 
    5351    } 
    5452 
    … …  
    7573        # loop through ROOT_THEMES dir 
    7674        $dirs = new DirectoryIterator(ROOT_THEMES); 
    77         foreach ($dirs as $dir) 
     75        foreach($dirs as $dir) 
    7876        { 
    7977            $i++; 
    8078 
    8179            # exclude .svn and core dir, take only dirs with theme_info.xml in it 
    82             if( (!$dir->isDot()) and ($dir != '.svn') and ($dir != 'core') and (is_file($dir->getPathName().DS.'theme_info.xml')) ) 
     80            if((!$dir->isDot()) and ($dir != '.svn') and ($dir != 'core') and (is_file($dir->getPathName() . DS . 'theme_info.xml'))) 
    8381            { 
    8482                # add xml infos from file 
    85                 $theme_info[$i]               = self::parseThemeInformations($dir); 
     83                $theme_info[$i] = self::parseThemeInformations($dir); 
    8684 
    8785                # add fullpath 
    88                 $theme_info[$i]['fullpath' ] = $dir->getPathName(); 
     86                $theme_info[$i]['fullpath'] = $dir->getPathName(); 
    8987 
    9088                # add templatefilename 
    … …  
    9290                { 
    9391                    $theme_info[$i]['layouttpl'] = $theme_info[$i]['layoutfiles']['layoutfile']['@attributes']['tpl']; 
    94                     $theme_info[$i]['layoutpath'] = $theme_info[$i]['fullpath'].DS.$theme_info[$i]['layouttpl']; 
     92                    $theme_info[$i]['layoutpath'] = $theme_info[$i]['fullpath'] . DS . $theme_info[$i]['layouttpl']; 
    9593                } 
    9694 
    9795                # add dirname 
    98                 $theme_info[$i]['dirname']    = (string) $dir; 
     96                $theme_info[$i]['dirname'] = (string) $dir; 
    9997 
    10098                # is this theme activated? 
    101                 if( $this->config['template']['theme'] == $dir ) 
     99                if($this->moduleconfig['template']['theme'] == $dir) 
    102100                { 
    103                     $theme_info[$i]['activated']  = true; 
     101                    $theme_info[$i]['activated'] = true; 
    104102                } 
    105103                else 
    106104                { 
    107                     $theme_info[$i]['activated']  = false; 
     105                    $theme_info[$i]['activated'] = false; 
    108106                } 
    109107 
    110108                # add preview image (preview_image should contain 2 files: [0]preview.img and [1]preview_thumb.img) 
    111                 $preview_image = glob( ROOT_THEMES. $dir . DS . 'preview*.{jpg,png,gif,jpeg,JPG,PNG,GIF,JPEG}', GLOB_BRACE); 
     109                $preview_image = glob(ROOT_THEMES . $dir . DS . 'preview*.{jpg,png,gif,jpeg,JPG,PNG,GIF,JPEG}', GLOB_BRACE); 
    112110 
    113111                # turn ROOT_THEMES path into WWW_ROOT 
    114                 $preview_image = str_replace(ROOT_THEMES, WWW_ROOT_THEMES.'/', $preview_image); 
     112                $preview_image = str_replace(ROOT_THEMES, WWW_ROOT_THEMES . '/', $preview_image); 
    115113 
    116114                # fix slashes 
    117                 $preview_image = str_replace('\\','/', $preview_image); 
     115                $preview_image = str_replace('\\', '/', $preview_image); 
    118116 
    119                 if ( is_array($preview_image) and (empty($preview_image) == false)) 
     117                if(is_array($preview_image) and (empty($preview_image) == false)) 
    120118                { 
    121                     $theme_info[$i]['preview_image']     = $preview_image[0];  # path to [0]preview 
     119                    $theme_info[$i]['preview_image'] = $preview_image[0];  # path to [0]preview 
    122120                    $theme_info[$i]['preview_thumbnail'] = $preview_image[1];  # path to [1]preview_thumb 
    123121                } 
    124122                else # show only nopreview.gif as thumbnail 
    125  
    126123                { 
    127                     $theme_info[$i]['preview_thumbnail'] = WWW_ROOT_THEMES.'/core/images/nopreview.jpg'; 
     124                    $theme_info[$i]['preview_thumbnail'] = WWW_ROOT_THEMES . '/core/images/nopreview.jpg'; 
    128125                } 
    129126            } 
    … …  
    131128 
    132129        # sort and return 
    133         asort ($theme_info); 
     130        asort($theme_info); 
    134131        return $theme_info; 
    135132    } 
    … …  
    146143 
    147144        # ensure we have simplexml available 
    148         if (false == function_exists('simplexml_load_file') ) 
     145        if(false == function_exists('simplexml_load_file')) 
    149146        { 
    150147            throw new Clansuite_Exception('Missing simplexml_load_file() function'); 
    … …  
    156153 
    157154        # die in case we fetched no object 
    158         if (false === $themeinfos_XML_obj) 
     155        if(false === $themeinfos_XML_obj) 
    159156        { 
    160             throw new Clansuite_Exception('The Description File ('.$theme_info_file.') of the "'.$themedir.'" Theme is corrupted! Check it\'s XML Syntax and Structure.'); 
     157            throw new Clansuite_Exception('The Description File (' . $theme_info_file . ') of the "' . $themedir . '" Theme is corrupted! Check it\'s XML Syntax and Structure.'); 
    161158        } 
    162159 

  • trunk/modules/thememanager/thememanager.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/modules/users/controller/users.admin.php

    r4506 r4599  
    2222    * 
    2323    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    24     * 
    2524    * @author     Jens-André Koch <vain@clansuite.com> 
    2625    * @copyright  Copyleft: All rights reserved. Jens-André Koch (2005-onwards) 
    27     * 
    2826    * @link       http://www.clansuite.com 
    29     * @link       http://gna.org/projects/clansuite 
    3027    * 
    3128    * @version    SVN: $Id: menueditor.module.php 2095 2008-06-11 23:44:20Z vain $ 
    … …  
    3330 
    3431//Security Handler 
    35 if(defined('IN_CS') == false) 
     32if(defined('IN_CS') === false) 
    3633{ 
    3734    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4542 * @subpackage  Users 
    4643*/ 
    47 class Clansuite_Module_Users_Admin extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     44class Clansuite_Module_Users_Admin extends Clansuite_Module_Controller 
    4845{ 
    49     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     46    public function initializeModule() 
    5047    { 
    5148        parent::initModel('users'); 
    … …  
    7572 
    7673        // SmartyColumnSort -- Easy sorting of html table columns. 
    77         include ROOT_LIBRARIES . '/smarty/libs/SmartyColumnSort.class.php'); 
     74        include ROOT_LIBRARIES . '/smarty/libs/SmartyColumnSort.class.php'; 
    7875        // A list of database columns to use in the table. 
    7976        $columns = array( 'u.user_id', 'u.nick', 'u.email', 'u.timestamp', 'u.joined'); 
    … …  
    199196        $this->redirect( 'index.php?mod=users&sub=admin&action=show_all', 3, _( 'The selected user(s) were deleted.' )); 
    200197    } 
    201      
     198 
    202199    /** 
    203200     * Action for displaying the Settings of a Module Users 
    … …  
    207204        # Set Pagetitle and Breadcrumbs 
    208205        Clansuite_Breadcrumb::add( _('Settings'), '/index.php?mod=users&amp;sub=admin&amp;action=settings'); 
    209          
     206 
    210207        $settings = array(); 
    211          
     208 
    212209        $settings['form']   = array(    'name' => 'users_settings', 
    213210                                        'method' => 'POST', 
    214211                                        'action' => WWW_ROOT.'/index.php?mod=users&amp;sub=admin&amp;action=settings_update'); 
    215                                          
     212 
    216213        $settings['users'][] = array(   'id' => 'items_lastregisteredusers', 
    217214                                        'name' => 'items_lastregisteredusers', 
    … …  
    220217                                        'formfieldtype' => 'text', 
    221218                                        'value' => $this->getConfigValue('items_lastregisteredusers', '4')); 
    222         
     219 
    223220        include ROOT_CORE . '/viewhelper/formgenerator.core.php'; 
    224221        $form = new Clansuite_Array_Formgenerator($settings); 
    225          
     222 
    226223        $form->addElement('submitbutton')->setName('Save'); 
    227224        $form->addElement('resetbutton'); 
    228          
     225 
    229226        # assign the html of the form to the view 
    230227        $this->getView()->assign('form', $form->render()); 
    231228 
    232         $this->display();        
    233     } 
    234      
     229        $this->display(); 
     230    } 
     231 
    235232    public function action_admin_settings_update() 
    236     {  
     233    { 
    237234        # Set Pagetitle and Breadcrumbs 
    238235        Clansuite_Breadcrumb::add( _('Update'), '/index.php?mod=users&amp;sub=settings&amp;action=update'); 
    … …  
    242239 
    243240        # Get Configuration from Injector 
    244         $config = $this->injector->instantiate('Clansuite_Config'); 
    245          
     241        $config = $this->getInjector()->instantiate('Clansuite_Config'); 
     242 
    246243        # write config 
    247244        $config->confighandler->writeConfig( ROOT_MOD . 'users/users.config.php', $data); 

  • trunk/modules/users/controller/users.module.php

    r4506 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id$ 
    … …  
    3532 
    3633# Security Handler 
    37 if (defined('IN_CS') == false) 
     34if (defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 
    … …  
    4744 * @subpackage  Users 
    4845 */ 
    49 class Clansuite_Module_Users extends Clansuite_Module_Controller implements Clansuite_Module_Interface 
     46class Clansuite_Module_Users extends Clansuite_Module_Controller 
    5047{ 
    51     public function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response) 
     48    public function initializeModule() 
    5249    { 
    5350        $this->getModuleConfig(); 
    … …  
    6865 
    6966        // Defining initial variables 
    70         $currentPage = $this->injector->instantiate('Clansuite_HttpRequest')->getParameter('page'); 
     67        $currentPage = $this->getHttpRequest()->getParameter('page'); 
    7168        $resultsPerPage = 25; 
    7269 

  • trunk/modules/users/users.menu.php

    r4454 r4599  
    2424    * 
    2525    * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE". 
    26     * 
    2726    * @author     Jens-André Koch <vain@clansuite.com> 
    2827    * @copyright  Jens-André Koch (2005 - onwards) 
    29     * 
    3028    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/clansuite 
    3229    * 
    3330    * @version    SVN: $Id: news.module.php 2753 2009-01-21 22:54:47Z vain $ 
    … …  
    3532 
    3633//Security Handler 
    37 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3835{ 
    3936    die('Clansuite not loaded. Direct Access forbidden.'); 

  • trunk/tests/bootstrap.php

    r4367 r4599  
    2929    * 
    3030    * @link       http://www.clansuite.com 
    31     * @link       http://gna.org/projects/ 
     31 
    3232    * 
    3333    * @version    SVN: $Id$ 

  • trunk/themes/core/view/security_breach.php

    r4578 r4599  
    3232 * Security Handler 
    3333 */ 
    34 if(defined('IN_CS') == false) 
     34if(defined('IN_CS') === false) 
    3535{ 
    3636    die('Clansuite not loaded. Direct Access forbidden.'); 
Note: See TracChangeset for help on using the changeset viewer.