Changeset 246

Timestamp:

02/22/08 13:58:35 (8 months ago)

Author:

aarkerio

Message:

Changes on users and entries

Location:

trunk/app

Files:

• app_controller.php (modified) (3 diffs)
• config/core.php (modified) (1 diff)
• controllers/commentnews_controller.php (modified) (5 diffs)
• controllers/entries_controller.php (modified) (3 diffs)
• controllers/users_controller.php (modified) (1 diff)
• models/commentnews.php (modified) (1 diff)
• views/elements/login.ctp (modified) (1 diff)
• views/elements/login_hide.ctp (modified) (1 diff)
• views/layouts/portal.ctp (modified) (2 diffs)
• views/news/view.ctp (modified) (3 diffs)
• views/users/login.ctp (modified) (1 diff)

trunk/app/app_controller.php

@@ -1 +1 @@
 <?php
-/** Manuel Montoya GPL v3 */
+/**
+*     Karamelo eLearning Platform
+*     Chipotle Software 2002-2008
+*     GPLv3 manuel<arroba>mononeurona<punto>org
+**/
 
 class AppController extends Controller {
@@ -10 +14 @@
  public function beforeFilter()
  {
-     $this->Auth->fields = array('username' => 'username', 'password' => 'password');
+     $this->Auth->fields = array('username' => 'username', 'password' => 'pwd');
      $this->Auth->loginAction = array('controller' => 'users', 'action' => 'login');
      $this->Auth->loginRedirect = array('controller' => 'news', 'action' => 'display');
@@ -16 +20 @@
      $this->Auth->loginError = 'Invalid e-mail / password combination. Please try again';
      $this->Auth->authorize = 'controller';  
-     $this->Auth->allow( array('display', 'view', 'register', 'recover') );
+     $this->Auth->allow( array('display', 'view', 'register', 'recover', 'sendmail') );
 
-     $this->set('cU', $this->Auth->user());  // $cU current user
+     $this->set('cU', $this->Auth->user());  // $cU current user array to use in the views if user logged
+ }
+
+ public function msgFlash($msg, $to)
+ {
+     $this->Session->setFlash($msg); // http://manual.cakephp.org/chapter/session
+         
+     $this->redirect($to);
+       
+     exit;
  }
 }

trunk/app/config/core.php

@@ -14 +14 @@
  * In development mode, you need to click the flash message to continue.
  */
-    Configure::write('debug', 1);
+    Configure::write('debug', 2);
 /**
  * Application wide charset encoding

trunk/app/controllers/commentnews_controller.php

@@ -1 +1 @@
 <?php
 /** 
-Chipotle Software 
-GPL v3
+*   Chipotle Software 2002-2008
+*   GPLv3  manuel<arroba>mononeurona<punto>org 
 **/
 //File: /app/controllers/comentnews_controller.php
 
 uses('sanitize');
