Changeset 346

Timestamp:

03/25/08 12:38:24 (10 months ago)

Author:

aarkerio

Message:

Newsletter fixed

Location:

trunk/app

Files:

• controllers/images_controller.php (modified) (2 diffs)
• controllers/newsletters_controller.php (modified) (3 diffs)
• controllers/vclassrooms_controller.php (modified) (3 diffs)
• models/vclassroom.php (modified) (1 diff)
• views/catforums/admin_add.ctp (deleted)
• views/catforums/index.ctp (deleted)
• views/entries/edit.ctp (deleted)
• views/entries/index.ctp (deleted)
• views/events/admin_edit.ctp (modified) (2 diffs)
• views/images/admin_listview.ctp (modified) (1 diff)
• views/newsletters/admin_add.ctp (modified) (1 diff)
• views/newsletters/admin_edit.ctp (added)
• views/tests/chk.ctp (modified) (1 diff)
• views/vclassrooms/index.ctp (deleted)
• views/vclassrooms/join.ctp (deleted)
• views/vclassrooms/show.ctp (modified) (2 diffs)

trunk/app/controllers/images_controller.php

@@ -183 +183 @@
 }
 
-  /*** DELETE  **/ 
-  public function admin_delete()
-  {
+ /*** DELETE  **/ 
+ public function admin_delete()
+ {
     $file = $this->Image->field("Image.file", array("Image.id"=>$this->data['Image']['id']));
     
@@ -194 +194 @@
     unlink("../webroot/img/imgusers/thumbs/" . $file);
     $this->redirect($this->data['Image']['return']);
-  }
+ }
   
-  protected function createThumb($file) 
-  {     
+ protected function createThumb($file) 
+ {     
      $imgfile        = "../webroot/img/imgusers/"           .  $file;            // system path
      

trunk/app/controllers/newsletters_controller.php

@@ -108 +108 @@
   }
 
-  private function sendNewsletter($newsletter_id)
+  private function _sendNewsletter($newsletter_id)
   {
      $conditions   = array("Newsletter.status" => 1, "Newsletter.id" => $newsletter_id);
@@ -153 +153 @@
  
     if (!empty($this->data['Newsletter']))
-    {
+    { 
        $this->Sanitize = new Sanitize;
                
-       $this->Sanitize->paranoid($this->data["Newsletter"]["title"]);
-
-       $this->Sanitize->html($this->data["Newsletter"]["body"]);
-               
-       $this->data["Newsletter"]['user_id'] = $this->Auth->user('id');
-    
-       $this->Newsletter->create();
+       $this->Sanitize->paranoid($this->data['Newsletter']['title']);
+
+       $this->Sanitize->html($this->data['Newsletter']['body']);
    
       if ($this->Newsletter->save($this->data['Newsletter']))
-          { 
-               $this->msgFlash('Newsletter saved', '/admin/newsletter/listing');
+          {
+           if ( $this->data['Newsletter']['end'] == 1  ) 
+           {
+                   $this->msgFlash('Newsletter saved', '/admin/newsletters/listing');
+               }
+               else
+               {
+                   $this->msgFlash('Newsletter saved', '/admin/newsletters/edit/'.$this->data['Newsletter']['id']); 
+           }
           } 
           else 
@@ -172 +175 @@
             $this->flash('Database error!', '/news/listing');
           }
+    }
+    else
+    {
+       $this->data     = $this->Newsletter->read(null, $newsletter_id);
     }
   }

trunk/app/controllers/vclassrooms_controller.php

@@ -3 +3 @@
 *  Karamelo eLearning Platform
 *  Manuel Montoya 2002-2008
-*  GPLv3 manuel<at>mononeurona<punto>org
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
  
@@ -13 +13 @@
  
  public $components    = array('Edublog');
- 
+
+ public function beforeFilter()
+ {
+      $this->Auth->allow(array('show', 'jointoclass'));
+      parent::beforeFilter();
+ }
  public function isAuthorized()
  {
@@ -70 +75 @@
  }
  
- //Check if the user already exist in the classroom
- protected function chkMember($vclassroom_id)
- { 
-   $already_member = false;
-
-   $conditions = array('"Vclassroom"."id"'=>$vclassroom_id);
-  
-   $data = $this->Vclassroom->find($conditions);
-   
-   foreach ($data['User'] as $user)
-   {
-      if ($user['id'] == $this->Auth->user('id'))    
-      {
-       $already_member = true;  // yes, is already member
-      }   
-   }
- 
-   return $already_member; 
- }
-
- 
-/***
-   == ADMIN METHODS
-***/   
+ /***   == ADMIN METHODS === ***/   
 
  public function admin_listing()

trunk/app/models/vclassroom.php

@@ -63 +63 @@
                          )
                     );
