Changeset 557

Timestamp:

05/23/08 16:39:28 (6 months ago)

Author:

aarkerio

Message:

Shares improved

Location:

trunk/app

Files:

• controllers/shares_controller.php (modified) (6 diffs)
• views/shares/display.ctp (modified) (1 diff)
• views/shares/download.ctp (added)
• webroot/img/static/shares-icon.png (added)

trunk/app/controllers/shares_controller.php

@@ -23 +23 @@
  {             
         $this->pageTitle = 'Share';
-        
+        $this->layout    = 'ajax';
         $conditions      = array("Share.secret"=>$secret, "Share.public"=>1);
         
         $file            =  $this->Share->field('file', $conditions);
         
-        if (!$file)
-    {
-             $this->redirect('/');
-        }
-    else
-        {
-            $this->redirect("/files/userfiles/".$file);
-    }
+        if (!$file):
+              $this->redirect('/');
+    else:
+             $this->set('file', 'files/userfiles/'.$file);
+    endif;
   }
   
@@ -106 +103 @@
     
     /** Security: checks to see if file is an image, if not do not allow upload ==*/
-    if ( $type == "application/x-php") // .php is not a valid file!!! 
-    {   
-        $ErrMsg  = "<h1>ERROR</h1> the file ". $file_name . " is not valid.<br>";
-        $ErrMsg .= "<p>no se pueden agregar archivos .php, subelo como .txt<br /><br />";
-    $ErrMsg .= '<a href="upload_1.php"> &gt;&gt; Regresar </a>';
+    if ( $type == "application/x-php"): // .php is not a valid file!!!    
+        $msg = 'Error the file '. $file_name . ' is not valid. No se pueden agregar archivos .php, subelo como .txt';
         /**  delete uploaded file ==*/
         unlink($file);
-        exit($ErrMsg);
-    }
-    
-    if ( $file_size > $maxfilesize) 
-    {
-     $ErrMsg  = "<h1>ERROR</h1> The image is too big.<br>";
-         $ErrMsg .= "<p>Bigger than 30 MB <br><br>";
-         $ErrMsg .= "The current size: " . $file_size ."</p>\n";
+        $this->flash($msg, '/admin/shares/listing');
+        return false;
+    endif;
+    
+    if ( $file_size > $maxfilesize):
+     $msg  = 'Error. The image is too big. Bigger than 30 MB. The current size: ' . $file_size ;
         
-        /** delete uploaded file */
+        /**  delete uploaded file ==*/
         unlink($file);
-        exit($ErrMsg);
-    }
+        $this->flash($msg, '/admin/shares/listing');
+        return false;
+    endif;
     
     $conditions  = array("user_id" =>  $this->Auth->user('id'));
@@ -139 +132 @@
     $allowed     = array("pdf", "doc", "xls", "xcf", "ppt", "sxw", "odt", "odc", "ods", "odp", "abw", "html", "zip", "rar", "gz", "png", "jpg", "gif", "svg", "mp3", "ogg", "flac", "txt");
     
-    if ( !in_array($extension, $allowed) )
-    {
-    die("This does not look like one allowed file ". $extension);
-    }
+    if ( !in_array($extension, $allowed) ):
+            die("This does not look like one allowed file ". $extension);
+    endif;
     
     $Name        = $this->Auth->user('username') . "_" . $next_id . '.'. $extension;
@@ -153 +145 @@
     
     /** do extra security check to prevent malicious abuse */
-    if (is_uploaded_file($file))
-    {
+    if (is_uploaded_file($file)):
        /** move file to proper directory ==*/
-       if (!move_uploaded_file($file, $newfile))
-       {
+      if (!move_uploaded_file($file, $newfile)):
           /** if an error occurs the file could not
                be written, read or possibly does not exist ==*/
          
          exit('Error Uploading File.');
-       }
-   }
+       endif;
+    endif;
   
     
@@ -172 +162 @@
    $this->data['Share']['user_id']  = $this->Auth->user('id');
    
-   if ($this->Share->save($this->data["Share"]))
-   {
-       $this->msgFlash('File saved','/admin/shares/listing');
-   }
- }
-
+   if ($this->Share->save($this->data["Share"])):
+        $this->msgFlash('File saved','/admin/shares/listing');
+   endif;
+  }
  }
 
@@ -187 +175 @@
      $this->data['Share']['id']     = $id;
      
-     if ($this->Share->save($this->data['Share']))
-     {
+     if ($this->Share->save($this->data['Share'])):
            $this->msgFlash('Share changed', '/admin/shares/listing');
-     }
+     endif;
  }
  public function admin_delete($id) 

trunk/app/views/shares/display.ctp

@@ -1 @@
-<div style="font-size:18pt;padding:5px;boder:1px solid #c0c0c0"> <?php echo $blog["User"]["username"]; ?>'s Files</div>
 <?php
 //die(print_r($data));
-if ( count($data) < 1)
-{
+
+echo $html->div(null, $blog['User']['username'] . '\'s Files', array('style'=>'font-size:18pt;padding:5px;boder:1px solid #c0c0c0'));
+
+if ( count($data) < 1):
   echo $html->para('title', 'Teacher does not have any resource'); 
-}
+endif;
 
-foreach ($data as $v)
-{
-  echo '<div style="padding:6px;margin:4px;height:30px;border:1px dotted orange;vertical-align:middle;">';
-  echo  $html->link($v["Share"]["description"], '/shares/download/'.$v["Share"]["secret"]);
-  echo  $html->link($html->image('static/button_download.gif', array("alt"=>$v["Share"]["description"], "alt"=>$v["Share"]["description"])), '/shares/show/'.$v["Share"]["secret"], null, null, false); 
-  echo '</div>'; 
-}
+foreach ($data as $v):
+  $tmp  = $html->link($html->image('static/shares-icon.png', array('alt'=>'Download', 'title'=>'Download')),'/shares/download/'.$v["Share"]["secret"], null, null, false).'<br />';
+  $tmp .= $html->link($v["Share"]["description"], '/shares/download/'.$v["Share"]["secret"]);
+  $tmp .= $html->link($html->image('static/button_download.gif', array("alt"=>$v["Share"]["description"], "alt"=>$v["Share"]["description"])), '/shares/download/'.$v["Share"]["secret"], null, null, false); 
+
+  echo $html->div(null,$tmp,array('style'=>'padding:6px;margin:4px;border:1px dotted orange;vertical-align:middle;width:90%;')); 
+endforeach;
 ?>