Changeset 36

Timestamp:

07/16/07 17:29:03 (18 months ago)

Author:

aarkerio

Message:

Images

Location:

trunk/app

Files:

• config/sql/karamelo.sql (modified) (2 diffs)
• controllers/components/adds.php (modified) (1 diff)
• controllers/entries_controller.php (modified) (4 diffs)
• controllers/images_controller.php (modified) (8 diffs)
• controllers/news_controller.php (modified) (1 diff)
• models/entry.php (modified) (1 diff)
• models/subject.php (modified) (2 diffs)
• views/entries/admin_add.thtml (modified) (1 diff)
• views/helpers/fck.php (modified) (3 diffs)
• views/layouts/popup.thtml (modified) (1 diff)
• views/news/display.thtml (modified) (2 diffs)
• views/subjects/admin_add.thtml (modified) (1 diff)
• views/subjects/admin_listing.thtml (modified) (3 diffs)

trunk/app/config/sql/karamelo.sql

@@ -833 +833 @@
 INSERT INTO categories (title, user_id) VALUES ('Book Review', 1);
 
+-- Sections blogs
+CREATE TABLE themeblogs (
+ id serial PRIMARY KEY,
+ title varchar(110) NOT NULL,
+ user_id int NOT NULL REFERENCES users(id) ON DELETE CASCADE
+);
+
 -- entries in the users blogs
 CREATE TABLE entries (
@@ -838 +845 @@
 title varchar(50) NOT NULL,
 body text NOT NULL,
-category_id int REFERENCES categories (id) ON DELETE CASCADE,
+subject_id int REFERENCES subjects (id) ON DELETE CASCADE,
 created timestamp(0) with time zone DEFAULT now() NOT NULL,
 status int NOT NULL DEFAULT 0,
-user_id int REFERENCES users (id) ON DELETE CASCADE,
+user_id int REFERENCES users(id) ON DELETE CASCADE,
 disc int NOT NULL DEFAULT 0  -- discution, Activ/Desactiv   1/0
 );

trunk/app/controllers/components/adds.php

@@ -32 +32 @@
     return substr($password, 0, $length); 
 }
+//handle images
+public function get_extension($imagetype) 
+{
+     
+     if ( empty($imagetype) )
+     {
+         return false;
+     }
+     
+     switch($imagetype)
+     {
+           case 'image/bmp': return '.bmp';
+           case 'image/cis-cod': return '.cod';
+           case 'image/gif': return '.gif';
+           case 'image/ief': return '.ief';
+           case 'image/jpeg': return '.jpg';
+           case 'image/pipeg': return '.jfif';
+           case 'image/tiff': return '.tif';
+           case 'image/x-cmu-raster': return '.ras';
+           case 'image/x-cmx': return '.cmx';
+           case 'image/x-icon': return '.ico';
+           case 'image/x-portable-anymap': return '.pnm';
+           case 'image/x-portable-bitmap': return '.pbm';
+           case 'image/x-portable-graymap': return '.pgm';
+           case 'image/x-portable-pixmap': return '.ppm';
+           case 'image/x-rgb': return '.rgb';
+           case 'image/x-xbitmap': return '.xbm';
+           case 'image/x-xpixmap': return '.xpm';
+           case 'image/x-xwindowdump': return '.xwd';
+           case 'image/png': return '.png';
+           case 'image/x-jps': return '.jps';
+           case 'image/x-freehand': return '.fh';
+           default: return false;
+       }
+  }
 
 //validate email format and hosting address

trunk/app/controllers/entries_controller.php

@@ -18 +18 @@
    public function results($string) 
    {
+       $this->layout = 'portal';
        
-       $conditions = array("Entry.body"=>$string);
+       $conditions   = array("Entry.body"=>$string);
        
-       $data = $this->Entry->findAll($conditions, $order);
-       
-       $this->set('data', $data);
+       $this->set('data', $this->Entry->findAll($conditions, $order));
    }
    
    public function rss($user_id) 
    {
-       
        $this->layout    = 'rss';
        
        $conditions = array("Entry.status"=>1, "Entry.user_id"=>$user_id);
        
-       $fields     = array("id", "title", "body", "created", "category_id", "user_id");
+       $fields     = array("id", "title", "body", "created", "subject_id", "user_id");
        
        $data = $this->Entry->findAll($conditions, $fields, "Entry.created", 10, false, 2);
@@ -57 +55 @@
    }
    
