Changeset 278

Timestamp:

02/23/08 18:14:56 (11 months ago)

Author:

aarkerio

Message:

Upgrade to 1.2

Location:

trunk/app

Files:

• app_controller.php (modified) (1 diff)
• controllers/newsletters_controller.php (modified) (3 diffs)
• views/elements/menu_b.ctp (modified) (1 diff)
• views/newsletters/display.ctp (modified) (1 diff)
• views/newsletters/subscribe.ctp (modified) (3 diffs)
• views/podcasts/all.ctp (deleted)

trunk/app/app_controller.php

@@ -20 +20 @@
      $this->Auth->loginError = 'Invalid e-mail / password combination. Please try again';
      $this->Auth->authorize = 'controller';  
-     $this->Auth->allow( array('display', 'view', 'register', 'recover', 'sendmail') );
+     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover') );
 
      $this->set('cU', $this->Auth->user());  // $cU current user array to use in the views if user logged

trunk/app/controllers/newsletters_controller.php

@@ -17 +17 @@
   public function beforeFiler()
   {
-    $this->Auth->allow('subscribe');
+    $this->Auth->allow(array('subscribe'));
     parent::beforeFilter();   
   }
-  
+ 
   public function isAuthorized()
   {
@@ -32 +32 @@
    return true;
   }
-                                                           
+                                                           
   public function subscribe()
   {
          $this->layout = 'portal';
-         $this->set('Element', $this->Portal->statics()); // Charge Portal components aka Sidebars
+         $this->Portal->statics(); // Charge Portal components aka Sidebars
   }
 
@@ -50 +50 @@
      $this->set('data', $this->Newsletter->findAll($conditions, $fields, $order, $limit));
      
-     $this->set('Element', $this->Portal->statics()); // Using Portal component
+     $this->Portal->statics(); // Using Portal component
   }
       

trunk/app/views/elements/menu_b.ctp

@@ -4 +4 @@
 <ul>
   <li><?php echo $html->link('Edublogs', '/users/bloggers/', array('title'=>'eduBlogs')); ?> </li>
-  <li><?php echo $html->link('Podcasts', '/podcasts/all', array('title'=>'Download and hear')); ?> </li>
+  <li><?php echo $html->link('Podcasts', '/podcasts/display', array('title'=>'Download and hear')); ?> </li>
   <li><?php echo $html->link('Directory', '/users/directory/', array('title'=>'Staff')); ?> </li>
-  <li><?php echo $html->link('Newsletter', '/newsletters/subscribe/', array('title'=>'Keep in touch')); ?> </li>
+  <li><?php echo $html->link('Newsletter', '/newsletters/display/', array('title'=>'Keep in touch')); ?> </li>
   <li><?php echo $html->link('Library', '/medias/display/', array('title'=>'Resources')); ?> </li>
 

trunk/app/views/newsletters/display.ctp

@@ -16 +16 @@
    echo "</div>";
  }
+
+ if ( isset( $cU['User']['id'] ))
+ {
+   echo $html->para(null, $html->link('Subscribe to newsletter', '/newsletter/subscribe'));
+ } 
 ?>

trunk/app/views/newsletters/subscribe.ctp

@@ -7 +7 @@
 <?php 
 
-if ( !$othAuth->sessionValid() )
+if ( !isset( $cU['User']['id'] ) )
 {
-   echo '<p>'. $html->link('You must be logged to subscribe to newsletter', '/users/login') . '</p>';
+   echo $html->para(null, $html->link('You must be logged to subscribe to newsletter', '/users/login'));
 }
 
@@ -18 +18 @@
 <fieldset>
   <legend>Subscribe:</legend>
-     <?php echo $form->labelTag('Subscribers/email', 'Email:'); ?><br />
-     <?php 
+   <?php echo $ajax->form();
+    
      $options =  array("size"=>25, "maxlength"=>50);
 
-     if ( !$othAuth->sessionValid() )
+     if ( !isset( $cU['User']['id'] ) )
      {
         $options["readonly"]="readonly";  //if user no logged, no subscription available
      }
      
-     echo $html->input('Subscribers/email', $options); ?>
+     echo $form->input('Subscribers.email', $options); ?>
      <br /><br />
      <?php 
@@ -44 +44 @@
 <?php
    echo $ajax->divEnd('updater');
-   echo $html->link('View pass newsletters', '/newsletters/all');
+   echo $html->link('View pass newsletters', '/newsletters/display');
 ?>
 <script type="text/javascript">