Changeset 241

Timestamp:

02/19/08 17:24:43 (8 months ago)

Author:

aarkerio

Message:

News update

Location:

trunk/app

Files:

• controllers/users_controller.php (modified) (6 diffs)
• views/elements/login.ctp (modified) (1 diff)
• views/elements/search.ctp (modified) (1 diff)
• views/layouts/portal.ctp (modified) (2 diffs)
• views/news/display.ctp (modified) (1 diff)
• webroot/css/portal/portal.css (modified) (1 diff)

trunk/app/controllers/users_controller.php

@@ -8 +8 @@
 
 uses('sanitize');
-loadModel('Entry');
-loadModel('Podcast');
-loadModel('Catfaq');
-loadModel('Recover');
 
 class UsersController extends AppController
 {
-    public $helpers          = array('Ajax', 'Form', 'User', 'Fck', 'Gags');
-    
-    public $components       = array('Security', 'Edublog', 'Portal', 'Email', 'Adds', 'Mypagination');
-    
-    public function index($id = null)
-    {   
-        $this->pageTitle = 'View Active Users';
-        $this->set('data', $this->User->findAll()); 
-        $this->set('color', 'blue');
-    }
-    
-    public function blog($username = null, $page=1) 
-    {
-        $this->layout    = 'blog';
-        
-        $this->pageTitle = $username . '\'s Blog';
-        
-        $this->Entry     = new Entry;
-        
-        $user_id = $this->User->field("id", array("username"=>$username));
-        
-        if ($username == null || $user_id == null)
-        {
+  public $helpers          = array('Ajax', 'Fck', 'Gags');
+    
+  //public $components       = array('Security', 'Edublog', 'Portal', 'Email', 'Adds');
+
+  public function isAuthorized() 
+  {
+           if (isset($this->params[Configure::read('Routing.admin')])) 
+           {
+                  if ($this->Auth->user('role') == 'admin') 
+                  {
+                      return false;
+                  }
+           }
+       return true;
+  }
+
+  public function blog($username = null, $page=1) 
+  {
+     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.subject_id", "Entry.id", "User.username", "Subject.title", "Subject.id");
-        
-        //pagination
-        $total_rows = $this->Entry->findCount(array("Entry.user_id"=>$user_id, "Entry.status"=>1)); 
-        
-        $lmt        = 10; // limit news
-        
-        $targetpage = "/blog/".$username."/";
-        
-        $pagination = $this->Mypagination->init($total_rows, $page, $lmt, $targetpage); //Pagination
-        
-        $this->set('pagination', $pagination);
-        
-        $offset     = (($page * $lmt) - 10);
-        
-        $limit      = $lmt . " OFFSET " . $offset;
-        
-        $conditions = array("Entry.user_id"=>$user_id, "Entry.status"=>1);
-        
-        $this->set('data', $this->Entry->findAll($conditions, $fields, $order, $limit)); 
-        
-        $this->layout    = $this->Edublog->layout($user_id);
-        
-        $this->Edublog->blog($user_id);
+     }
+     
+     $this->layout    = 'blog';
+        
+     $this->pageTitle = $username . '\'s Blog';
+        
+     $this->Entry     = new Entry;
+        
+     $user_id = $this->User->field("id", array("username"=>$username));
+        
+     $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");
+ 
+        
+     $conditions = array("Entry.user_id"=>$user_id, "Entry.status"=>1);
+        
+     $this->set('data', $this->Entry->findAll($conditions, $fields, $order, $limit)); 
+        
+     $this->layout    = $this->Edublog->layout($user_id);
+        
+     //$this->Edublog->blog($user_id);
     }
     
@@ -271 +258 @@
         $limit      = null;        
         $this->set('users', $this->User->findAll($conditions, $fields, $order, $limit, null, 2));
-    }
-    
-    public function karanet()
-    {
+  }
+    
+  public function karanet()
+  {
         $this->pageTitle = 'Directory :: Karamelo E-learning on Web 2.0';
         
@@ -280 +267 @@
         
         $this->layout    = 'portal';
-    }
-    
-    public function recover()
-    {
+ }
+    
+ public function recover()
+ {
         $this->pageTitle = 'Recover password :: Karamelo E-learning on Web 2.0';
         
@@ -289 +276 @@
         
         $this->layout    = 'portal';
-    }
-    
-    public function bloggers($order = 'username', $desc = 'DESC')
-    {   
+ }
+    
+ public function bloggers($order = 'username', $desc = 'DESC')
+ {   
         $this->layout    = 'portal';
         
@@ -303 +290 @@
         
         $this->set('Element', $this->Portal->statics()); // Using Portal component
-    }
-    public function login()
-    { 
-       $this->layout    = 'portal';
+ }
+      
+ public function login()
+ {
+    $this->layout    = 'portal';
        
-       $this->pageTitle = 'Login :: Karamelo E-learning';
+    $this->pageTitle = 'Login :: Karamelo E-learning';
        
-       $this->set('Element', $this->Portal->statics()); // Using Portal component
-       
-       if (isset($this->data))
-       {  
-          $auth_num = $this->othAuth->login($this->data['User']);
-          
-          $this->set('auth_msg', $this->othAuth->getMsg($auth_num));
-       }
-       $this->set('auth_msg', 'Welcome!');
-    }
-    
-    public function logout()
-    {  
-       $this->othAuth->logout();
-       
-       $this->redirect('/news/view');
-    }
-    
-   public function noaccess()
-   {
-      $this->flash("You don't have permissions to access this page.",'/users/login');
-   }
-   
-   public function register()
-   {
+    //$this->set('Element', $this->Portal->statics()); // Using Portal component
+    
+    if ($this->Auth->user()) 
+    {
+            if (!empty($this->data)) 
+            {
+                if (empty($this->data['User']['remember_me'])) 
+                {
+                    $this->Cookie->del('User');
+                }
+                else 
+                {
+                    $cookie = array();
+                    $cookie['email'] = $this->data['User']['email'];
+                    $cookie['token'] = $this->data['User']['pasword'];
+                    $this->Cookie->write('User', $cookie, true, '+2 weeks');
+                }
+                unset($this->data['User']['remember_me']);
+            }
+
+            $this->redirect($this->Auth->redirect());
+    }
+ }
+
+ public function logout() 
+ {
+     $this->Session->setFlash("You've successfully logged out.");
+     $this->redirect($this->Auth->logout());
+ }
+
+ public function register()
+ {
     $this->layout    = 'portal';
     
@@ -342 +337 @@
     $this->set('Element', $this->Portal->statics()); // Using Portal component
     
-   }
+ }
    
  public function insert() 

