Changeset 43

Timestamp:

07/17/07 12:42:52 (18 months ago)

Author:

aarkerio

Message:

helps

Location:

trunk/app

Files:

• controllers/components/search.php (modified) (3 diffs)
• controllers/entries_controller.php (modified) (3 diffs)
• controllers/helps_controller.php (modified) (5 diffs)
• controllers/users_controller.php (modified) (1 diff)
• views/helps/admin_add.thtml (added)
• views/helps/admin_display.thtml (added)
• views/helps/admin_edit.thtml (added)
• views/helps/admin_listing.thtml (added)
• views/layouts/portal.thtml (modified) (1 diff)
• views/users/entry.thtml (added)
• webroot/img/themes/theme-history.png (modified) (previous)

trunk/app/controllers/components/search.php

@@ -28 +28 @@
                 switch ($matchType) 
                 {
-                case ANYWHERE:
+                case 'ANYWHERE':
                     $conditions .= "$searchField LIKE '%$keywords[$k]%'";   
                     break;
-                case EXACT:
+                case 'EXACT':
                     $conditions .= "$searchField = '$keywords[$k]'";   
                     break;
-                case ENDS_WITH:
+                case 'ENDS_WITH':
                     $conditions .= "$searchFields LIKE '%$keywords[$k]'";   
                     break;
-                case STARTS_WITH:
+                case 'STARTS_WITH':
                     $conditions .= "$searchField LIKE '$keywords[$k]%'";   
                     break;
@@ -54 +54 @@
                 switch ($multipleKeywords) 
                 {
-                case ANY:
+                case 'ANY':
                     $conditions .= ") OR (";
                     break;
-                case ALL:
+                case 'ALL':
                     $conditions .= ") AND ("; 
                     break;
@@ -73 +73 @@
 }
 ?>
-

trunk/app/controllers/entries_controller.php

@@ -14 +14 @@
    public $helpers       = array('Ajax', 'Form', 'Fck');
    
-   public $components    = array('Edublog', 'Portal');
+   public $components    = array('Edublog', 'Portal', 'Search');
    
    public function results($string) 
@@ -25 +25 @@
    }
    
-   public function rss($user_id) 
+   public function rss($user_id)
    {
        $this->layout    = 'rss';
@@ -49 +49 @@
         $searchFields = array('Entry.title', 'Entry.body', 'News.body', 'Page.body');
         
-        $this->set('data', $this->Search->query($this->Product, $keywords, $searchFields, ALL, ANYWHERE));
+        $this->set('data', $this->Search->query($this->Entry, $keywords, $searchFields, 'ALL', 'ANYWHERE'));
     }
    

trunk/app/controllers/helps_controller.php

@@ -1 +1 @@
 <?php
 /**
-*  Karamelo eLearning Platform
+*  Chipotle Software
 *  Manuel Montoya 2002-2007 
-*  GPL manuel<at>mononeurona.org
+*  GPL manuel<at>mononeurona<dot>org
 */ 
  
