Changeset 336

Timestamp:

03/24/08 14:42:08 (10 months ago)

Author:

aarkerio

Message:

Move recover from users

Location:

trunk/app

Files:

• app_controller.php (modified) (2 diffs)
• controllers/lessons_controller.php (modified) (2 diffs)
• controllers/news_controller.php (modified) (2 diffs)
• controllers/recovers_controller.php (added)
• controllers/users_controller.php (modified) (11 diffs)
• models/recover.php (added)
• views/elements/login.ctp (modified) (1 diff)
• views/elements/login_hide.ctp (modified) (1 diff)
• views/recovers (added)
• views/users/index.ctp (deleted)
• views/users/recover.ctp (modified) (2 diffs)

trunk/app/app_controller.php

@@ -7 +7 @@
 
 class AppController extends Controller {
-
+ 
  public $components = array('Auth', 'Cookie', 'Security');
-
- public $helpers = array('Html', 'Form', 'Session');
-
+ 
+ public $helpers    = array('Html', 'Form', 'Session');
+ 
+ //deprecated public $allow      = array('view', 'display', 'subscribe', 'recover', 'reply', 'register', 'insert', 'vote', 'entry', 'download', 'blog','portfolio', 'about', 'signup', 'message', 'search', 'directory', 'bloggers', 'add', 'rss', 'discussion'); 
+ 
  public function beforeFilter()
  {
@@ -20 +22 @@
      $this->Auth->loginError = 'Invalid e-mail / password combination. Please try again';
      $this->Auth->authorize = 'controller';  
-     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover', 'reply', 'register', 'insert', 'vote', 'entry', 'download', 'blog','portfolio', 'about', 'signup', 'message', 'search', 'directory', 'bloggers', 'add', 'rss', 'discussion') );
+     $this->Auth->deny('*');
      $this->Auth->autoRedirect = true;
      $this->set('cU', $this->Auth->user());  // $cU current user array to use in the views if user logged

trunk/app/controllers/lessons_controller.php

@@ -10 +10 @@
 class LessonsController extends AppController
 {
-  public $helpers       = array('Ajax', 'User', 'Fck', 'Gags');
-    
-  public $components    = array('Edublog');
-
+ public $helpers       = array('Ajax', 'User', 'Fck', 'Gags');
+ 
+ public $components    = array('Edublog');
+ 
+ public function beforeFilter() 
+ {
+    $this->Auth->allow(array('view', 'display'));
+    parent::beforeFilter();
+ }
+ 
  public function isAuthorized() 
  {      
@@ -25 +31 @@
     return false;  // go away !!
  }
-
+ 
  public function view($username, $id)
- {   
+ {      
         $user_id           = $this->Lesson->User->field('id', array('User.username'=>$username));
- 
+        
         $this->layout      = $this->Edublog->layout($user_id);
-
+        
         $this->Edublog->blog($user_id); // blogger elements
-
+        
         $this->LessonTitle = 'Lesson';
         

trunk/app/controllers/news_controller.php

@@ -14 +14 @@
   
   public $components       = array('Portal');
-
-  public function isAuthorized()
-  {
+  
+  public function beforeFilter() 
+ {
+    $this->Auth->allow(array('view', 'display', 'rss'));
+    parent::beforeFilter();
+ }
+ 
+ public function isAuthorized()
+ {
       if (isset($this->params[Configure::read('Routing.admin')]))
       {
@@ -25 +31 @@
       }
       return false; // go away!!
-  }
-                                                                 
-  public function display($page=1) 
-  {     
+ }
+ 
+ public function display($page=1) 
+ {     
         $this->layout = 'portal';
         
         $this->pageTitle = 'Karamelo::Home';
-
+        
         $conditions = array("News.status"=>1);
-
+        
         $fields     = array("News.id", "News.title", "News.comments", "News.body", "News.created", "News.reference", "News.theme_id", "News.user_id", "Theme.img", "Theme.theme", "User.username", "Subject.title", "Subject.id");
         

trunk/app/controllers/users_controller.php

@@ -12 +12 @@
 {
  public $helpers        = array('Ajax', 'Fck', 'Gags');
-    
+ 
  public $components     = array('Edublog', 'Portal', 'Email', 'Adds');
-
+ 
  public $paginate       = array('limit' => 5, 'order' => array('Page.created' => 'desc'));
-
+ 
+ public function beforeFilter() 
+ {
+    $this->Auth->allow(array('blog', 'entry','portfolio', 'about', 'check', 'register', 'directory', 'bloggers'));
+    parent::beforeFilter();
+ }
+ 
  public function isAuthorized() 
  {      
@@ -28 +34 @@
     return false;  // go away !!
  }
-
+ 
  public function blog($username = null, $page=1) 
  {
@@ -45 +51 @@
         
      $fields   = array("Entry.title", "Entry.body", "Entry.created", "Entry.user_id", "Entry.discution", "Entry.subject_id", "Entry.id", "User.username", "Subject.title", "Subject.id");
- 
+     
      $conditions = array("Entry.user_id"=>$user_id, "Entry.status"=>1);
-
+     
      $limit      = 20;
         
@@ -55 +61 @@
         
      $this->Edublog->blog($user_id);
-    }
-    
-    public function entry($username = null, $entry_id = null) 
-    {
-        if ($entry_id == null)
-        {
+ }
+ 
+ public function entry($username, $entry_id) 
+ {
+     if ($entry_id == null)
+     {
            $this->redirect('/blog/'.$username);
            exit;
-        }
-        
-        $this->pageTitle = $username . '\'s Blog';
-        
-        $user_id = $this->User->field("id", array("username"=>$username));
-        
-        if ($username == null || $user_id == null)
-        {
+     }
+     
+     $this->pageTitle = $username . '\'s Blog';
+     
+     $user_id = $this->User->field("id", array("username"=>$username));
+     
+     if ($username == null || $user_id == null)
+     {
            $this->redirect("/");
-        }
-        
-        $this->Entry     = new Entry;
-        
-        $order    = "Entry.id DESC";
-        
-        $fields   = array("Entry.title", "Entry.body", "Entry.created", "Entry.user_id", "Entry.discution", "Entry.subject_id", "Entry.id", "User.username", "Subject.title", "Subject.id");
-        
+     }
+     
+     $this->Entry     = new Entry;
+     
+     $order    = "Entry.id DESC";
+     
+     $fields   = array("Entry.title", "Entry.body", "Entry.created", "Entry.user_id", "Entry.discution", "Entry.subject_id", "Entry.id", "User.username", "Subject.title", "Subject.id");
+     
         if ( $entry_id != null && is_numeric( $entry_id ) ) // show only one new
         {
@@ -91 +97 @@
         $this->Edublog->blog($user_id); // blogger elements
  }
-   
+ 
  public function portfolio($username) 
  {
@@ -122 +128 @@
  }
 
- /*** Recover password check****/
- public function check()
- {    
-        $this->Sanitize = new Sanitize;
-        
-        $this->Sanitize->clean($this->data["User"]);
-        
-        if ( ! empty( $this->data["User"] ) )
-        {
-           $user_id = $this->User->field('id', array("email" => $this->data["User"]["email"] ));
-           
-           if ($user_id == null)
-           {
-                   $this->set('error_message', "Error: email <b>" . $this->data["User"]["email"] . "</b> does not exist on database");
-                   $this->render('check', 'ajax');
-           }
-           else
-           {   
-               $this->Recover = new Recover;                                                    //confirm model
-
-               $this->data['Recover']['user_id']  = $user_id;   //the user id
-
-               $this->data['Recover']['random']   = $this->Adds->genPassword(14);
-               
-               $this->Recover->create();
-               
-               if ( $this->Recover->save($this->data['Recover']) )
-               {
-                   if ( $this->sendRecover($this->data["User"]['email'], $this->data['Recover']['random']) ) 
-                   {
-                       $this->set('message', "Success. An email has been sent to: <b>".$this->data["User"]["email"]) . "</b>";
-                       
-                       $this->render('check', 'ajax');
-                   }
-               }
-           }
-        }
-   }
-       
   public function alumni()
   {
@@ -183 +150 @@
         $this->layout    = 'portal';
         
+        $this->pageTitle = 'Parents :: Karamelo E-learning on Web 2.0';
+        
+        $this->Portal->statics(); // Using Portal component
+ }
+ 
+ public function academics()
+ {
+        $this->layout    = 'portal';
+        
         $this->pageTitle = 'Students :: Karamelo E-learning on Web 2.0';
         
-        $this->Cover = new Cover;
-        
-        $conditions  = array("Cover.status"=>1, "Cover.group_id"=>4);
-        $fields      = array("id", "title", "body", "created");
-        $order       = "Cover.id DESC";
-        $limit       = 1;
-        
-        $this->set('cover', $this->Cover->findAll($conditions, $fields, $order, $limit));
-
         $this->Portal->statics(); // Using Portal component
-    }
-
-    public function academics()
-    {
-        $this->layout    = 'portal';
-        
-        $this->pageTitle = 'Students :: Karamelo E-learning on Web 2.0';
-        
-        $this->Cover = new Cover;
-        
-        $conditions  = array("Cover.status"=>1, "Cover.group_id"=>2);
-        $fields      = array("id", "title", "body", "created");
-        $order       = "Cover.id DESC";
-        $limit       = 1;
-        
-        $this->set('cover', $this->Cover->findAll($conditions, $fields, $order, $limit));
-        
-        $this->set('Element', $this->Portal->statics()); // Using Portal component
   }
   
@@ -246 +195 @@
         $this->layout    = 'portal';
  }
-    
- public function recover()
- {
-        $this->pageTitle = 'Recover password :: Karamelo E-learning on Web 2.0';
-        
-        $this->Portal->statics(); // Using Portal component 
-
-        $this->layout    = 'portal';
- }
-    
+ 
  public function bloggers($order = 'username', $desc = 'DESC')
  {   
@@ -295 +235 @@
     {
           $this->Portal->statics(); // Using Portal component
-
+          
           $this->layout    = 'portal';
-       
+          
           $this->pageTitle = 'Login :: Karamelo E-learning';
     }
  }
-
+ 
  public function logout() 
  {
@@ -307 +247 @@
    
    $this->Session->setFlash('Logout');
-
+   
    $this->redirect($this->Auth->logout());
  }
-
+ 
  public function register()
  {
@@ -325 +265 @@
  {   
   $this->layout = 'ajax';
-
+  
   $this->Sanitize = new Sanitize;
-    
+  
   $this->Sanitize->html($this->data["User"]["name"]);
-
+  
   $this->Sanitize->html($this->data["User"]["username"]);
   
   $this->Sanitize->html($this->data["User"]["description"]);
-
+  
   $this->Sanitize->html($this->data["User"]["email"]);
-
+  
   // adds new classroom to database
   if (!empty($this->data['User']))
   {
    $message     = array("oops"=>"Oooppps!");
-    
+   
    /** Check Passwd **/
    if (strlen($this->data['User']['pwd']) < 6)

trunk/app/views/elements/login.ctp

@@ -15 +15 @@
  <?php 
    echo $html->para(null, $html->link('Join us!', '/users/register')); 
-   echo $html->para(null, $html->link('forgot your password?', '/users/recover')); 
+   echo $html->para(null, $html->link('forgot your password?', '/recovers/recover')); 
  ?>
  </div>

trunk/app/views/elements/login_hide.ctp

@@ -30 +30 @@
        echo $form->end('Login');
        echo $html->para(null, $html->link('Join us!', '/users/register'));
-       echo $html->para(null, $html->link('forgot your password?', '/users/recover')); 
+       echo $html->para(null, $html->link('forgot your password?', '/recovers/recover')); 
  ?>
 </div>

trunk/app/views/users/recover.ctp

@@ -6 +6 @@
 <div class="spaced" id="form_register">
 
-<?php echo $html->formTag(null, 'post', array('onsubmit'=>'return false')); ?>
+<?php echo $ajax->form(); ?>
 
 <fieldset>
@@ -13 +13 @@
     <p>Type the email used on your account:</p>
      
-     <?php echo $html->input('User/email', array("size" => 20, "maxlength" => 45, "value"=>"@")); ?>
+     <?php echo $form->input('User.email', array("size" => 50, "maxlength" => 50, "value"=>"@")); ?>
      <br /><br />
      
-     <?php echo $ajax->submit('Send', array("url" => "/users/check/", 
+     <?php echo $ajax->submit('Send', array("url" => "/recovers/check/", 
                                          "update"=>"updater",
                                          "loading" => "Element.show('charging2');Element.hide('updater')",