Changeset 492

Timestamp:

05/15/08 17:05:35 (7 months ago)

Author:

aarkerio

Message:

Message interfase

Location:

trunk/app

Files:

• controllers/entries_controller.php (modified) (1 diff)
• controllers/podcasts_controller.php (modified) (1 diff)
• controllers/users_controller.php (modified) (4 diffs)
• views/entries/rss.ctp (modified) (2 diffs)
• views/layouts/podfeeder.ctp (added)
• views/layouts/rss.ctp (modified) (1 diff)
• views/messages/listing.ctp (modified) (1 diff)
• views/users/edit.ctp (modified) (2 diffs)
• webroot/css/portal/portal.css (modified) (1 diff)

trunk/app/controllers/entries_controller.php

@@ -42 +42 @@
       $this->layout    = 'rss';
       $conditions      = array("Entry.status"=>1, "Entry.user_id"=>$user_id);
-      $fields          = array("Entry.id", "Entry.title", "Entry.created", "Entry.body", "Entry.subject_id", "Entry.user_id", "User.username");
+      $fields          = array("Entry.id", "Entry.title", "Entry.created", "Entry.body", "Entry.subject_id", "Entry.user_id", "User.username", "User.name_blog");
       $order           = 'Entry.id DESC';
       $limit           = 20;

trunk/app/controllers/podcasts_controller.php