@@ -10 +10 @@
 class HelpsController extends AppController
 {  
-   public $helpers       = array('Ajax', 'Form', 'Fck');
+   public $helpers       = array('Javascript', 'Ajax', 'Form', 'Fck');
    
-   public $components    = array('Edublog', 'Portal');
+   public $components    = array('Security');
    
-   public function listing()
+   public function tour() 
+   {
+        $this->layout    = 'tour';
+        $this->pageTitle = 'Karamelo';
+    }
+   
+   /**=== ADMIN METHODS === */
+   public function admin_display($path = null) 
+   {
+      $this->layout    = 'popup';
+      
+      $url = str_replace('-', '/', $path);
+      
+      echo $url;
+      
+      $conditions   = array("url"=>$url);
+      
+      $fields       = array("id", "url", "help");
+      
+      $this->pageTitle = 'Centauro Help';
+      
+      $this->set('data', $this->Help->find($conditions, $fields));
+   }
+   
+    public function admin_listing()
    {
       $this->layout = 'admin';
@@ -27 +51 @@
    }
    
-    public function tour() {
-        $this->layout = 'tour';
-    }
-      
-   public function display($lang = null, $id = null) {
-      
-      $this->set('subjects', $this->Portal->cms()); // Using Portal component
-      
-      $this->set('randomQuote', $this->Portal->quote()); // quote footer
-      
-      $conditions   = array();
-      
-      if ($id != null)
-      {
-        $conditions["id"] = $id;
-      }
-      
-      if ($lang != null)
-      {
-        $conditions["lang"] = $id;
-      }
-      
-      $fields       = array("id", "url", "help");
-      
-      $this->pageTitle = 'Karamelo LMS';
-      
-      $this->set('data', $this->Help->findAll($conditions, $fields));
-   }
-   
-   public function add() {
+   public function admin_add() {
     
     // adds new classroom to database
@@ -65 +60 @@
         $this->Sanitize->cleanArray($this->params['data']); //Hopefully this is enough
         
-        if ($this->Help->save($this->params['data']))
-         {
-           //$this->set('data', $this->Help->index());
-           $this->flash('Your classroom has been saved.','/vclassrooms/listing');
-           //$this->render('todo', 'ajax');
-         }
-    } else {
-      $this->layout = 'admin';
-      
-      $this->Subject     = new Subject;
-      
-      $this->set('subjects', $this->Subject->generateList(null, 'title'));      
-      
-      $conditions = array("status"=>1);
-      
-      $order      = "order DESC";
-      
-      $O = $this->Help->field('order', $conditions, $order);
-      
-      $Order = $O + 1;
-      
-      $this->set('Order', $Order);
+          if ($this->Help->save($this->params['data']))
+      {
+             //$this->set('data', $this->Help->index());
+              $this->flash('Your classroom has been saved.','/vclassrooms/listing');
+       }
+    } 
+        else 
+        {
+        $this->layout = 'admin';
+        
+        $this->Subject     = new Subject;
+        
+        $this->set('subjects', $this->Subject->generateList(null, 'title'));        
+        
+        $conditions = array("status"=>1);
+        
+        $order      = "order DESC";
+        
+        $O = $this->Help->field('order', $conditions, $order);
+        
+        $Order = $O + 1;
+        
+        $this->set('Order', $Order);
     }
         
  }
  
-  public function edit($id = null)
+  public function admin_edit($id = null)
   {
      
@@ -115 +111 @@
 }
   
-  public function delete($id)
+  public function admin_delete($id)
   {
         // deletes task from database

trunk/app/controllers/users_controller.php

@@ -76 +76 @@
     }
     
-    public function about($user_id) 
-    {
-        
-        $this->pageTitle = 'About me';
+    public function entry($username = null, $Entry_id = null) 
+    {
+        if ($Entry_id == null)
+        {
+           $this->redirect('/blog/'.$username);
+           exit;
+        }
+        
+        $this->layout    = 'blog';
+        $this->pageTitle = $username . '\'s Blog';
+        //exit($username);
+        $this->Entry     = new Entry;
+        
+        $user_id = $this->User->field("id", array("username"=>$username));
+        
+        //exit($user_id);
+        
+        if ($username == null || $user_id == null)
+        {
+           $this->redirect("/");
+        }
+        
+        $order    = "Entry.id DESC";
+        
+        $fields   = array("Entry.title", "Entry.body", "Entry.created", "Entry.user_id", "Entry.discution", "Entry.themeblog_id", "Entry.id", "User.username", "Themeblog.title", "Themeblog.id");
+        
+        if ( $Entry_id != null && is_numeric( $Entry_id ) ) // show only one new
+        {
+           $limit      = 1;
+           
+           $conditions = array("Entry.user_id"=>$user_id, "Entry.id"=>$Entry_id);
+        }
+        
+        $this->set('data', $this->Entry->find($conditions, $fields)); 
+        
+        $this->set('Element', $this->Blog->bloggerStuff($user_id)); // Charge Blog components aka Sidebars
+        
+        $this->set('Entry_id', $Entry_id);
+        
+        $this->set('style', $this->Blog->getStyle($user_id));
+    }
+    
+    public function about($username) 
+    {
+        $this->pageTitle = 'About ' . $username;
+        
+        $user_id = $this->User->field("id", array("username"=>$username));
         
         $this->layout    = $this->Edublog->layout($user_id);

trunk/app/views/layouts/portal.thtml

@@ -38 +38 @@
 }
 ?>
-    <a href="/" title="Home">Home</a> | 
-    <a href="/helps/themes/" title="Faq">Help</a> | 
+    <a href="/" title="Home">Home</a> |
     <a href="/pages/sitemap/" title="Site">SiteMap</a> |
     <a href="/messages/contact" title="Site">Contact</a> |