+ //Check if the user already exist in the classroom
+ protected function chkMember($vclassroom_id)
+ { 
+   $already_member = false;
+
+   $conditions = array('"Vclassroom"."id"'=>$vclassroom_id);
+  
+   $data = $this->find($conditions);
+   
+   foreach ($data['User'] as $user)
+   {
+      if ($user['id'] == $this->Auth->user('id'))    
+      {
+       $already_member = true;  // yes, is already member
+      }   
+   }
+   return $already_member; 
+ }
 
   public $validate = array(

trunk/app/views/events/admin_edit.ctp

@@ -16 +16 @@
 <table style="margin:0 auto 0 auto;">
 <tr><td>
-<?php echo $html->formTag('/admin/entries/edit/','post'); ?>
-<?php echo $html->hiddenTag('Entry/user_id', $othAuth->user('id')) ?>
-<?php echo $html->hiddenTag('Entry/id') ?>
+<?php echo $html->formTag('Event'); ?>
+<?php echo $html->hiddenTag('Event.id') ?>
 
-  <?php echo $form->labelTag( 'Entry/title', 'Title' );?><br /> 
-  <?php echo $html->input('Entry/title', array("size" => 40, "maxlength" => 50, "class"=>"formas")); ?>
-  <?php echo $html->tagErrorMsg('Entry/title', 'Title is required.'); ?>
+  <?php echo $form->labelTag( 'Event.title', 'Title' );?><br /> 
+  <?php echo $html->input('Event.title', array("size" => 40, "maxlength" => 50, "class"=>"formas")); ?>
+  <?php echo $html->tagErrorMsg('Event.title', 'Title is required.'); ?>
   </td>
   <td>
-       <?php echo $form->labelTag('Entry/subject_id', 'Subject:' );?>
-       <?php echo $html->selectTag('Entry/subject_id', $subjects); ?>
+       <?php echo $form->labelTag('Event.subject_id', 'Subject:' );?>
+       <?php echo $html->selectTag('Event.subject_id', $subjects); ?>
   </td>
    <td>
@@ -34 +33 @@
   <tr>
   <td colspan="3">
-      <?php echo $form->labelTag( 'Entry/Body', 'Body:' );?><br />
-      <?php echo $html->textarea('Entry/body', array("class"=>"formas", "cols"=>80, "rows"=>45)) ?>
-      <?php echo $fck->load('Entry/body', 'Karamelo'); ?> 
-      <?php echo $html->tagErrorMsg('Entry/body', 'Body is required.'); ?>
+      <?php echo $form->labelTag( 'Event.Body', 'Body:' );?><br />
+      <?php echo $html->textarea('Event.body', array("class"=>"formas", "cols"=>80, "rows"=>45)) ?>
+      <?php echo $fck->load('Event.body', 'Karamelo'); ?> 
+      <?php echo $html->tagErrorMsg('Event.body', 'Body is required.'); ?>
   </td></tr>
   <tr>
   <td>
-      <?php echo $form->labelTag( 'Entry/status', 'Published:' );?><br />
-      <?php echo $html->checkbox('Entry/status', null, array("value" => 1)); ?>
+      <?php echo $form->labelTag( 'Event.status', 'Published:' );?><br />
+      <?php echo $html->checkbox('Event.status', null, array("value" => 1)); ?>
   </td>
   <td>
-      <?php echo $form->labelTag( 'Entry/discution', 'Comments allowed:' );?><br />
-      <?php echo $html->checkbox('Entry/discution', null, array("value" => 1)); ?>
+      <?php echo $form->labelTag( 'Event.discution', 'Comments allowed:' );?><br />
+      <?php echo $html->checkbox('Event.discution', null, array("value" => 1)); ?>
   </td>
   <td>
-       <?php echo $form->labelTag( 'Entry/end', 'Finish edition:' );?><br />
-       <?php echo $html->checkbox('Entry/end', null, array("value" => 1)); ?>
+       <?php echo $form->labelTag( 'Event.end', 'Finish edition:' );?><br />
+       <?php echo $html->checkbox('Event.end', null, array("value" => 1)); ?>
    </td>
   </tr>
   <tr>
   <td colspan="3">
-       <?php echo $html->submit('Save') ?>
-       </form>
+       <?php echo $form->end('Save'); ?>
   </td>
   </tr>

trunk/app/views/images/admin_listview.ctp

@@ -42 +42 @@
  <br />
    <?php 
-   if ( $othAuth->user('id') == $val['Image']['user_id'] )
+   if ( $cU['User']['id'] == $val['Image']['user_id'] )
    {
-        echo  $html->formTag('/admin/images/delete/'.$val['Image']['id'], 'post');
-        echo $html->hiddenTag('Image/return', '/admin/images/listing');
-        echo  $html->submit('Delete');
-        echo "</form>";
+        echo $form->create('Image', array('action'=>'admin_delete'));
+        echo $form->hidden('Image.return', array('value'=>'/admin/images/listing'));
+        echo $form->hidden('Image.id', array('value'=>$val['Image']['id']));
+    echo $form->end('Delete');
    }
    ?>

trunk/app/views/newsletters/admin_add.ctp

@@ -1 @@
-<?php echo $javascript->link('myfunctions'); ?>
-<?php echo $javascript->link('fckeditor/fckeditor'); ?> 
+<?php 
+    echo $javascript->link('myfunctions');
+    echo $javascript->link('fckeditor/fckeditor'); 
 
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->addCrumb('Entries', '/admin/newsletters/listing'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
-<?php echo $html->formTag('/admin/newsletters/add/','post'); ?>
+    echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
+    echo $html->addCrumb('Entries', '/admin/newsletters/listing'); 
+    echo $html->getCrumbs(' / '); 
+
+    echo $form->create('Newsletter'); 
+?>
 
 <fieldset>
-<legend>New n</legend>
+<legend>New newsletter</legend>
 
 <table style="margin:0 auto 0 auto;">
-<tr><td>
-  
-  <?php echo $form->labelTag('Newsletter/title', 'Title:' );?><br /> 
-  <?php echo $html->input('Newsletter/title', array("size" => 50, "maxlength" => 50)); ?>
-  <?php echo $html->tagErrorMsg('Newsletter/title', 'Title is required.'); ?>
+<tr>
+   <td>
+    <?php
+      echo $form->input('Newsletter.title', array("size" => 50, "maxlength" => 50));
+    ?>
   </td>
    <td>
-  <?php echo $html->link($html->image('admin/myimages.jpg', array("alt"=>"My Images", "title"=>"My Images")), '#', array("onclick"=>"javascript:window.open('/admin/images/listing/set', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false) ?></p>
+    <?php 
+        echo $html->link($html->image('admin/myimages.jpg', array("alt"=>"My Images", "title"=>"My Images")), 
+                         '#', 
+                         array("onclick"=>"javascript:window.open('/admin/images/listing/set', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false); ?></p>
   </td>
   </tr>
   <tr><td colspan="2">
-  <?php echo $form->labelTag( 'Newsletter/Body', 'Body:' );?><br />
-  <?php echo $html->textarea('Newsletter/body', array("class"=>"formas", "cols"=>60, "rows"=>17)); ?>
-  <?php echo $fck->load('Newsletter/body', 'Karamelo'); ?> 
-  <?php echo $html->tagErrorMsg('Newsletter/body', 'Body is required.'); ?>
+  <?php 
+    echo $form->label('Newsletter.Body', 'Text:');
+    echo $form->textarea('Newsletter.body', array("cols"=>60, "rows"=>17)); 
+    echo $fck->load('NewsletterBody', 'Karamelo'); 
+  ?>
   </td>
 </tr> 
 <tr>
   <td>
-       <?php echo $form->labelTag( 'Newsletter/status', 'Published:' );?>
-       <?php echo $html->checkbox('Newsletter/status', null, array("value"=>1)); ?>
+       <?php
+            echo $form->label('Newsletter.status', 'Published:');
+            echo $form->checkbox('Newsletter.status', null, array('value'=>1)); 
+        ?>
   </td>
    <td>
-       <?php echo $form->labelTag( 'Newsletter/end', 'Finish edition:' );?><br />
-       <?php echo $html->checkbox('Newsletter/end', null, array("value" => 1)); ?>
+       <?php 
+            echo $form->label('Newsletter.end', 'Finish edition:' );
+            echo $form->checkbox('Newsletter.end', array('value' => 1)); 
+       ?>
    </td>
   </tr>
-  <tr><td colspan="2">
-  <?php echo $html->submit('Save'); ?>
+  <tr><td colspan="2"></fieldset>
+  <?php echo $form->end('Save'); ?>
 </td></tr>
 </table>
-</fieldset>
-</form>

trunk/app/views/tests/chk.ctp

@@ -4 +4 @@
 //die(print_r($data));
 
-if ( $othAuth->sessionValid() )
+if ( isset( $cU['User']['id'] ) )
 {
  echo '<h1>'. $data['Test']['title'] . '</h1>';
  echo '<p>'.  $data['Test']['description'] . '</p>';
 
- echo $html->formTag('/tests/chk/','post', array("onsubmit"=>"return validateNew()")); 
- echo $html->hidden('Test/id', array("value"=>$data['Test']['id']));
+ echo $form->create('/tests/chk/','post', array("onsubmit"=>"return validateNew()")); 
+ echo $form->hidden('Test.id', array("value"=>$data['Test']['id']));
 
  foreach ($data['Question'] as $val)

trunk/app/views/vclassrooms/show.ctp

@@ -13 +13 @@
   echo   $data['Ecourse']['description'] . "</p>";
   
-  if ( $othAuth->user('group_id')  )  // a student is login in so, show "Join" button 
+  if ( isset( $cU['User']['id'] )  )  // a student is login in so, show "Join" button 
   {  
      echo $ajax->form();
@@ -23 +23 @@
      echo $html->input('Vclassroom/code', array("size" => 6, "maxlength"=>6));
      
-     echo $ajax->submit('Join to this class '. $othAuth->user('username'), array("url" => "/vclassrooms/jointoclass/", 
+     echo $ajax->submit('Join to this class '.$cU['User']['username'], array("url" => "/vclassrooms/jointoclass/", 
                                          "update"=>"updater",
                                          "loading" => "Element.show('charging');Element.hide('updater')",