-loadModel('News');
-loadModel('User');
 
 class CommentnewsController extends AppController
 {
-    public $name       = 'Commentnews';
+ public $name       = 'Commentnews';
     
-    public $helpers    = array('Form', 'Javascript', 'Ajax', 'Time', 'Gags');
+ public $helpers    = array('Javascript', 'Ajax', 'Time', 'Gags');
     
-    public $components = array('Security', 'Captcha', 'Email');
+ public $components = array('Security', 'Captcha', 'Email');
+
+ public function isAuthorized() 
+ {
+   if ( $this->Auth->user('group') != 1 ) 
+   {
+     $this->Auth->deny(array('admin_delete', 'admin_listing', 'admin_edit'));
+   }
+   if ( $this->Auth->user() )
+   {
+     $this->Auth->allow(array('newcomment'));
+   }
+  return true;
+ }
     
- public function add()
- {      
-        if ( ! empty($this->data["Commentnews"]) )
-         {
-           $this->Sanitize = new Sanitize;
+ public function newcomment()
+ {
+   die('sadsadasdsa');  
+   die(var_dump($this->data));
+
+   if ( !empty($this->data["Commentnews"]) )
+   {
+     $this->Sanitize = new Sanitize;
            
-           $this->Sanitize->cleanArray($this->data);
+     $this->Sanitize->cleanArray($this->data);
            
-           $this->data["Commentnews"]["comment"] = nl2br($this->data["Commentnews"]["comment"]);
+     $this->data["Commentnews"]["comment"] = nl2br($this->data["Commentnews"]["comment"]);
            
-           if ( $this->othAuth->user('id') )
-           {
-              $this->data["Commentnews"]["user_id"] = $this->othAuth->user('id');
-           }
-           else
-           {
-               if ($this->data["Commentnews"]["captcha"] != $this->Session->read('captcha') || strlen($this->data["Commentnews"]["captcha"]) < 3)
-               {
-                  $this->flash('Code incorrect, please pulse back button', '/news/display/'.$this->data["Commentnews"]["new_id"], 20);  //    wrong captcha, spambot ??
-                  exit();
-               }
+     if ( $this->Auth->user('id') )
+     {
+              $this->data["Commentnews"]["user_id"] = $this->Auth->user('id');
+     }
+     else
+     {
+       if ($this->data["Commentnews"]["captcha"] != $this->Session->read('captcha') || strlen($this->data["Commentnews"]["captcha"]) < 3)
+       {
+         $this->flash('Code incorrect, please pulse back button', '/news/view/'.$this->data["Commentnews"]["new_id"], 6);  // wrong captcha, spambot ??
+         exit();
+       }
                 
-                $this->data["Commentnews"]["user_id"] = 0;
-           }
+         $this->data["Commentnews"]["user_id"] = 0;
+     }
             
-          if ( $this->Commentnews->save($this->data["Commentnews"]) ) //save the comment
-          {
-                $this->News = new News;
+      if ( $this->Commentnews->save($this->data["Commentnews"]) ) //save the comment
+      {
+          $this->News = new News;
                 
-                $user_id  = $this->News->field('user_id', array("News.id"=>$this->data["Commentnews"]["new_id"]));
+          $user_id  = $this->News->field('user_id', array("News.id"=>$this->data["Commentnews"]["new_id"]));
                 
-                $this->sendMail($user_id, $this->data["Commentnews"]["new_id"]);
+          $this->sendMail($user_id, $this->data["Commentnews"]["new_id"]);
                 
-                $this->redirect('/news/display/'.$this->data["Commentnews"]["new_id"].'#cnews');
-          }
+          $this->redirect('/news/view/'.$this->data["Commentnews"]["new_id"].'#cnews');
        }
+    }
  }
  
@@ -70 +84 @@
         $data = $this->User->find(array("User.id"=>$user_id), $fields);
         //exit($data["User"]["email"]);
-        $this->Email->sender    = '::MonoNeurona.org::';
+        $this->Email->sender    = '::Karamelo::';
         $this->Email->to        = $data["User"]["email"];
-        $this->Email->subject   = '::MonoNeurona.org:: New comment on your front-page New';
+        $this->Email->subject   = '::Karamelo:: New comment on your front-page New';
         $this->Email->sendAs    = 'html';
         $this->Email->template  = null;
@@ -80 +94 @@
         //Note: the text can be an array, each element will appear as a
         //seperate line in the message body.
-        $url   = '<img src="http://www.mononeurona.org/img/admin/new_user.jpg" alt="MonoNeurona" title="MonoNeurona" /><br />';
+        $url   = 'Karamelo<br />';
         $url  .= '<h2>'.$data["User"]["username"].'</h2><p>You have a new comment in your new: ';
-        $url  .= '<a href="http://'.$_SERVER['SERVER_NAME'].'/news/display/'.$new_id.'">';
-        $url  .= 'http://'.$_SERVER['SERVER_NAME'].'/news/display/'.$new_id.'</a></p>';
+        $url  .= '<a href="http://'.$_SERVER['SERVER_NAME'].'/news/view/'.$new_id.'">';
+        $url  .= 'http://'.$_SERVER['SERVER_NAME'].'/news/view/'.$new_id.'</a></p>';
         
         //die($url);
@@ -101 +115 @@
  public function admin_listing($limit=20)
  {
-      $this->layout    = 'admin';
-      $this->pageTitle = 'Comments on Blogs';
+   $this->layout    = 'admin';
+
+   $this->pageTitle = 'Comments on Blogs';
       
-      $conditions      = null;
-      $fields          = array("Commentnews.id", "News.title", "Commentnews.id", "Commentnews.comment", "Commentnews.created", "Commentnews.name", "Commentnews.user_id");
-      $order           = "Commentnews.id DESC";
+   $conditions  = null;
+
+   $fields = array("Commentnews.id", "News.title", "Commentnews.id", "Commentnews.comment", "Commentnews.created", "Commentnews.name", "Commentnews.user_id");
+   $order           = "Commentnews.id DESC";
        
-      $this->set('data', $this->Commentnews->findAll($conditions, $fields, $order, $limit, null, 2));
+   $this->set('data', $this->Commentnews->findAll($conditions, $fields, $order, $limit, null, 2));
  }
  
@@ -136 +152 @@
  public function admin_delete($id)
  {
-        // deletes task from database
-        $this->Commentnews->del($id);
-        $this->msgFlash('Comment deleted', '/admin/commentnews/listing');
+    // deletes comment on database
+    $this->Commentnews->del($id);
+    $this->msgFlash('Comment deleted', '/admin/commentnews/listing');
   }
 }

trunk/app/controllers/entries_controller.php

@@ -2 +2 @@
 /**
 *  Karamelo E-Learning Platform
-*  Manuel Montoya 2002-2007 
-*  GPL manuel<at>mononeurona.org
+*  Manuel Montoya 2002-2008 
+*  GPL manuel<at>mononeurona<punto>org
 */ 
 
 uses('sanitize');
-loadModel('User');
-loadModel('Category');
 
 class EntriesController extends AppController {
  
- public $helpers       = array('Ajax', 'Form', 'Fck', 'Gags');
+ public $helpers       = array('Ajax', 'Fck', 'Gags');
  
- public $components    = array('Edublog', 'Portal', 'Search', 'Mypagination');
+  //public $components    = array('Edublog', 'Portal', 'Search', 'Mypagination');
+  public function isAuthorized() 
+  {
+    if ($this->action == 'admin_listing') 
+    {
+    if ($this->Auth->user('group_id') == 1) 
+        {
+        return true;
+        } 
+    else 
+        {
+        return false;
+        }
+    }
  
+    return true;
+ }
+
  public function results($string) 
  {
@@ -94 +108 @@
  public function admin_start($order = null)
  {
-        if (!$this->othAuth->user('id'))
+        if (!$this->Auth->user('id'))
         {
             die($this->redirect('/users/general')); // Get Out!!!
@@ -111 +125 @@
    public function admin_listing($page=1, $order = null) 
    {
-       $order = ($order == null) ? 'Entry.id DESC': 'Entry.'.$order;
-       
        $this->layout    = 'admin';
        
-       //pagination
-       $total_rows = $this->Entry->findCount(array("Entry.user_id"=>$this->othAuth->user('id'))); 
-       
-       $lmt        = 25; // limit news
-       
-       $targetpage = "/admin/entries/listing/";
-       
-       $pagination = $this->Mypagination->init($total_rows, $page, $lmt, $targetpage); //Pagination
-       
-       $this->set('pagination', $pagination);
-       
-       $conditions = array("Entry.user_id"=>$this->othAuth->user('id'));
+       $conditions = array("Entry.user_id"=>$this->Auth->user('id'));
        
        $fields     = null;
        
-       $offset     = (($page * $lmt) - $lmt);
+       $limit      = 20;
        
-       $limit      = $lmt . " OFFSET " . $offset;
-       
-       $data       = $this->Entry->findAll($conditions, $fields, $order, $limit);
-       
-       $this->set('data', $data);
+       $this->set('data', $this->Entry->findAll($conditions, $fields, $order, $limit));
   }
   

trunk/app/controllers/users_controller.php

@@ -331 +331 @@
  {
     $this->layout    = 'portal';
-    
-    //$this->Group = new Group;
+ 
     $conditions = array("id"=>'>1', "id"=>"<5");
-    // old: $this->set('groups', $this->User->Group->generateList($conditions, 'name', null, '{n}.Group.id', '{n}.Group.name'));
 
     $this->set('groups', Set::combine($this->User->Group->find('all'), "{n}.Group.id","{n}.Group.name"));
-    //$this->set('Element', $this->Portal->statics()); // Using Portal component
+    //$this->set('Element', $this->Portal->statics()); // Using Portal components
     
  }

trunk/app/models/commentnews.php

@@ -15 +15 @@
                          )
                   );
+
+  public $validate = array(
+                      'username' => array(
+                     'rule' => array('minLength', 6),  
+                                          'message' => 'Usernames must be at least 6 characters long.'
+                     ) 
+              );
 }
 ?>

trunk/app/views/elements/login.ctp

@@ -4 +4 @@
 <legend> Login</legend>
   <?php 
-   echo  $form->input('User.username', array('id' => 'user_username', 'size' => '15', 'maxlength'=>'30')). '<br />';
-   echo  $form->input('User.passwd', array('id' => 'user_passwd', 'size' => '9', 'type'=>'password'));
-   ?><br />
-  Remember me: <?php echo  $form->checkbox("User.remember_me");?><br />
- 
- <?php echo $form->end('Login'); ?>
-</fieldset>
+   echo  $form->input('User.username', array('id' => 'user_username', 'size' => 15, 'maxlength'=> 30)) . '<br />';
+   echo  $form->label('User.pwd', 'Password: ');
+   echo  $form->password('User.pwd', array('id' => 'user_pwd', 'size' => 9, 'maxlength' => 9));
+   echo  $form->label('User.remember_me', 'Remember me: ');
+   echo  $form->checkbox('User.remember_me');
+   echo  $form->end('Login'); 
+ ?>
+ </fieldset>
 
- <p><?php echo $html->link('Join us!', '/users/register'); ?></p>
- <p><?php echo $html->link('forgot your password?', '/users/recover'); ?></p>
-</div>
+ <?php 
+   echo $html->para(null, $html->link('Join us!', '/users/register')); 
+   echo $html->para(null, $html->link('forgot your password?', '/users/recover')); 
+ ?>
+ </div>

trunk/app/views/elements/login_hide.ctp

@@ -19 +19 @@
 <legend>Login</legend>
   <?php 
-   echo  $form->label( 'User.username', 'Username:') . "<br />";  
+   echo  $form->label('User.username', 'Username:') . "<br />";  
    echo  $form->input('User.username', array('size' => 15, 'maxlength'=>30)) . "<br />";
 
    
-   echo  $form->label('User.password', 'Password:') . "<br />";
-   echo  $form->password('User.password', array('size' => 9, 'maxlength'=>9));
+   echo  $form->label('User.pwd', 'Password:') . "<br />";
+   echo  $form->password('User.pwd', array('size' => 9, 'maxlength' => 9));
    ?><br />
   Remember me: <?php echo  $form->checkbox("User.cokie", null, array("value" => 1));?><br />

trunk/app/views/layouts/portal.ctp

@@ -31 +31 @@
    echo $cU['User']['username'] .'</b></span>'.$html->link('(Logout)', '/users/logout') . ' | '; 
 
-        if ( $othAuth->user('group_id') < 3 ) // the logged user is teacher or admin?
+        if (  $cU['User']['group_id'] < 3 ) // the logged user is teacher or admin?
         {
            echo $html->link('Admin', '/admin/entries/start') . ' | ';
@@ -100 +100 @@
  if ( !isset( $cU['User']) )
  {
-            echo $this->renderElement('login_hide');
+     echo $this->renderElement('login_hide');   //login javascript popup
  }
 

trunk/app/views/news/view.ctp

@@ -42 +42 @@
 echo $news->socialNets($data['News']['id'], $data['News']['title']); // Social nets buttons
     
-if ( $data['News']['comments'] == 1 )  // comments are actived ??
+if ( $data['News']['comments'] == 1 )  // comments in this new are actived ??
 {
   $i = 1;
   echo '<div id="cnews">';
   foreach($data["Commentnews"] as $v)
-    {
+  {
       $bg = ($i%2==0) ? "#e2e2e2" : "#fff";
               
@@ -55 +55 @@
       echo "</div>";
       $i++;
-    }
+  }
   echo "</div>";
 ?>
 <p>
 <?php 
-   echo $form->create('Commentnews',array("action"=>"add","onsubmit"=>"return validateNew()"));
+   echo $form->create('Commentnews',array("action"=>"newcomment","onsubmit"=>"return validateNew()"));
    echo $form->hidden('Commentnews.new_id', $data['News']['id']); 
    echo $form->hidden('Commentnews.level', 1);
@@ -69 +69 @@
 
   <?php 
-   if ( isset( $cUser['User']['id'] ) ) 
+   if ( isset( $cU['User']['id'] ) ) 
    {
-       echo $form->hidden('Commentnews.user_id', $cUser['User']['id']);
-       echo $form->hidden('Commentnews.name', $cUser['User']['username']);
-       echo '<b>'. $cUser['User']['username'] . '</b>  writes. ';
+       echo $form->hidden('Commentnews.user_id', $cU['User']['id']);
+       echo $form->hidden('Commentnews.name', $cU['User']['username']);
+       echo '<b>'. $cU['User']['username'] . '</b>  writes. ';
   }
   else

trunk/app/views/users/login.ctp

@@ -3 +3 @@
 echo $form->create('User', array('action' => 'login'));
 echo $form->input('username');
-echo $form->input('password');
+echo $form->label('pwd', 'Password:');
+echo $form->password('pwd') . '<br />';
 echo $form->label('remember_me', 'Remember me:');
 echo $form->checkbox('remember_me');