+   /** ====  ADMIN SECTION ====*/
+   
    public function admin_add()
    {
     
     $this->layout    = 'admin';
-    // adds new blog entries 
-   if ( empty($this->data) )  
-   {
-     
-     $this->set('categories', $this->Entry->Category->generateList());
-     
-     $conditions = array("Entry.user_id" => $this->othAuth->user('id'));
-     
-     $fields     = array("id", "title", "body", "disc", "created", "status");
-     
-     $data = $this->Entry->findAll($conditions, $fields, null, null, null, 1);
-     
-     $this->set('data', $data);
-     
-     //$this->render();
-   }
+    
+    if ( empty($this->data["Entry"]) )  
+    {
+         $this->set('subjects', $this->Entry->Subject->generateList(null,'title'));
+    }
     else
-   {
+    {
     
     $this->Sanitize = new Sanitize;
@@ -92 +81 @@
             $this->flash('Database error!', '/admin/entries/listing');
       }
-   }
+    }
   }
-  /** ===  ADMIN SECTION */
-  
+ 
   public function admin_start($order = null)
   {
@@ -107 +95 @@
         
         $conditions = null;
-        $fields     = array("id", "title", "body", "category_id");
+        $fields     = array("id", "title", "body", "subject_id");
         $data       = $this->Entry->findAll( $conditions, $fields, $order, null, null, true );
         

trunk/app/controllers/images_controller.php

@@ -1 +1 @@
 <?php
-/**
+/*
 *  Karamelo E-Learning Platform
 *  Manuel Montoya 2002-2007 
 *  Chipotle Software
-*  GPLv3 manuel<at>mononeurona.org
+*  GPL manuel<at>mononeurona.org
 */ 
  
@@ -13 +13 @@
 class ImagesController extends AppController
 {
-    public $helpers       = array('Ajax', 'Form', 'User', 'Gags');
-    
-    public $components       = array('Security', 'Mypagination');
-    
-    public function admin_listing()
+    public $helpers       = array('Html', 'Javascript', 'Ajax', 'Form', 'User');
+    
+    public $components    = array('Security', 'Adds');
+    
+    public function index($id = null)
+    {
+        $this->pageTitle = 'View Active Users';
+        $this->set('data', $this->User->findAll()); 
+        $this->set('color', 'blue');
+    }
+    
+    public function admin_listing($set = null)
     {   
-        $this->layout    = 'admin';
-        
+        if ($set == null)
+        {
+             $this->layout    = 'admin';
+             $limit           = 30;
+             $this->set('set', null);
+        } else {
+             $this->layout    = 'popup';
+             $limit           = 15;
+             $this->set('set', true);
+        }
         $this->pageTitle = 'Your Images';
         
@@ -29 +44 @@
         $order      = "Image.id DESC";
         
-        $data       = $this->Image->findAll($conditions, $fields, $order, null, null, 1);
+        $data       = $this->Image->findAll($conditions, $fields, $order, $limit);
         
         $this->set('data', $data);
-    }
-   
-    public function admin_listview()
-    {   
-        $this->layout    = 'popup';
-        
-        $this->pageTitle = 'Your Images';
-        
-        $conditions = array("user_id"=>$this->othAuth->user('id'));
-        
-        $fields     = array("id", "file", "user_id");
-        
-        $order      = "Image.id DESC";
-        
-        $limit      = 20;
-        
-        $data       = $this->Image->findAll($conditions, $fields, $order, null, null, 1);
-        
-        $this->set('data', $data);
-        
-        $this->set('listview', true);
     }
    
@@ -89 +83 @@
     
     $maxfilesize  = 2097152; /** 2MB max size */
+    
+    $this->Sanitize = new Sanitize;
+    
+    $this->Sanitize->cleanArray($this->data);
     
     $imgfile_name = $this->data['Image']['file']['name'];
@@ -108 +106 @@
         /** delete uploaded file  */
         unlink($imgfile);
-        die($this->flash($ErrMsg,'/admin/images/listing/') );
+        $this->flash($ErrMsg,'/admin/images/listing/');
+        exit();
     }
     
     if ( $imgfile_size > $maxfilesize) 
     {
-         $ErrMsg  = "<h1>ERROR</h1> The image is too big.<br>";
+     $ErrMsg  = "<h1>ERROR</h1> The image is too big.<br>";
          $ErrMsg .= "<p>Bigger than 2.0 MB <br><br>";
          $ErrMsg .= "Current size: " . $imgfile_size ."</p>\n";
@@ -119 +118 @@
         /** delete uploaded file */
         unlink($imgfile);
-        die( $this->flash($ErrMsg,'/images/listing/') );
-    }
-    
-    $field       = "id";
-    
-    $conditions  = array("user_id" =>  $this->othAuth->user('id'));
-    
-    $order       = "Image.id DESC";
-    
-    $current_id  = $this->Image->field($field, $conditions, $order);
+        $this->flash($ErrMsg,'/admin/images/listing/');
+        exit();
+    }
+    
+    $current_id  = $this->Image->field("id", array("Image.id"=>"> 0"), "Image.id DESC");
     
     $next_id     = ($current_id + 1);
     
