Changeset 34

Timestamp:

07/16/07 16:10:24 (18 months ago)

Author:

aarkerio

Message:

Add themes scaffold and some images

Location:

trunk/app

Files:

• controllers/ecourses_controller.php (modified) (1 diff)
• controllers/entries_controller.php (modified) (5 diffs)
• controllers/news_controller.php (modified) (1 diff)
• controllers/themes_controller.php (added)
• controllers/users_controller.php (modified) (28 diffs)
• models/theme.php (modified) (1 diff)
• views/entries/admin_start.thtml (modified) (1 diff)
• views/helpers/news.php (modified) (1 diff)
• views/layouts/default.thtml (modified) (1 diff)
• views/news/view.thtml (modified) (3 diffs)
• views/themes/admin_cancel.thtml (added)
• views/themes/admin_edit.thtml (added)
• views/themes/admin_listing.thtml (added)
• views/themes/row.thtml (added)
• views/themes/themes.thtml (added)
• webroot/css/styles.css (modified) (6 diffs)
• webroot/img/socialnet (added)
• webroot/img/socialnet/barrapunto.png (added)
• webroot/img/socialnet/boton_negativo.gif (added)
• webroot/img/socialnet/boton_negativo_off.gif (added)
• webroot/img/socialnet/boton_positivo.gif (added)
• webroot/img/socialnet/boton_positivo_off.gif (added)
• webroot/img/socialnet/delicious.png (added)
• webroot/img/socialnet/fresqui.png (added)
• webroot/img/socialnet/google.png (added)
• webroot/img/socialnet/icon_stumbleupon.gif (added)
• webroot/img/socialnet/meneame.png (added)
• webroot/img/socialnet/technorati.png (added)
• webroot/img/socialnet/vote_loader.gif (added)
• webroot/img/static/newwindow.gif (added)
• webroot/img/themes/notice-board.jpg (added)
• webroot/img/themes/theme-announcement.png (added)
• webroot/img/themes/theme-biology.png (added)

trunk/app/controllers/ecourses_controller.php

@@ -42 +42 @@
     }
     