trunk/app/views/elements/login.ctp

@@ -1 +1 @@
 <div id="login"> 
-
-<?php echo  $html->formTag('/users/login','post', array("onsubmit"=>"return validateLogin()")); ?>
+<?php echo  $form->create('User', array("action"=>"login", "onsubmit"=>"return validateLogin()")); ?>
 <fieldset>
 <legend> Login</legend>
   <?php 
-   echo  $form->labelTag( 'User/username', 'Username:' ) . "<br />";  
-   echo  $html->input('User/username', array('id' => 'user_username', 'size' => '15', 'maxlength'=>'30')). '<br />';
-   echo  $html->tagErrorMsg('User/username', 'Please enter your username') .'<br />'; 
-   echo  $form->labelTag( 'User/passwd', 'Password:' ) .'<br />';
-   echo  $html->input('User/passwd', array('id' => 'user_passwd', 'size' => '9', 'type'=>'password'));
-   echo  $html->tagErrorMsg('User/passwd', 'Please enter your password!') 
+   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  $html->checkbox("User/cookie");?><br />
+  Remember me: <?php echo  $form->checkbox("User.remember_me");?><br />
  
- <?php echo $html->submit('Login'); ?>
+ <?php echo $form->end('Login'); ?>
 </fieldset>
-</form>
 
  <p><?php echo $html->link('Join us!', '/users/register'); ?></p>

trunk/app/views/elements/search.ctp

@@ -24 +24 @@
 </script>
 <?php 
-    echo $html->formTag('/entries/search/', 'post', array("onsubmit"=>"return chkSearch();"));
-    echo $html->input('Entry/terms', array("size" => 12, "value" => "Search...", "maxlength" => 40, 
+    echo $form->create('Entry', array("action"=>"return chkSearch();"));
+    echo $form->input('Entry/terms', array("size" => 12, "value" => "Search...", "maxlength" => 40, 
          "onblur" => "if(this.value=='') this.value='Search...';", 
          "onfocus"=>"if(this.value=='Search...') this.value='';"));
-   echo $html->input('Send/button', array("src"=>"/img/search_go.gif", "type"=>"image", "value"=>"Search", "alt"=>"Search", "title"=>"Search"));
+   echo $form->end('Search');
  ?>
-</form>

trunk/app/views/layouts/portal.ctp

@@ -1 @@
-<?php echo '<?xml version="1.0"?>'; ?>
-<?php echo $html->docType(); ?>
+<?php 
+   echo '<?xml version="1.0"?>'; 
+   echo $html->docType(); 
+?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -9 +11 @@
 <?php
  if ( isset($javascript) ):
-    echo $html->charsetTag('UTF-8');
+    echo $html->charset('UTF-8');
     echo $javascript->link('prototype');
     echo $javascript->link('myfunctions');

trunk/app/views/news/display.ctp

@@ -4 +4 @@
 //die(var_dump($data));
 
-foreach ($data as $key => $val)
+foreach ($data as $val)
 {
   echo "<div class=\"wrapnew\">";
-  echo "<div class=\"news_title\">". $val['News']['title']   . "</div>";
+  echo "<div class=\"news_title\">". $html->link($val['News']['title'], '/news/view/'. $val['News']['id'])   . "</div>";
   echo "<div class=\"news_date\">" . $val['News']['created'] . "</div>";
   echo "<div class=\"news_body\">";
   
-  echo "Subject: ". $html->link($val['Subject']['title'], '/news/all/'.$val['Subject']['id'], null, false, false) . "<br /><br />";
+  echo "Theme: ". $html->link($val['Theme']['theme'], '/news/theme/'.$val['Theme']['id'], null, false, false) . "<br /><br />";
   
   echo  $val['News']['body']    . "</div>";

trunk/app/webroot/css/portal/portal.css

@@ -333 +333 @@
  } 
 
+.news_title{margin-top:15px;}
+
+.news_title a {font-size:14pt;font-weight:bold;color:orange;text-decoration:none;}
+
 .news_theme { 
          color:gray;