-    $extension   = $this->get_extension($type);
+    $extension   = $this->Adds->get_extension($type);
     
     $Name        = $this->othAuth->user('username') . "_" . $next_id . $extension;
@@ -140 +134 @@
     $final_filename = str_replace(" ", "_", $Name);
     
-    $newfile = $uploaddir . "/" . $final_filename;
+    $newfile        = $uploaddir . "/" . $final_filename;
     
     /** do extra security check to prevent malicious abuse */
@@ -155 +149 @@
    }
    
+   /*** Create thumb***/
+    if ( $type != 'avatar')
+    {
+         $this->createThumb($final_filename);
+    }
    /** Database stuff  **/
    
-   $this->data['Image']['file'] = $final_filename;
+   $this->data['Image']['file']    = $final_filename;
+   $this->data['Image']['user_id'] = $this->othAuth->user('id');
    
    if ($this->Image->save($this->data))
-   {
-           $this->redirect($this->data['Image']['return']);
-    }
-    
+   {     
+         $this->redirect($this->data['Image']['return']);
+         exit();
+   }
+   
     /** delete the temporary uploaded file **/
     unlink($imgfile);
-   
    }
 }
 
-protected function get_extension($imagetype) {
-     
-     if ( empty($imagetype) )
-     {
-         return false;
-     }
-     
-     switch($imagetype)
-     {
-           case 'image/bmp': return '.bmp';
-           case 'image/cis-cod': return '.cod';
-           case 'image/gif': return '.gif';
-           case 'image/ief': return '.ief';
-           case 'image/jpeg': return '.jpg';
-           case 'image/pipeg': return '.jfif';
-           case 'image/tiff': return '.tif';
-           case 'image/x-cmu-raster': return '.ras';
-           case 'image/x-cmx': return '.cmx';
-           case 'image/x-icon': return '.ico';
-           case 'image/x-portable-anymap': return '.pnm';
-           case 'image/x-portable-bitmap': return '.pbm';
-           case 'image/x-portable-graymap': return '.pgm';
-           case 'image/x-portable-pixmap': return '.ppm';
-           case 'image/x-rgb': return '.rgb';
-           case 'image/x-xbitmap': return '.xbm';
-           case 'image/x-xpixmap': return '.xpm';
-           case 'image/x-xwindowdump': return '.xwd';
-           case 'image/png': return '.png';
-           case 'image/x-jps': return '.jps';
-           case 'image/x-freehand': return '.fh';
-           default: return false;
-       }
+  /*** DELETE  **/ 
+  public function admin_delete($id)
+  {
+    $file = $this->Image->field("Image.file", array("Image.id"=>$id));
+    
+    $this->Image->del($id);
+    
+    /** delete image and thumb **/
+    unlink("../webroot/img/imgusers/" . $file);
+    unlink("../webroot/img/imgusers/thumbs/" . $file);
+    $this->redirect($this->data['Image']['return']);
   }
   
-  /*** DELETE  **/ 
-  public function admin_delete($id, $imgfile)
+  protected function createThumb($file) 
   {
-    $this->Image->del($id);
-    
-    /** delete the uploaded file **/
-    $uploaddir    = "../webroot/img/imgusers/";
-    unlink($uploaddir . $imgfile);
-    $this->flash('The image has been deleted.', '/admin/images/listing');
+     
+     $imgfile        = "../webroot/img/imgusers/"           .  $file;            // system path
+     
+     //exit($imgfile);
+     $thumb_img      = "../webroot/img/imgusers/thumbs/"     .  $file;             // system path
+     
+     $new_w          = 100;  //new width
+     
+     /** only resize if the image is larger than 250 x 200 */
+     
+     $image_stats = getimagesize($imgfile);  // return array
+     
+     $imagewidth  = $image_stats[0];
+     
+     $imageheight = $image_stats[1];
+     
+     $img_type    = $image_stats[2];   // 1 = GIF, 2 = JPG, 3 = PNG
+     
+     $ratio       = ($imagewidth / $new_w);
+     
+     $new_h       = round($imageheight / $ratio);
+     
+     /*** Save bandwidth! generate thumbs **/
+     if (!file_exists($thumb_img))  // thumb already exist??  
+     {
+       switch ($img_type) 
+       {
+         case 1;
+                  
+                   $src_img = imagecreatefromgif($imgfile);
+               
+               $dst_img = imagecreatetruecolor($new_w, $new_h);
+           
+           imagecopyresized($dst_img,$src_img,0,0,0,0,$new_w,$new_h, $imagewidth, $imageheight);
+           
+           imagegif($dst_img, $thumb_img, "100");
+         break;
+         
+         case 2;
+               
+                   $src_img = imagecreatefromjpeg($imgfile);
+           
+           $dst_img = imagecreatetruecolor($new_w, $new_h);
+           
+           imagecopyresized($dst_img,$src_img,0,0,0,0,$new_w,$new_h, $imagewidth, $imageheight);
+           
+           imagejpeg($dst_img, $thumb_img, "100");
+         break;
+               
+         case 3;   
+                   $dst_img = imagecreatetruecolor($new_w, $new_h);
+                   
+                   $src_img = ImageCreateFrompng($imgfile);
+                   
+                   imagecopyresized($dst_img,$src_img,0,0,0,0,$new_w,$new_h, $imagewidth, $imageheight);
+                   
+                   imagepng($dst_img, $thumb_img);
+         break;
+      }
+    }
   }
-  
 }
 ?>

