Changeset 540

Timestamp:

05/21/08 11:43:42 (6 months ago)

Author:

aarkerio

Message:

New Try

Location:

trunk/app

Files:

• app_controller.php (modified) (2 diffs)
• controllers/acquaintances_controller.php (modified) (1 diff)
• controllers/answers_controller.php (modified) (1 diff)
• controllers/categories_controller.php (modified) (1 diff)
• controllers/catfaqs_controller.php (modified) (1 diff)
• controllers/catforums_controller.php (modified) (1 diff)
• controllers/catglossaries_controller.php (modified) (1 diff)
• controllers/colleges_controller.php (modified) (1 diff)
• controllers/comments_controller.php (modified) (1 diff)
• controllers/confirms_controller.php (modified) (1 diff)
• controllers/discussions_controller.php (modified) (1 diff)
• controllers/ecourses_controller.php (modified) (1 diff)
• controllers/entries_controller.php (modified) (1 diff)
• controllers/events_controller.php (modified) (1 diff)
• controllers/faqs_controller.php (modified) (1 diff)
• controllers/forums_controller.php (modified) (1 diff)
• controllers/galleries_controller.php (modified) (1 diff)
• controllers/glossaries_controller.php (modified) (1 diff)
• controllers/groups_controller.php (modified) (1 diff)
• controllers/helps_controller.php (modified) (1 diff)
• controllers/images_controller.php (modified) (1 diff)
• controllers/lessons_controller.php (modified) (1 diff)
• controllers/medias_controller.php (modified) (1 diff)
• controllers/messages_controller.php (modified) (1 diff)
• controllers/news_controller.php (modified) (1 diff)
• controllers/newsletters_controller.php (modified) (1 diff)
• controllers/participations_controller.php (modified) (1 diff)
• controllers/podcasts_controller.php (modified) (1 diff)
• controllers/pollrows_controller.php (modified) (1 diff)
• controllers/polls_controller.php (modified) (1 diff)
• controllers/questions_controller.php (modified) (1 diff)
• controllers/quotes_controller.php (modified) (1 diff)
• controllers/recovers_controller.php (modified) (1 diff)
• controllers/replies_controller.php (modified) (1 diff)
• controllers/results_controller.php (modified) (1 diff)
• controllers/shares_controller.php (modified) (1 diff)
• controllers/subjects_controller.php (modified) (1 diff)
• controllers/tests_controller.php (modified) (1 diff)
• controllers/themeblogs_controller.php (modified) (1 diff)
• controllers/themes_controller.php (modified) (1 diff)
• controllers/topics_controller.php (modified) (1 diff)
• controllers/treasures_controller.php (modified) (1 diff)
• controllers/users_controller.php (modified) (1 diff)
• controllers/vclassrooms_controller.php (modified) (1 diff)
• controllers/webquests_controller.php (modified) (1 diff)
• controllers/wikis_controller.php (modified) (1 diff)

trunk/app/app_controller.php

@@ -18 +18 @@
  public function beforeFilter()
  {
-     $this->Auth->fields         = array('username' => 'email', 'password' => 'pwd');
-     $this->Auth->loginAction    = array('controller' => 'users', 'action' => 'login');
-     $this->Auth->loginRedirect  = array('controller' => 'news', 'action' => 'display');
-     $this->Auth->logoutRedirect = '/news/display';
+     $this->Auth->fields         = array('username'   => 'email', 'password' => 'pwd');
+     $this->Auth->loginAction    = array('controller' => 'users', 'action'   => 'login');
+     $this->Auth->loginRedirect  = array('controller' => 'news', 'action'    => 'display');
+     $this->Auth->logoutRedirect = array('controller' => 'news', 'action'    => 'display');
      $this->Auth->loginError     = 'Invalid e-mail / password combination. Please try again';
      $this->Auth->authorize      = 'controller';  
@@ -28 +28 @@
      $this->set('cU', $this->Auth->user());  // $cU current user array to use in the views if user logged in
  }
+
+ public function isAuthorized() 
+ {      
+   if (isset( $this->params[Configure::read('Routing.admin')] )):
+       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
+          return true;
+       else:
+              return false;
+       endif;
+   endif;
  
+   return true;
+ }
+
  public function msgFlash($msg, $to)
  {

trunk/app/controllers/acquaintances_controller.php

@@ -23 +23 @@
     $this->Auth->allow(array('display')); 
  }
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-          return true;
-       else:
-              return false;
-       endif;
-   endif;
- 
-   return true;
- }
- 
+  
  public function display($username, $user_id)
  {

trunk/app/controllers/answers_controller.php

@@ -21 +21 @@
  }
  
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
-
-  /***   === ADMIN METHODS===  ***/
+ /***   === ADMIN METHODS===  ***/
   
