Changeset 301

Timestamp:

03/03/08 21:41:31 (10 months ago)

Author:

aarkerio

Message:

Update monday 3 march

Location:

trunk/app

Files:

• config/sql/karamelo_postgres.sql (modified) (1 diff)
• controllers/ecourses_controller.php (modified) (6 diffs)
• controllers/entries_controller.php (modified) (1 diff)
• controllers/news_controller.php (modified) (5 diffs)
• controllers/vclassrooms_controller.php (modified) (9 diffs)
• views/ecourses/admin_add.ctp (modified) (2 diffs)
• views/ecourses/admin_listing.ctp (modified) (1 diff)
• views/ecourses/admin_vclassrooms.ctp (modified) (1 diff)
• views/entries/admin_add.ctp (modified) (1 diff)
• views/entries/admin_edit.ctp (modified) (3 diffs)
• views/entries/admin_listing.ctp (modified) (1 diff)
• views/helpers/gags.php (modified) (2 diffs)
• views/news/admin_add.ctp (modified) (2 diffs)
• views/news/admin_edit.ctp (modified) (2 diffs)
• views/news/admin_listing.ctp (modified) (1 diff)
• views/vclassrooms/admin_add.ctp (modified) (2 diffs)
• webroot/js/fckeditor/fckconfig.js (modified) (2 diffs)

trunk/app/config/sql/karamelo_postgres.sql

@@ -313 +313 @@
   "code" varchar(15),  -- secret code to allow students join to the ecourse,  voM121x for instance
   "created" timestamp(0) with time zone DEFAULT now() NOT NULL,
+  "status" smallint DEFAULT 0 NOT NULL,
   "lang_id" int NOT NULL REFERENCES langs(id)
 );

trunk/app/controllers/ecourses_controller.php

@@ -10 +10 @@
 class EcoursesController extends AppController
 {
-  public $helpers      = array('Fck', 'Gags');
+ public $helpers      = array('Fck', 'Gags', 'Paginator');
   
-  public $components   = array('Pagination');
+ public function isAuthorized() 
+ {      
+    if (isset( $this->params[Configure::read('Routing.admin')] )) 
+    {
+        if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 )  // admin and teachers
+        {
+        return true;
+        } 
+    } 
+    return false;  // go away !!
+ }
 
-  public function isAuthorized() 
-  {
-    if ($this->action == 'delete') 
-      {
-    if ($this->Auth->user('group_id') == 1) 
-          {
-        return true;
-          } else {
-        return false;
-          }
-      }
- 
-    return true;
-  }
-
-   /****
+ /****
      ===== ADMIN SECTION ==========
-   ****/
-  public function admin_start()
+ ****/
+ public function admin_start()
   {
        $this->layout = 'admin';
        
             
-       $conditions   =  array("user_id"=>$this->othAuth->user('id'));
+       $conditions   =  array("user_id"=>$this->Auth->user('id'));
        $fields       =  array('id', 'title', 'access',  'status', 'code', 'description');
        $order        =  "Ecourse.title DESC";
@@ -47 +42 @@
         $this->layout = 'admin';
         
-        //pagination
-        //$total_rows = $this->Ecourse->findCount(array("user_id"=>$this->othAuth->user('id'))); 
-        
-        $lmt        = 25; // limit news
-        
-        $targetpage = "/admin/news/listing/";
-        
-    // $pagination = $this->Mypagination->init($total_rows, $page, $lmt, $targetpage); //Pagination
-        
-    // $this->set('pagination', $pagination);
-
-        
-        $conditions   =  array("user_id"=>$this->othAuth->user('id'));
-        $fields       =  array('id', 'title', 'access',  'status', 'code', 'description');
+        $conditions   =  array("user_id"=>$this->Auth->user('id'));
+        $fields       =  array('id', 'title', 'status', 'code', 'description');
         $order        =  "Ecourse.id DESC";
-        $offset     = (($page * $lmt) - $lmt);
-        $limit      = $lmt . " OFFSET " . $offset;
+        $limit        =  10;
         
         $this->set('data', $this->Ecourse->findAll($conditions, $fields));
@@ -72 +54 @@
         $this->layout = 'admin';
         
-        //pagination
-        //$total_rows = $this->Ecourse->findCount(array("user_id"=>$this->othAuth->user('id'))); 
-        
         $lmt        = 25; // limit news
         
-        $targetpage = "/admin/news/listing/";
-        
-    // $pagination = $this->Mypagination->init($total_rows, $page, $lmt, $targetpage); //Pagination
-        
-    // $this->set('pagination', $pagination);
+        $conditions   =  array("Ecourse.user_id"=>$this->Auth->user('id'), "Ecourse.id"=>$ecourse_id);
+        $fields       =  array('id', 'title', 'status', 'code');
+        $order        =  "Ecourse.id DESC";
 
-        
-        $conditions   =  array("Ecourse.user_id"=>$this->othAuth->user('id'), "Ecourse.id"=>$ecourse_id);
-        $fields       =  array('id', 'title', 'access',  'status', 'code');
-        $order        =  "Ecourse.id DESC";
-        //$offset     = (($page * $lmt) - $lmt);
-        //$limit      = $lmt . " OFFSET " . $offset;
-        
         $this->set('data', $this->Ecourse->find($conditions, $fields));
   }
  
   public function admin_add() 