trunk/app/controllers/news_controller.php

@@ -244 +244 @@
    
    public function category($id = null, $order=null) 
-   {   
+   {  
+      $this->layout = 'portal';
+      
       if ($id != null)
       {

trunk/app/models/entry.php

@@ -5 +5 @@
 {
     // Its always good practice to include this variable.
-    public $name      = 'Entry';
-    public $belongsTo = 'User, Category';
+    
+    public $belongsTo = 'User, Subject';
+    
     public $hasMany   = 'Comment';
-    
     
     public $validate = array(

trunk/app/models/subject.php

@@ -9 +9 @@
 class Subject extends AppModel
 {
-    // Its always good practice to include this variable.
-    public $name        = 'Subject';
     
     public $hasMany = array('Vclassroom' =>
@@ -32 +30 @@
                                'finderQuery'   => ''
                          ),
-                       'News' =>
-                         array('className'     => 'News',
+                       'Entry' =>
+                         array('className'     => 'Entry',
                                'conditions'    => null,
                                'order'         => null,

trunk/app/views/entries/admin_add.thtml

@@ -2 +2 @@
 <?php echo $javascript->link('fckeditor/fckeditor'); ?> 
 
-<div class="spaced">
-
-<?php echo $html->addCrumb('Control Tools', '/entries/index'); ?> 
-<?php echo $html->addCrumb('Entries', '/entries/listing'); ?> 
+<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
+<?php echo $html->addCrumb('Entries', '/admin/entries/listing'); ?> 
 <?php echo $html->getCrumbs(' / '); ?>
-
-<?php echo $html->formTag('/entries/add/','post', array("onsubmit"=>"return validateEntry()")); ?>
-
+<?php echo $html->formTag('/admin/entries/add/','post', array("onsubmit"=>"return validateEntry()")); ?>
 <?php echo $html->hiddenTag('Entry/user_id', $othAuth->user('id')) ?>
 <fieldset>
 <legend>New Entry</legend>
-  <?php echo $form->labelTag( 'Entry/title', 'Title' );?><br /> 
-  <?php echo $html->input('Entry/title', array("size" => 40, "maxlength" => 50)); ?>
+
+<table style="margin:0 auto 0 auto;">
+<tr><td>
+  
+  <?php echo $form->labelTag( 'Entry/title', 'Title:' );?><br /> 
+  <?php echo $html->input('Entry/title', array("size" => 50, "maxlength" => 50)); ?>
   <?php echo $html->tagErrorMsg('Entry/title', 'Title is required.'); ?>
-  <br /><br />
+  </td>
   
-  <p><?php echo $form->labelTag( 'Entry/category_id', 'Category' );?>
-  <br />
-      <?php 
-      /*$html->selectTag(
-      $fieldName,
-      $optionElements,
-      $selected = null,
-      $selectAttr = array(),
-      $optionAttr = null,
-      $showEmpty = true,
-      $return = false    
-      selectTag ($fieldName, $optionElements, $selected=null, $selectAttr=array(), $optionAttr=null, $showEmpty=true, $return=false)
-      */
-      echo $html->selectTag('Entry/category_id', $categories, null, $html->tagValue('Entry/category_id'), array("class"=>"formas"), false, false); 
+  <td>
+     <?php echo $form->labelTag( 'Entry/subject_id', 'Subject:' );?><br />
+     <?php 
+      echo $html->selectTag('Entry/subject_id', $subjects, null, $html->tagValue('Entry/subject_id'), null, false, false); 
       
-      echo $html->link($html->image('static/add.png', array("alt"=>"Add category", "title"=>"Add category")), '#', array("onclick"=>"javascript:window.open('/categories/listing', 'blank', 'toolbar=no, scrollbars=yes,width=350,height=500')"), null, false);
+      /* echo $html->link($html->image('static/add.png', array("alt"=>"Add category", "title"=>"Add category")), '#', array("onclick"=>"javascript:window.open('/admin/categories/listing', 'blank', 'toolbar=no, scrollbars=yes,width=350,height=500')"), null, false);*/
       ?>
-  </p>
+  </td>
   
-  <p style="text-align:right;">
-  <?php echo $html->link($html->image('admin/myimages.jpg', array("alt"=>"My Images", "title"=>"My Images")), '#', array("onclick"=>"javascript:window.open('/images/listview', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false) ?></p>
-  <p>
+  <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>
+  </td>
+  </tr>
+  <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 $html->textarea('Entry/body', array("class"=>"formas", "cols"=>80, "rows"=>55)) ?>
   <?php echo $fck->load('Entry/body', 'Karamelo'); ?> 
   <?php echo $html->tagErrorMsg('Entry/body', 'Body is required.'); ?>
-  <br />
-  </p>
+  </td></tr>
   
-  <p><?php echo $form->labelTag( 'Entry/status', 'Published:' );?><br />
-  <?php echo $html->checkbox('Entry/status'); ?>
-  <br /></p>
+  <tr>
+  <td>
+       <?php echo $form->labelTag( 'Entry/status', 'Published:' );?>
+       <?php echo $html->checkbox('Entry/status', null, array("value"=>1)); ?>
+  </td><td colspan="2">
+     <?php echo $form->labelTag( 'Entry/disc', 'Comments allowed:' );?>
+     <?php echo $html->checkbox('Entry/disc', null, array("value"=>1)); ?>
+  </td></tr>
   
-  <p><?php echo $form->labelTag( 'Entry/disc', 'Comments allowed:' );?><br />
-  <?php echo $html->checkbox('Entry/disc'); ?>
-  <br /></p>
-   
-  <br />
+  <tr><td colspan="3">
   <?php echo $html->submit('Add'); ?>
+</td></tr>
+</table>
+
 </fieldset>
 </form>
-</div>

trunk/app/views/helpers/fck.php

@@ -2 +2 @@
 class FckHelper extends Helper
 {
-   public function load($id, $toolbar = 'Karamelo', $width = 700) {
+   public function load($id, $toolbar = 'Karamelo', $width = 700, $height = 450) {
         
         $did = '';
@@ -17 +17 @@
 bFCKeditor_$did.ToolbarSet = '$toolbar';
 bFCKeditor_$did.Width = $width;
-bFCKeditor_$did.Height = 350;
+bFCKeditor_$did.Height = $height;
 bFCKeditor_$did.Skin = 'silver';
 bFCKeditor_$did.ReplaceTextarea();
@@ -26 +26 @@
     }
 }
-?> 
+?>

trunk/app/views/layouts/popup.thtml

@@ -5 +5 @@
  <head>
   <title>Karamelo: Control Panel</title>
-<?
+<?php
 if (isset($javascript)):
   echo $html->charsetTag('utf-8');

trunk/app/views/news/display.thtml

@@ -1 @@
-<div id="cintillo">Noticias</div>