Ignore:
Timestamp:
08/27/10 23:01:58 (21 months ago)
Author:
vain
Message:
  • minor change to all security constant checks
  • fixed the non rewrite routing
File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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 
Note: See TracChangeset for help on using the changeset viewer.