-  public function admin_add() 
-  {
+ public function admin_add() 
+ {
    if (!empty($this->data["Answer"]))
    {  

trunk/app/controllers/categories_controller.php

@@ -22 +22 @@
  }
  
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }  
-
  public function index($order = null)
  {

trunk/app/controllers/catfaqs_controller.php

@@ -22 +22 @@
     parent::beforeFilter();
     $this->Auth->allow(array('display', 'view'));
- }
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
  }
  

trunk/app/controllers/catforums_controller.php

@@ -24 +24 @@
  }
 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
- 
  public function display($username, $user_id) 
  { 

trunk/app/controllers/catglossaries_controller.php

@@ -24 +24 @@
  }
  
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
-
  public function display($username)
  {

trunk/app/controllers/colleges_controller.php

@@ -24 +24 @@
  }
  
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
-
  public function view() 
  {     

trunk/app/controllers/comments_controller.php

@@ -24 +24 @@
  }
   
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
- 
  public function view($username=null, $entry_id=null)
  {    

trunk/app/controllers/confirms_controller.php

@@ -19 +19 @@
     $this->Auth->allow(array('signup'));
  }
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
- 
+  
  public function signup($secret = null)
  { 

trunk/app/controllers/discussions_controller.php

@@ -27 +27 @@
          $this->Auth->allow(array('captcha', 'add'));
     endif;
- }
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
  }
  

trunk/app/controllers/ecourses_controller.php

@@ -22 +22 @@
  }
  
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
- 
-
- /****
-     ===== ADMIN SECTION ==========
- ****/
+ /****     ===== ADMIN SECTION ========== ****/
  public function admin_start()
   {

trunk/app/controllers/entries_controller.php

@@ -25 +25 @@
  } 
  
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
-
  public function rss($username)
  {

trunk/app/controllers/events_controller.php

@@ -15 +15 @@
 class EventsController extends AppController
 {  
-  public $helpers       = array('Html', 'Javascript', 'Ajax', 'Form');
+ public $helpers       = array('Html', 'Javascript', 'Ajax', 'Form');
    
-  public $components    = array('Portal');
+ public $components    = array('Portal');
    
-  public function beforeFilter() 
-  {
+ public function beforeFilter() 
+ {
     parent::beforeFilter();
     // allow everyone to join
     $this->Auth->allow(array('display'));
-  }
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
  }
  
-   
-  public function calendar()
-  {  
+ public function calendar()
+ {  
       $this->layout  = 'portal';
       

trunk/app/controllers/faqs_controller.php

@@ -24 +24 @@
  }
 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
-  
  public function index($order = null)
  {

trunk/app/controllers/forums_controller.php

@@ -22 +22 @@
     parent::beforeFilter();
     $this->Auth->allow(array('display', 'discussion', 'view', 'index'));
- }
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
  }
  

trunk/app/controllers/galleries_controller.php

@@ -15 +15 @@
 class GalleriesController extends AppController
 {
-  public $helpers       = array('Ajax', 'User', 'Gags');    
+ public $helpers       = array('Ajax', 'User', 'Gags');    
 
-  public function beforeFilter() 
+ public function beforeFilter() 
  {
     parent::beforeFilter();

trunk/app/controllers/glossaries_controller.php

@@ -21 +21 @@
  {
    parent::beforeFilter();
- }
-
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
  }
   

trunk/app/controllers/groups_controller.php

@@ -21 +21 @@
   }
 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
-  
  /**   === ADMIN METHODS ===  **/ 
  public function admin_listing() 

trunk/app/controllers/helps_controller.php

@@ -22 +22 @@
      parent::beforeFilter();
      $this->Auth->allow(array('display', 'tour'));
- }
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
  }
  

trunk/app/controllers/images_controller.php

@@ -23 +23 @@
  }
     
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
- 
  /***  === ADMIN METHODS  ***/
  

trunk/app/controllers/lessons_controller.php

@@ -23 +23 @@
     $this->Auth->allow(array('view', 'display'));
  }
- 
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
- 
  
  public function view($username, $id)

trunk/app/controllers/medias_controller.php

@@ -20 +20 @@
     $this->Auth->allow(array('view', 'display'));
  }
-
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
- 
  
  public function index($id = null)

trunk/app/controllers/messages_controller.php

@@ -26 +26 @@
  }
 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
- }
- 
  public function message($username) // show form to send message to teacher
  {      

trunk/app/controllers/news_controller.php

@@ -24 +24 @@
    parent::beforeFilter();
    $this->Auth->allow(array('view', 'display', 'rss', 'category'));
- }
- 
- public function isAuthorized() 
- {      
-   if (isset( $this->params[Configure::read('Routing.admin')] )):
-       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
-         return true;
-       else:
-             return false;
-       endif;   
-   endif;
-
-   return true;
  }
  

trunk/app/controllers/newsletters_controller.php

@@ -21 +21 @@
   }