-  {
-    
+  {   
     $this->layout    = 'admin'; 
     
@@ -102 +71 @@
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->cleanArray($this->data["Ecourse"]);
+        $this->Sanitize->clean($this->data["Ecourse"]);
   
-        $this->data['Ecourse']['user_id'] = $this->othAuth->user('id');
+        $this->data['Ecourse']['user_id'] = $this->Auth->user('id');
 
         $this->Ecourse->create();
@@ -112 +81 @@
                 $this->msgFlash('Course saved', '/admin/ecourses/listing');
         }
-     }
+    }
     else
     {
-        $this->set('subjects', $this->Ecourse->Subject->generateList(null, 'title'));       
-    
-        $this->set('langs', $this->Ecourse->Lang->generateList(null, 'lang', null, '{n}.Lang.id', '{n}.Lang.lang'));
+ 
+     $this->set('subjects', Set::combine($this->Ecourse->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
+
+     $this->set('langs', Set::combine($this->Ecourse->Lang->find('all', array('order' => 'lang')), "{n}.Lang.id","{n}.Lang.lang"));
+
     }
   }
@@ -167 +138 @@
  }
   /*** DELETE  **/ 
-  public function admin_delete($id)
-  {
+ public function admin_delete($id)
+ {
     $this->Ecourse->del($id);
     
     $this->msgFlash('Course deleted', '/admin/ecourses/listing');
-  } 
+ } 
 }
 ?>

trunk/app/controllers/entries_controller.php