-    public function admin_add() {
+    public function admin_add() 
+    {
     
     //die(print_r($this->data));

trunk/app/controllers/entries_controller.php

@@ -11 +11 @@
 
 class EntriesController extends AppController {
-    
-    public $helpers       = array('Ajax', 'Form', 'Fck');
-    
-    public $displayField  = 'Blog';
-    
-    public $components    = array('Edublog', 'Portal');
-    
-    public function admin_start($order = null)
-    {
-        if (!$this->othAuth->user('id'))
-        {
-            die($this->redirect('/users/general')); // Get Out!!!
-        }
-        
-        $this->layout    = 'admin';
-        $this->pageTitle = 'Entries';
-        
-        $conditions = null;
-        $fields     = array("id", "title", "body", "category_id");
-        $data       = $this->Entry->findAll( $conditions, $fields, $order, null, null, true );
-        
-        $this->set('data', $data); 
-    }
    
-   public function admin_listing($order = null) {
-       
-       $this->layout    = 'admin';
-       
-       $conditions = array("Entry.user_id"=>$this->othAuth->user('id'));
-       
-       $data = $this->Entry->findAll($conditions, $order);
-       
-       $this->set('data', $data);
-       
-   }
+   public $helpers       = array('Ajax', 'Form', 'Fck');
    
-   public function results($string) {
+   public $components    = array('Edublog', 'Portal');
+   
+   public function results($string) 
+   {
        
        $conditions = array("Entry.body"=>$string);
@@ -56 +26 @@
    }
    
-   public function rss($user_id) {
+   public function rss($user_id) 
+   {
        
        $this->layout    = 'rss';
@@ -71 +42 @@
    
    public function search()
-   {
+   {    
+        $this->layout = 'portal';
+        
         $this->pageTitle = 'Search Results :: Karamelo E-learning on Web 2.0';
         
-        $this->set('subjects', $this->Portal->cms()); // Using Portal component
+        $this->set('Element', $this->Portal->statics()); // Charge Portal components aka Sidebars
         
-        $this->set('randomQuote', $this->Portal->quote()); // quote footer
-        
-        if (!empty($this->data) ) 
+         /* if (!empty($this->data["Entry"]) ) 
         {   
             $data = $this->Lucene->query($this->data['Entry']['terms']);
             
             $this->set('data', $data);
-        }
+        } */
    }
    
-   public function add()
+   public function admin_add()
    {
     
     $this->layout    = 'admin';
     // adds new blog entries 
-   if ( empty($this->params['data']) )  
+   if ( empty($this->data) )  
    {
      
@@ -109 +80 @@
    {
     
-    //$this->Sanitize = new Sanitize;
+    $this->Sanitize = new Sanitize;
     
-    //$this->Sanitize->cleanArray($this->params['data']); //Hopefully this is enough
-      
-      
-      if ($this->Entry->save($this->params['data']))
+    $this->Sanitize->paranoid($this->data["Entry"]["title"]); //Hopefully this is enough
+    
+      if ($this->Entry->save($this->data["Entry"]))
       { 
-            $this->redirect('/entries/listing');
-      } else {
-            $this->flash('Database error!', '/entries/listing');
+            $this->msgFlash('Story has been added', '/admin/entries/listing');
+      } 
+      else 
+      {
+            $this->flash('Database error!', '/admin/entries/listing');
       }
    }
   }
+  /** ===  ADMIN SECTION */
   
-  public function edit($id = null)
+  public function admin_start($order = null)
+  {
+        if (!$this->othAuth->user('id'))
+        {
+            die($this->redirect('/users/general')); // Get Out!!!
+        }
+        
+        $this->layout    = 'admin';
+        $this->pageTitle = 'Entries';
+        
+        $conditions = null;
+        $fields     = array("id", "title", "body", "category_id");
+        $data       = $this->Entry->findAll( $conditions, $fields, $order, null, null, true );
+        
+        $this->set('data', $data); 
+  }
+  
+  public function admin_listing($order = null) 
+  {
+       
+       $this->layout    = 'admin';
+       
+       $conditions = array("Entry.user_id"=>$this->othAuth->user('id'));
+       
+       $data = $this->Entry->findAll($conditions, $order);
+       
+       $this->set('data', $data);
+       
+  }
+  
+  public function admin_edit($id = null)
   {
      $this->layout    = 'admin';
@@ -138 +141 @@
          if ($this->Entry->save($this->data['Entry']))
          {
-             $this->flash('Your entry has been updated.', '/entries/listing');
+             $this->flash('Your entry has been updated.', '/admin/entries/listing');
          }
      }
-   }
+  }
  
-  public function delete($id)
-  {
+ public function admin_delete($id)
+ {
     $this->Entry->del($id);
     
-    $this->flash('The entry with id: '.$id.' has been deleted.', '/entries/listing');
+    $this->msgFlash('The entry has been deleted.', '/admin/entries/listing');
   }
 }

trunk/app/controllers/news_controller.php

@@ -21 +21 @@
   public function view($page=1) 
   {     
+        $this->layout = 'portal';
+        
         //pagination
         $total_rows = $this->News->findCount(array("status"=>1)); 

trunk/app/controllers/users_controller.php

@@ -61 +61 @@
     }
     
-    public function about($user_id) {
+    public function about($user_id) 
+    {
         
         $this->pageTitle = 'About me';
@@ -75 +76 @@
     }
     
-    public function admin_edit($id = null) {
+    public function admin_edit($id = null) 
+    {
     
     $this->layout    = 'admin';
@@ -104 +106 @@
 }
 
-  public function admin_listing($order = null) {
+  public function admin_listing($order = null) 
+  {
        
        $this->layout    = 'admin';
@@ -121 +124 @@
    public function alumni()
     {
+        $this->layout    = 'portal';
+        
         $this->pageTitle = 'Students :: Karamelo E-learning on Web 2.0';
         
@@ -137 +142 @@
     public function general()
     {
+        $this->layout    = 'portal';
+        
         $this->pageTitle = 'Welcome :: Karamelo E-learning on Web 2.0';
         
-        $this->Cover = new Cover;
-        
-        $conditions  = array("Cover.status"=>1, "Cover.group_id"=>6);
-        $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
-        
-        
+        $this->set('Element', $this->Portal->statics()); // Using Portal component
         
         /**********  News  ****/
@@ -167 +163 @@
         $this->set('new', $lastNew);
         
-        
-        /**********  Poll  ****/
-        
-        $this->Poll = new Poll;  //Instantiate the model
-        
-        $conditions = array("status"=>1);
-        $fields     = array("Poll.id", "Poll.question");
-        $order      = "Poll.id DESC";
-        $limit      = 1;
-        
-        $this->set('poll', $this->Poll->findAll($conditions, $fields, $order, $limit, null, 2));
-        
-        /********** last blogs Entries  ****/
-        $this->Entry = new Entry;  //Instantiate the model
-        
-        $conditions = array("Entry.status"=>1);
-        $fields     = array("Entry.id", "Entry.title", "Entry.created", "Entry.user_id");
-        $order      = "Entry.id DESC";
-        $limit      = 10;
-        
-        $this->set('entries', $this->Entry->findAll($conditions, $fields, $order, $limit, null, 2));
-        
-        $this->set('Element', $this->Portal->statics()); // Using Portal component
-        
-        
     }
     
     public function parents()
     {
+        $this->layout    = 'portal';
+        
         $this->pageTitle = 'Students :: Karamelo E-learning on Web 2.0';
         
@@ -214 +187 @@
     public function academics()
     {
+        $this->layout    = 'portal';
+        
         $this->pageTitle = 'Students :: Karamelo E-learning on Web 2.0';
         
@@ -255 +230 @@
         $this->set('Element', $this->Portal->statics()); // Using Portal component
         
-        
+        $this->layout    = 'portal';
         
         /********** list teachers  ****/
@@ -278 +253 @@
         $this->set('Element', $this->Portal->statics()); // Using Portal component
         
-        
+        $this->layout    = 'portal';
     }
    
@@ -287 +262 @@
         $this->set('Element', $this->Portal->statics()); // Using Portal component
         
-        
+        $this->layout    = 'portal';
     }
 
     
     public function bloggers($order = 'username', $desc = 'DESC')
-    {
+    {   
+        $this->layout    = 'portal';
+        
         $conditions  =  array("group_id"=>1);
         $fields      =  array("id", "username", "name", "name_blog", "created");
@@ -300 +277 @@
         
         $this->set('Element', $this->Portal->statics()); // Using Portal component
-        
-        
     }
     public function login()
@@ -311 +286 @@
        
        
-       if (isset($this->params['data']))
+       if (isset($this->data))
        { 
-          $auth_num = $this->othAuth->login($this->params['data']['User']);
+          $auth_num = $this->othAuth->login($this->data['User']);
           
           $this->set('auth_msg', $this->othAuth->getMsg($auth_num));
@@ -321 +296 @@
     
     public function logout()
-    {
+    {  
        $this->othAuth->logout();
        
-       $this->redirect('/users/general');
-    }
-    
-    public function noaccess()
+       $this->redirect('/news/view');
+    }
+    
+   public function noaccess()
    {
-    $this->flash("You don't have permissions to access this page.",'/users/login');
+      $this->flash("You don't have permissions to access this page.",'/users/login');
    }
    
    public function register()
    {
+    $this->layout    = 'portal';
+    
+    
     $this->Group = new Group;
     
@@ -345 +323 @@
     $this->layout = 'ajax';
     // adds new classroom to database
-    if (!empty($this->params['data']))
+    if (!empty($this->data))
     {
     //die(print_r($this->params));
@@ -356 +334 @@
     
     /** Check Passwd **/
-    if (strlen($this->params['data']['User']['passwd']) < 6)
+    if (strlen($this->data['User']['passwd']) < 6)
     {
        $message['pwd_worng'] = "The password has less than 6 characters ";
     }
     
-    if (strpos($this->params['data']['User']['username'], ' '))  // nos spaces
+    if (strpos($this->data['User']['username'], ' '))  // nos spaces
     {
        $message['username_spaces'] = "Your username should not contain spaces";
@@ -367 +345 @@
     
     /** username check **/
-    if (strlen($this->params['data']['User']['username']) < 5)
+    if (strlen($this->data['User']['username']) < 5)
     {
        $message['pwd_username'] = "The username has less than 5 characters ";
@@ -373 +351 @@
     
     /** name check **/
-    if (strlen($this->params['data']['User']['name']) < 5)
+    if (strlen($this->data['User']['name']) < 5)
     {
        $message['pwd_username'] = "The name is too short";
     }
     
-    if (strpos($this->params['data']['User']['passwd'], ' '))  // nos spaces
+    if (strpos($this->data['User']['passwd'], ' '))  // nos spaces
     {
        $message['username_spaces'] = "Your password should not contain spaces";
@@ -384 +362 @@
     
     /** description check **/
-    if (strlen($this->params['data']['User']['description']) < 5)
+    if (strlen($this->data['User']['description']) < 5)
     {
        $message['description_too_short'] = "C'mon pal, talk us about you!";
@@ -390 +368 @@
     
     /** email check **/
-    if ($this->Adds->validEmail($this->params['data']['User']['email']) === false)
+    if ($this->Adds->validEmail($this->data['User']['email']) === false)
     {
        $message['pwd_username'] = "The email is invalid";
@@ -396 +374 @@
     
     /** Check the user **/
-    $username        = $this->User->field('username', array("username" => $this->params['data']['User']['username']));
+    $username        = $this->User->field('username', array("username" => $this->data['User']['username']));
     
     if ($username != null)
@@ -404 +382 @@
     
     /** Check the email **/
-    $email        = $this->User->field('email', array("email" => $this->params['data']['User']['email']));
+    $email        = $this->User->field('email', array("email" => $this->data['User']['email']));
     
     if ($email != null)
@@ -411 +389 @@
     }
     
-    if ( $this->params['data']['User']['group_id'] == 5 && $this->params['data']['User']['code'] != $code)
+    if ( $this->data['User']['group_id'] == 5 && $this->data['User']['code'] != $code)
     {
         $message['wrong_code'] = "The teacher's code is incorrect";
@@ -424 +402 @@
     $this->Sanitize = new Sanitize;
     
-    $this->Sanitize->cleanArray($this->params['data']); //Hopefully this is enough
-    
-    $this->params['data']['User']['passwd'] = md5($this->params['data']['User']['passwd']); // MD5
-    $this->params['data']['User']['active'] = 0;
-    
-      if ($this->User->save($this->params['data']))
+    $this->Sanitize->cleanArray($this->data); //Hopefully this is enough
+    
+    $this->data['User']['passwd'] = md5($this->data['User']['passwd']); // MD5
+    $this->data['User']['active'] = 0;
+    
+      if ($this->User->save($this->data))
       {
         
         $this->Confirm = new Confirm;                                                    //confirm model
-        $this->params['data']['Confirm']['user_id']  = $this->User->getLastInsertID();   //the user id
-        $this->params['data']['Confirm']['secret']   = $this->Adds->genPassword(14);     
-        
-        if ($this->Confirm->save($this->params['data']))  // put the user in confirm model, this is, waiting confirmation
+        $this->data['Confirm']['user_id']  = $this->User->getLastInsertID();   //the user id
+        $this->data['Confirm']['secret']   = $this->Adds->genPassword(14);     
+        
+        if ($this->Confirm->save($this->data))  // put the user in confirm model, this is, waiting confirmation
         {
           //Send the confirmation email
-          if ( $this->sendMail($this->params['data']['User']['email'], $this->params['data']['Confirm']['secret']) ) 
+          if ( $this->sendMail($this->data['User']['email'], $this->data['Confirm']['secret']) ) 
           {       
               $this->set('message', array("Suceess"=>"<h2>You have been registered!</h2> <p>A confirmation email have 
-                  been sent to: ".$this->params['data']['User']['email']." </p>"));
+                  been sent to: ".$this->data['User']['email']." </p>"));
                $this->set('ok', true);
                $this->render('validate', 'ajax');
@@ -459 +437 @@
   }
   
+  /** === ADMIN SECTION ==***/
   
   /*** DELETE  **/ 
@@ -478 +457 @@
   }
  /****   AVATAR   ***/
- public function avatar() {
-    
-    //die(print_r($this->params));
-    
+ public function avatar() 
+ {
     $this->layout    = 'admin';
     
-    if (!empty($this->params['data']) && is_uploaded_file($this->params['data']['User']['file']['tmp_name']))
-    {
-    
-    // echo "tmp_name : ". $this->params['data']['User']['file']['tmp_name'] . "<br />"; // usefull print
+    if (!empty($this->data) && is_uploaded_file($this->data['User']['file']['tmp_name']))
+    {
+    
+    // echo "tmp_name : ". $this->data['User']['file']['tmp_name'] . "<br />"; // usefull print
     
     $this->Sanitize = new Sanitize;
     
-    $this->Sanitize->cleanArray($this->params['data']); //Hopefully this is enough
+    $this->Sanitize->cleanArray($this->data); //Hopefully this is enough
     
     /** SUBMITTED INFORMATION - use what you need
@@ -505 +482 @@
     $maxfilesize  = 2097152; /** 2MB max size */
     
-    $imgfile_name = $this->params['data']['User']['file']['name'];
-    
-    $imgfile_size = $this->params['data']['User']['file']['size'];
-    
-    $imgfile      = $this->params['data']['User']['file']['tmp_name'];
+    $imgfile_name = $this->data['User']['file']['name'];
+    
+    $imgfile_size = $this->data['User']['file']['size'];
+    
+    $imgfile      = $this->data['User']['file']['tmp_name'];
       
-    $type         = $this->params['data']['User']['file']['type'];
+    $type         = $this->data['User']['file']['type'];
     
     /** Security: checks to see if file is an image, if not do not allow upload ==*/
@@ -560 +537 @@
    /** Database stuff  **/
    
-   $this->params['data']['User']['avatar'] = $final_filename;
-   
-   if ($this->User->save($this->params['data']))
-     {
+   $this->data['User']['avatar'] = $final_filename;
+   
+   if ($this->User->save($this->data))
+    {
            $this->redirect('/users/edit/'. $this->othAuth->user('id'));
-     }
-     
-     /** delete the temporary uploaded file **/
+    }
+    
+    /** delete the temporary uploaded file **/
    unlink($imgfile);
    
@@ -573 +550 @@
 }
 
-private function get_extension($imagetype) {
+private function get_extension($imagetype) 
+{
      
      if ( empty($imagetype) )