Changeset 538

Timestamp:

05/21/08 01:02:56 (6 months ago)

Author:

aarkerio

Message:

New Try

Location:

trunk/app

Files:

• app_controller.php (modified) (1 diff)
• 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)
• views/acquaintances/admin_edit.ctp (modified) (1 diff)

trunk/app/app_controller.php

@@ -24 +24 @@
      $this->Auth->loginError     = 'Invalid e-mail / password combination. Please try again';
      $this->Auth->authorize      = 'controller';  
-     $this->Auth->autoRedirect   = true;
      $this->Auth->deny('*');
    
      $this->set('cU', $this->Auth->user());  // $cU current user array to use in the views if user logged in
  }
-  
+ 
  public function msgFlash($msg, $to)
  {

trunk/app/controllers/acquaintances_controller.php

@@ -29 +29 @@
        if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
           return true;
+       else:
+              return false;
        endif;
-   endif; 
-   return false;  // go away !!
+   endif;
+ 
+   return true;
  }
  

trunk/app/controllers/answers_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;
-        } 
-    } 
-    return false;  // go away !!
+   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/categories_controller.php

@@ -21 +21 @@
    parent::beforeFilter();
  }
-   
- public function isAuthorized()
- {     
+ 
+ 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;
-            endif;
+       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
+         return true;
+       else:
+             return false;
+       endif;   
    endif;
-   return false;  // go away !!
-  }
 
-  public function index($order = null)
-  {
+   return true;
+ }  
+
+ public function index($order = null)
+ {
         $this->layout    = 'admin';
         $this->pageTitle = 'Categories';

trunk/app/controllers/catfaqs_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;
-        } 
-    } 
-    return false;  // go away !!
+   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()
- {     
+ 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;
-        endif;
+       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
+         return true;
+       else:
+             return false;
+       endif;   
    endif;
-   return false;  // go away !!
+
+   return true;
  }
  

trunk/app/controllers/catglossaries_controller.php

@@ -27 +27 @@
  {      
    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;
-        endif;
+       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
+         return true;
+       else:
+             return false;
+       endif;   
    endif;
-   return false;  // go away !!
+
+   return true;
  }
 

trunk/app/controllers/colleges_controller.php

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

trunk/app/controllers/comments_controller.php

@@ -23 +23 @@
     $this->Auth->allow(array('view', 'add'));
  }
- 
+  
  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
+       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
          return true;
-        endif;
-   endif; 
-    
-   return false;  // go away !!
+       else:
+             return false;
+       endif;   
+   endif;
+
+   return true;
  }
-
-
+ 
  public function view($username=null, $entry_id=null)
  {    

trunk/app/controllers/confirms_controller.php

@@ -23 +23 @@
  {      
    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;
-    endif;
-    endif; 
-    return false;  // go away !!
+       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/discussions_controller.php

@@ -28 +28 @@
     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;
-        endif;
+       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
+         return true;
+       else:
+             return false;
+       endif;   
    endif;
-   return false;  // go away !!
+
+   return true;
  }
-
+ 
  public function add()
  {

trunk/app/controllers/ecourses_controller.php

@@ -21 +21 @@
     $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;
-        endif;
+       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
+         return true;
+       else:
+             return false;
+       endif;   
    endif;
-   return false;  // go away !!
+
+   return true;
  }
+ 
 
  /****

trunk/app/controllers/entries_controller.php

@@ -23 +23 @@
     parent::beforeFilter();
     $this->Auth->allow(array('rss', 'search'));
- }
+ } 
  
  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
+   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;
-        endif;
-    endif;
-    return false;  // go away !!
+       else:
+             return false;
+       endif;   
+   endif;
+
+   return true;
  }
 

trunk/app/controllers/events_controller.php

@@ -25 +25 @@
     $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()

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):          
-                      return true;
-        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 false; // go away!!
+
+   return true;
  }
- 
+  
  public function index($order = null)
  {

trunk/app/controllers/forums_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;
-        } 
-    } 
-    return false;  // go away !!
+   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

@@ -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;
-        } 
-    } 
-    return false;  // go away !!
+   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)
-  {
+ 
+ public function index($id = null)
+ {
         $this->pageTitle = 'View Active Users';
         $this->set('data', $this->User->findAll()); 
         $this->set('color', 'blue');
-  }
+ }
     
-  public function listview()
-  {         
+ public function listview()
+ {         
         $this->layout    = 'popup';
         

trunk/app/controllers/glossaries_controller.php

@@ -22 +22 @@
    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
+       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
          return true;
-        endif;
-    endif;
-    return false;  // go away !!
+       else:
+             return false;
+       endif;   
+   endif;
+
+   return true;
  }
-    
+  
  public function display($username)
  {

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  ):  // admin                    
-                      return true;
-                  endif;
-    endif;
-    return false;  // go away !!     
-  }
+ 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/helps_controller.php

@@ -23 +23 @@
      $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;
-         endif;
+       if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
+         return true;
+       else:
+             return false;
+       endif;   
    endif;
-   return false;  // go away !!
+
+   return true;
  }
-
+ 
  public function tour() 
  {

trunk/app/controllers/images_controller.php

@@ -18 +18 @@
   public $components    = array('Adds');
 
-  public function beforeFilter()
-  {
+ public function beforeFilter()
+ {
      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;
-        endif; 
-    endif;
-    return false;  // go away !!
+ }
+    
+ 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;