@@ -73 +73 @@
  public function admin_add()
  {
-    $this->layout    = 'admin';
+   $this->layout    = 'admin';
 
-    $this->set('subjects', Set::combine($this->Entry->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
+   $this->set('subjects', Set::combine($this->Entry->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
       
     if ( !empty($this->data["Entry"]) )  

trunk/app/controllers/news_controller.php

@@ -3 +3 @@
  *  Karamelo E-Learning Platform
  *  Manuel Montoya 2002-2008 
- *  GPL License manuel<at>mononeurona<punto>org
+ *  GPLv3 License manuel<at>mononeurona<punto>org
  *  Chipotle Software
 */ 
@@ -19 +19 @@
       if (isset($this->params[Configure::read('Routing.admin')]))
       {
-                 if ($this->Auth->user('group_id') != 1)
+                 if ($this->Auth->user('group_id') == 1)
                  {
-                           return false;
+                           return true;
                  }
       }
-     return true;
+     return false;
   }
                                                                  
@@ -120 +120 @@
    public function admin_listing($page=1) 
    {
-        //pagination
-        $total_rows = $this->News->findCount(array("user_id"=>$this->othAuth->user('id'))); 
-        
-        $lmt        = 25; // limit news
-        
-        $targetpage = "/admin/news/listing/";
-        
-        $pagination = $this->Mypagination->init($total_rows, $page, $lmt, $targetpage); //Pagination
-        
-        $this->set('pagination', $pagination);
-        
-        $this->pageTitle = $this->othAuth->user('username') . '\'s News';
-        
-        $this->layout = 'admin';
-        
-        $conditions   = array("News.user_id" => $this->othAuth->user('id') );             // only the user's news
-        $fields       = array("id", "title", "body", "created", "reference", "status", "theme_id", "user_id");
-        $order        = "News.id DESC";
-        
-        $offset     = (($page * $lmt) - $lmt);
-        
-        $limit      = $lmt . " OFFSET " . $offset;
-        
-        $this->set('data', $this->News->findAll($conditions, $fields, $order, $limit)); 
+      $this->pageTitle = 'News manager';
+        
+      $this->layout = 'admin';
+        
+      $conditions   = array("News.user_id" => $this->Auth->user('id') );             // only the user's news
+      $fields       = array("id", "title", "body", "created", "reference", "status", "theme_id", "user_id");
+      $order        = "News.id DESC";
+      $limit      = 20;
+        
+      $this->set('data', $this->News->findAll($conditions, $fields, $order, $limit)); 
   }
   
@@ -162 +148 @@
   {
     $this->layout    = 'admin';
-
-    $this->set('themes', $this->News->Theme->generateList(null, 'theme ASC', null, '{n}.Theme.id', '{n}.Theme.theme'));
+ 
+    $this->set('subjects',Set::combine($this->News->Theme->find('all', array('order'=>'title')),"{n}.Subject.id","{n}.Subject.title"));
     
     if (!empty($this->data["News"]))
@@ -179 +165 @@
          $this->data["News"]["body"] = utf8_encode($tmp);
          
-         $this->data["News"]["user_id"] = $this->othAuth->user('id');
+         $this->data["News"]["user_id"] = $this->Auth->user('id');
          
      if ($this->News->save($this->data["News"]))

trunk/app/controllers/vclassrooms_controller.php

@@ -16 +16 @@
  public function isAuthorized()
  {
-            if (isset($this->params[Configure::read('Routing.admin')]))
-                   {
-                                if ($this->Auth->user('group_id') != 1)
-                                     {
-                                                  return false;
-                                                            }
-                                                           }
-                                                              return true;
-      }
-                                                          
-  
+         if (isset($this->params[Configure::read('Routing.admin')]))
+         {
+              if ($this->Auth->user('group_id') == 1)
+              {
+                        return true;
+          }
+         }
+      return false;
+ }
+                                                            
  public function show($user_id, $id) 
  {
@@ -61 +60 @@
         else
         {
-        if ($this->Vclassroom->addAssoc('User',  $this->othAuth->user('id'), $this->data["Vclassroom"]["vclassroom_id"]))
+        if ($this->Vclassroom->addAssoc('User',  $this->Auth->user('id'), $this->data["Vclassroom"]["vclassroom_id"]))
             {  
                $this->set('msg', 'You have joined to this class succesfully!');
@@ -82 +81 @@
    foreach ($data['User'] as $user)
    {
-      if ($user['id'] == $this->othAuth->user('id'))    
+      if ($user['id'] == $this->Auth->user('id'))    
       {
        $already_member = true;  // yes, is already member
@@ -99 +98 @@
  {
       $this->layout = 'admin';
-      $conditions = array("Vclassroom.user_id"=>$this->othAuth->user('id'));
+      $conditions = array("Vclassroom.user_id"=>$this->Auth->user('id'));
       $fields     = array("Vclassroom.id", "Vclassroom.name", "Vclassroom.created", "Vclassroom.user_id", "Vclassroom.ecourse_id");
       $order      = "Vclassroom.id DESC";
@@ -112 +111 @@
       $this->layout = 'admin';
       
-      $conditions = array("Vclassroom.user_id"=>$this->othAuth->user('id'), "Vclassroom.id"=>$vclassroom_id);
+      $conditions = array("Vclassroom.user_id"=>$this->Auth->user('id'), "Vclassroom.id"=>$vclassroom_id);
       
       $this->pageTitle = 'Class members';
@@ -123 +122 @@
       $this->layout = 'popup';
       
-      $conditions = array("Vclassroom.user_id"=>$this->othAuth->user('id'), "Vclassroom.id"=>$vclassroom_id);
+      $conditions = array("Vclassroom.user_id"=>$this->Auth->user('id'), "Vclassroom.id"=>$vclassroom_id);
       
       $this->pageTitle = 'Tests';
       
       $this->set('data', $this->Vclassroom->find($conditions));
-      $this->set('test', $this->Vclassroom->Test->findAll(array("Test.user_id"=>$this->othAuth->user('id'), "Test.status"=>1)));
+      $this->set('test', $this->Vclassroom->Test->findAll(array("Test.user_id"=>$this->Auth->user('id'), "Test.status"=>1)));
  }
  // link webquest to classroom
@@ -135 +134 @@
       $this->layout = 'popup';
       
-      $conditions = array("Vclassroom.user_id"=>$this->othAuth->user('id'), "Vclassroom.id"=>$vclassroom_id);
+      $conditions = array("Vclassroom.user_id"=>$this->Auth->user('id'), "Vclassroom.id"=>$vclassroom_id);
       
       $this->pageTitle = 'Webquest';
       
       $this->set('data', $this->Vclassroom->find($conditions));
-      $this->set('webquest', $this->Vclassroom->Webquest->findAll(array("Webquest.user_id"=>$this->othAuth->user('id'), "Webquest.status"=>1)));
+      $this->set('webquest', $this->Vclassroom->Webquest->findAll(array("Webquest.user_id"=>$this->Auth->user('id'), "Webquest.status"=>1)));
  }
  // link treasure to classroom
@@ -147 +146 @@
       $this->layout = 'popup';
       
-      $conditions = array("Vclassroom.user_id"=>$this->othAuth->user('id'), "Vclassroom.id"=>$vclassroom_id);
+      $conditions = array("Vclassroom.user_id"=>$this->Auth->user('id'), "Vclassroom.id"=>$vclassroom_id);
       
       $this->pageTitle = 'Treasure';
       
       $this->set('data', $this->Vclassroom->find($conditions));
-      $this->set('treasure', $this->Vclassroom->Treasure->findAll(array("Treasure.user_id"=>$this->othAuth->user('id'), "Treasure.status"=>1)));
+      $this->set('treasure', $this->Vclassroom->Treasure->findAll(array("Treasure.user_id"=>$this->Auth->user('id'), "Treasure.status"=>1)));
  }
  public function admin_start($vclassroom_id)
  {
       $this->layout = 'admin';
-      $conditions = array("Vclassroom.user_id"=>$this->othAuth->user('id'), "Vclassroom.id"=>$vclassroom_id);
+      $conditions = array("Vclassroom.user_id"=>$this->Auth->user('id'), "Vclassroom.id"=>$vclassroom_id);
       $fields     = array("Vclassroom.id", "Vclassroom.name", "Vclassroom.order", "Vclassroom.created", "Vclassroom.user_id", "Vclassroom.subject_id");
       $order      = "Vclassroom.id DESC";
@@ -174 +173 @@
         $this->Sanitize->cleanArray($this->data["Vclassroom"]); 
 
-        $this->data["Vclassroom"]["user_id"] = $this->othAuth->user('id');
+        $this->data["Vclassroom"]["user_id"] = $this->Auth->user('id');
        
         $this->Vclassroom->create();

trunk/app/views/ecourses/admin_add.ctp

@@ -1 @@
-<?php echo $html->formTag('/admin/ecourses/add','post', array("onsubmit"=>"return chkForm();")); ?>
+<?php echo $form->create('Ecourse', array('action'=>'admin_add', 'onsubmit'=>'return chkForm()'));  ?>
 <fieldset>
   <legend>New Course</legend>
-<p>By default, your course is accessible to everybody. If you want some c0onfidentiality, the simplest way is to open registration during one week, ask the students to register themselves, then close registration and check for possible intruders in the user list.</p>
-  <?php 
-    echo $form->labelTag('Ecourse/title', 'Title:');
-    echo $html->input('Ecourse/title', array("size" => 30, "maxlength" => 90)) . ' e.g. History of Literature';
-    echo $html->tagErrorMsg('Ecourse/title', 'A FAQ title is required.');
+<p>By default, your course is accessible to everybody. If you want some confidentiality, the simplest way is to open registration during one week, ask the students to register themselves, then close registration and check for possible intruders in the user list.</p>
+<?php 
+ echo $form->input('Ecourse.title', array("size" => 30, "maxlength" => 90)) . ' e.g. History of Literature';
+ echo $form->error('Ecourse.title', 'A FAQ title is required.');
 
-    echo $form->labelTag('Ecourse/description', 'Description:');
-    echo $html->textarea('Ecourse/description', array("cols" => 40, "rows" =>4));
+ echo $form->label('Ecourse.description', 'Description:');
+ echo $form->textarea('Ecourse.description', array("cols" => 40, "rows" =>4));
 
-     
-    echo $form->labelTag('Ecourse/code', 'Code:' );
-    echo $html->input('Ecourse/code', array("size" => 12, "maxlenght" => 12))  . ' max. 12 characters, ie.ROM2121';
-    echo $html->tagErrorMsg('Ecourse/code', 'A category description is required.');
-  ?>
-  <br /><br />
-<?php
-    echo $form->labelTag('Ecourse/subject_id', 'Subject:');
-    echo $html->selectTag('Ecourse/subject_id', $subjects, null, null, null, false);
+ echo $form->input('Ecourse.code', array("size" => 12, "maxlenght" => 12))  . ' max. 12 characters, ie.ROM2121';
+ echo $form->error('Ecourse/code', 'A category description is required.');
+ 
+ echo $form->label('Ecourse.subject_id', 'Subject:');
+ echo $form->select('Ecourse.subject_id', $subjects, null, null, null, false);
 
-    echo $form->labelTag('Ecourse/lang_id', 'Lang:');
-    echo $html->selectTag('Ecourse/lang_id', $langs, null, null, null, false);
+ echo $form->label('Ecourse.lang_id', 'Lang:');
+ echo $form->select('Ecourse.lang_id', $langs, null, null, null, false);
 ?>
 
   <div style="clear:both"></div>
   <br />
-  <?php echo $html->submit('Save') ?>
+  <?php echo $form->end('Save'); ?>
 </fieldset>
-</form>
+
 <script type="text/javascript">
 /* <![CDATA[ */
@@ -39 +34 @@
   {
        Div.style.display = "block";
-   }
-   else
-   { 
+  }
+  else
+  { 
            Div.style.display = "none";
-    }
+  }
  }
 

trunk/app/views/ecourses/admin_listing.ctp

@@ -1 @@
-<?php
-if ( isset($javascript) ):
-  echo $html->charsetTag('UTF-8');
-  echo $javascript->link('prototype');
-  echo $javascript->link('scriptaculous.js?load=effects');
-endif;
-?>
 <script type="text/javascript">
    window.onload = timedMsg;

trunk/app/views/ecourses/admin_vclassrooms.ctp

@@ -1 +1 @@
 <?php
 //exit(print_r($data));
-
-if ( isset($javascript) ):
-  echo $html->charsetTag('UTF-8');
-  echo $javascript->link('prototype');
-  echo $javascript->link('scriptaculous.js?load=effects');
-endif;
 
 echo $html->addCrumb('Control Tools', '/admin/entries/start');

trunk/app/views/entries/admin_add.ctp

@@ -32 +32 @@
   <?php 
      echo $form->label( 'Entry.Body', 'Body:' );
-     echo $form->textarea('Entry/body', array("cols"=>80, "rows"=>30)); 
-     echo $fck->load('Entry/body', 'Karamelo'); 
-     echo $form->error('Entry/body', 'Body is required.'); 
+     echo $form->textarea('Entry.body', array("cols"=>80, "rows"=>30)); 
+     echo $fck->load('EntryBody', 'Default'); 
+     echo $form->error('Entry.body', 'Body is required.'); 
    ?>
   </td></tr>

trunk/app/views/entries/admin_edit.ctp

@@ -38 +38 @@
  <td colspan="3">
   <?php 
-     echo $form->label('Entry.Body', 'Body:');
+     echo $form->label('Entry.body', 'Body:');
      echo $form->textarea('Entry.body', array("cols"=>80, "rows"=>22));
-     echo $fck->load('EntryBody', 'Karamelo'); 
+     echo $fck->load('EntryBody', 'Default'); 
      echo $form->error('Entry.body', 'Body is required.'); 
   ?>
@@ -47 +47 @@
   <td>
     <?php 
-        echo $form->label( 'Entry/status', 'Published:' );
+        echo $form->label('Entry/status', 'Published:' );
         echo $form->checkbox('Entry/status', null, array("value" => 1)); 
     ?>
@@ -53 +53 @@
   <td>
  <?php 
-   echo $form->label( 'Entry.discution', 'Comments allowed:' );
+   echo $form->label('Entry.discution', 'Comments allowed:' );
    echo $form->checkbox('Entry.discution', null, array("value" => 1)); 
 ?>

trunk/app/views/entries/admin_listing.ctp

@@ -30 +30 @@
 foreach ($data as $val) {
        $tr = array (
-        $gags->sendEdit($val['Entry']['id'], 'entries'),
+        $gags->sendEdit($val['Entry']['id'], 'Entry'),
         $val['Entry']['title'],
         $gags->setStatus($val['Entry']['status']),
-        $gags->confirmDel($val['Entry']['id'], 'entries')
+        $gags->confirmDel($val['Entry']['id'], 'Entry')
         );
        

trunk/app/views/helpers/gags.php

@@ -12 +12 @@
    public  $helpers = array('Html', 'Ajax', 'Form');
    
-   public function confirmDel($id, $controller) 
+   public function confirmDel($id, $model) 
    {
         
-        $strB  = $this->Form->create(null, array('action'=>'/admin/'.$controller.'/delete/'.$id, "onsubmit"=>"return confirm('Are you sure to delete?')"));
+        $strB  = $this->Form->create($model, array('action'=>'/admin_delete/'.$id, "onsubmit"=>"return confirm('Are you sure to delete?')"));
         $strB .= $this->Form->end('Delete');
         
@@ -21 +21 @@
    }
    
-   public function sendEdit($id, $controller) 
+   public function sendEdit($id, $model) 
    {
         
-        $strB  = $this->Form->create(null, array('action'=>'/admin/'.$controller.'/edit/'.$id));
+        $strB  = $this->Form->create($model, array('action'=>'admin_edit/'.$id));
         $strB .= $this->Form->end('Edit');
         

trunk/app/views/news/admin_add.ctp

@@ -1 @@
-<?php echo $javascript->link('prototype'); ?>
-<?php echo $javascript->link('myfunctions'); ?>
-<?php echo $javascript->link('poll'); ?>
-<?php echo $javascript->link('fckeditor/fckeditor'); ?> 
+<?php 
+   echo $javascript->link('myfunctions');
+