@@ -75 +75 @@
  public function rss($username) 
  {   
-    $this->layout = "rss";
+    $this->layout = "podfeeder";
     
     if ($username == null)

trunk/app/controllers/users_controller.php

@@ -19 +19 @@
  public function beforeFilter() 
  {
-   if ( !empty($this->data['User'] ) ): 
+   if ( isset($this->data['User']['pwd'] ) ): 
        if ( strlen($this->data['User']['pwd']) < 6):
          unset($this->data['User']['pwd']);
@@ -25 +25 @@
    endif;
 
-    $this->Auth->allow(array('blog', 'entry','portfolio', 'edit', 'about', 'register', 'directory', 'bloggers', 'insert', 'validate', 'logout'));
-  
+   $actions = array('blog','entry','portfolio','edit','about','register','avatar','directory','bloggers','insert','validate','logout');
+
+  if ( $this->Auth->user() && $this->Auth->user('group_id') == 3 ):
+      array_push($actions, 'avatar');
+  endif;
+  
+  $this->Auth->allow($actions);
+
   parent::beforeFilter();
  }
@@ -33 +39 @@
  {      
     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 true;
     endif; 
-
     endif; 
 
@@ -429 +433 @@
    endif;
  }
-  
+ /****   AVATAR   ***/
+ public function avatar() 
+ {
+    $this->layout    = 'ajax';
+    //die( debug($this->data));
+    if (!empty($this->data['User']) && is_uploaded_file($this->data['User']['file']['tmp_name']))
+    {
+    
+    $this->Sanitize = new Sanitize;
+    
+    $this->Sanitize->clean($this->data['User']); //Hopefully this is enough
+    
+    /** SUBMITTED INFORMATION - use what you need
+    *  temporary filename (pointer): $imgfile
+    *  original filename           : $imgfile_name
+    *  size of uploaded file       : $imgfile_size
+    *  mime-type of uploaded file  : $imgfile_type
+    */
+    
+    /** uploaddir:  directory relative to where script is running */
+    $uploaddir    = "../webroot/img/avatars";
+    
+    $maxfilesize  = 2097152; /** 2MB max size */
+    
+    $imgfile_name = $this->data['User']['file']['name'];
+    
+    $imgfile_size = $this->data['User']['file']['size'];
+    
+    $imgfile      = $this->data['User']['file']['tmp_name'];
+      
+    $type         = $this->data['User']['file']['type'];
+
+    list($width, $height, $typeimg, $attr) = getimagesize($imgfile);
+    
+    /** Security: checks to see if file is an image, if not do not allow upload ==*/
+    
+    if ( $type != "image/jpeg" && $type != "image/pjpeg" && $type != "image/png" && $type != "image/gif") 
+    {   /** is this a valid file? */
+        $ErrMsg   = "<h1>ERROR</h1> the file $imgfile_name $imgfile is not valid.<br>";
+        $ErrMsg  .= "<p>Only .jpg, .gif or .png files<br><br>";
+        $ErrMsg  .= "Current type file: " . $type . "</p>\n";
+            
+        /** delete uploaded file  */
+        unlink($imgfile);
+        die($this->flash($ErrMsg, '/admin/users/edit/') );
+    }
+    
+    if ( $imgfile_size > $maxfilesize) 
+    {
+      $error  = "Error. The image is too big. Bigger than 2.0 MB  Current size: " . $imgfile_size ."\n";
+             
+      /** delete uploaded file */
+      unlink($imgfile);
+      $this->flash($error,'/users/edit/');
+      return false;
+    }
+  
+    //check size
+    if ($width > 100 || $height > 100)
+    { 
+       $error  = " The image is too large. ";
+       $error .= "Width or height is larger than 100 pixels. Current size: width ". $width ."px  height ". $height ."px\n";
+             
+       /** delete uploaded file */
+       unlink($imgfile);
+       $this->flash($error,'/users/edit/');
+       return false;
+    }
+  
+    $extension   = $this->Adds->get_extension($type);
+    
+    $Name        = $this->Auth->user('username') . "_avatar" . $extension;
+    
+    /** setup final file location and name */
+    /** change spaces to underscores in filename  */
+    $final_filename = str_replace(" ", "_", $Name);
+    //die($final_filename);
+    $newfile = $uploaddir . "/" . $final_filename;
+    
+    /** do extra security check to prevent malicious abuse */
+    if (is_uploaded_file($imgfile))
+    {
+       /** move file to proper directory ==*/
+       if (!copy($imgfile, $newfile))
+       {
+          /** if an error occurs the file could not be written, read or possibly does not exist */
+          die($this->flash('Error Uploading File.', '/users/edit/'));
+       }
+   }
+   
+  /** delete the temporary uploaded file **/
+  unset($this->data['User']['file']); // We do'nt need this anymore 
+  unlink($imgfile);
+
+ /** Database stuff  **/
+  $this->data['User']['avatar'] = $final_filename;
+   
+  if ($this->User->save($this->data['User'])):
+           $this->msgFlash('Image update', '/users/edit/');
+  else:
+           die('Error saving');   
+  endif;
+   
+ }
+}  
  /***    ===== ADMIN METHODS====   ****/
  public function admin_login() 

trunk/app/views/entries/rss.ctp

@@ -1 +1 @@
 <?php 
-die(debug($data)); 
+// die(count($data)); 
 ?>
-<rss version="2.0">
 <channel>
-   <title>Karamelo</title>
-   <link><?php echo $_SERVER['SERVER_NAME'] ?></link>
-   <description>edublog</description>
-   <language>en</language>
-
+ <title>Karamelo</title>
+ <link><?php echo $_SERVER['SERVER_NAME']; ?></link>
+ <description>Edublog</description>
+ <language>en</language>
+ <image> 
+    <title>MonoNeurona - Minuto x Minuto</title>
+    <url>/img/static/cwclogo.jpg</url>
+    <link>http://<?php echo $_SERVER['SERVER_NAME']; ?></link>
+          <width>100</width>
+          <height>71</height>
+   </image>
 <?php
 foreach ($data as $v):  
-    die(debug($v));
+   
     $body   = substr($v["Entry"]['body'],0,300) . "...";
 ?>
  <item>
    <title><?php echo $v["Entry"]['title']; ?></title>
-   <link>http://<?php echo $_SERVER['SERVER_NAME'] ?>/users/entry/<?php echo $v["User"]['username']; ?>/<?php echo $v["Entry"]['id'] ?></link>
+   <link>http://<?php echo $_SERVER['SERVER_NAME']; ?>/users/entry/<?php echo $v["User"]['username']; ?>/<?php echo $v["Entry"]['id'] ?></link>
    <comments><?php echo $_SERVER['SERVER_NAME'] ?>/users/entry/<?php echo  $v["User"]['username']; ?>/<?php echo $v["Entry"]['id'] ?></comments>
-         <description><![CDATA['<?php echo $body ?>']]></description>
+        <description><![CDATA['<?php echo $body ?>']]></description>
         <pubDate><?php  echo $v["Entry"]['created'] ?></pubDate>
-          <creator><?php  echo $v["Entry"]['created'] ?></creator>
+        <creator><?php  echo $v["Entry"]['created'] ?></creator>
         <category><?php echo $v["Entry"]['subject_id']; ?></category>
         <guid><?php echo $_SERVER['SERVER_NAME'] ?>/users/entry/<?php echo $v["User"]['username']; ?>/<?php echo $v["Entry"]['id'] ?></guid>
@@ -27 +32 @@
 
 </channel>
-</rss>

trunk/app/views/layouts/rss.ctp

@@ -1 +1 @@
 <?php echo '<?xml version="1.0" encoding="UTF-8" ?>'."\n"; ?>
-<rss version="2.0" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
+<rss version="2.0">
   <?php echo $content_for_layout; ?>
 </rss>

trunk/app/views/messages/listing.ctp

@@ +1 @@
+<script type="text/javascript">
+   window.onload = timedMsg;
+</script>
 <?php 
+
+$session->flash(); 
+
 // die(debug($data));
 echo $html->link($html->image('admin/compose_on.gif', array("alt"=>"Compose New Message", "title"=>"Compose New Message")), 

trunk/app/views/users/edit.ctp

@@ -48 +48 @@
 
 <fieldset>
-  <legend>Upload new avatar</legend>
+  <legend><?php echo __('Upload new avatar'); ?></legend>
    <?php 
      echo $html->para(null, 'An image 40 x 40 pixels');
@@ -54 +54 @@
      echo $form->file('User.file'); 
      echo $form->error('User.file', 'Title is required.'); 
-   ?>
-  
-  <br /></fieldset>
-  <?php echo $form->end('Upload'); ?>
+     echo $form->end('Upload'); 
+  ?>
+</fieldset>
 
 <script type="text/javascript">

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

@@ -400 +400 @@
 
 .title_portal{ font-size:18pt; color:#30a6f0;font-weight:bold;font-family:Arial;margin:0;}
+
+/* Message by flash CakePHP stuff */
+.message
+{
+    position:absolute;
+    top:40px;
+    left:800px;
+    width:200px;
+    font-size:7pt;
+    font-weight:bold;
+    color:white;
+    border: solid 1px orange;
+    padding:2px;
+    background-color:#66cc00;
+    text-align:center;
+}