Changeset 308

Timestamp:

03/05/08 10:57:33 (10 months ago)

Author:

aarkerio

Message:

Small Update

Location:

trunk/app

Files:

• app_controller.php (modified) (1 diff)
• controllers/shares_controller.php (modified) (11 diffs)
• views/quotes/admin_edit.ctp (modified) (1 diff)
• views/shares/admin_listing.ctp (modified) (1 diff)

trunk/app/app_controller.php

@@ -20 +20 @@
      $this->Auth->loginError = 'Invalid e-mail / password combination. Please try again';
      $this->Auth->authorize = 'controller';  
-     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover', 'register', 'insert', 'vote') );
-
+     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover', 'register', 'insert', 'vote', 'download') );
+     $this->Auth->autoRedirect = true;
      $this->set('cU', $this->Auth->user());  // $cU current user array to use in the views if user logged
  }

trunk/app/controllers/shares_controller.php

@@ -6 +6 @@
 */ 
 
-
 uses('sanitize');
 
@@ -13 +12 @@
  public $helpers = array('Gags');
    
- public $components = array('Edublog', 'Portal');
+ public $components = array('Edublog', 'Portal', 'Adds');
  
  public function isAuthorized()
@@ -19 +18 @@
      if (isset($this->params[Configure::read('Routing.admin')]))
      {
-                                if ($this->Auth->user('group_id') != 1)
-                                     {
-                                                  return false;
-                                                            }
-                                                           }
-                                                              return true;
+           if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2)
+           {
+                     return true;
+           }
+     }
+     return false;
  }
                                                             
@@ -35 +34 @@
         $file            =  $this->Share->field('file', $conditions);
         
-        $this->redirect("/files/userfiles/".$file);
+        if (!$file)
+    {
+             $this->redirect('/');
+        }
+    else
+        {
+            $this->redirect("/files/userfiles/".$file);
+    }
   }
   
@@ -45 +51 @@
         $fields          = array("id", "file", "description", "secret");
         $order           = "id DESC";
-        $limit           = 20;
-        
-        $this->set('data', $this->Share->findAll($conditions, $fields, $order, $limit, null, true)); 
+        $limit           = 30;
+        
+        $this->set('data', $this->Share->findAll($conditions, $fields, $order, $limit)); 
 
         $this->layout = $this->Edublog->layout($user_id);
@@ -57 +63 @@
    === ADMIN METHOD ===
   **/
-    public function admin_listing()
-    {   
-        $this->pageTitle = $this->othAuth->user('username') . '\'s Shares';
+ public function admin_listing()
+ {   
+        $this->pageTitle = $this->Auth->user('username') . '\'s Shares';
         
         $this->layout = 'admin';
         
-        $conditions   = array("Share.user_id"=>$this->othAuth->user('id'));
+        $conditions   = array("Share.user_id"=>$this->Auth->user('id'));
         $fields       = array("id", "file", "description", "created", "secret", "public");
         $order        = "Share.id DESC";
@@ -74 +80 @@
  {    
     $this->layout    = 'admin';
-    $this->Subject   = new Subject;
-    $this->set('optionElements', $this->Subject->generateList(null, 'title'));
-    
+
     if (!empty($this->data["Share"]) && is_uploaded_file($this->data['Share']['file']['tmp_name']))
     {
@@ -84 +88 @@
     $this->Sanitize = new Sanitize;
     
-    $this->Sanitize->cleanArray($this->data["Share"]); //Hopefully this is enough
+    $this->Sanitize->clean($this->data["Share"]); //Hopefully this is enough
     
     /* SUBMITTED INFORMATION - use what you need
@@ -129 +133 @@
     }
     
-    $conditions  = array("user_id" =>  $this->othAuth->user('id'));
+    $conditions  = array("user_id" =>  $this->Auth->user('id'));
     
     $order       = "Share.id DESC";
@@ -146 +150 @@
     }
     
-    $Name        = $this->othAuth->user('username') . "_" . $next_id . '.'. $extension;
+    $Name        = $this->Auth->user('username') . "_" . $next_id . '.'. $extension;
     
     /** setup final file location and name */
@@ -172 +176 @@
    $this->data['Share']['file']     = $final_filename;
    $this->data['Share']['secret']   = $this->Adds->genPassword(15);
-   $this->data['Share']['user_id']  = $this->othAuth->user('id');
+   $this->data['Share']['user_id']  = $this->Auth->user('id');
    
    if ($this->Share->save($this->data["Share"]))

trunk/app/views/quotes/admin_edit.ctp

@@ -4 +4 @@
  echo $html->getCrumbs(' / ');
 
- echo $form->create('Quote', array('url' => 'quotes/admin_edit')); 
+ echo $form->create('Quote'); 
  echo $form->hidden('Quote.id');
 ?>

trunk/app/views/shares/admin_listing.ctp

@@ -1 @@
-<div class="title_section"><?php echo $othAuth->user('username'); ?>'s shared files</div>
+<div class="title_section"><?php echo $cU['User']['username']; ?>'s shared files</div>
 
-<?php echo $html->link($html->image('actions/new.png', array("alt"=>"Add new share", "title"=>"Add new share")), '#', array("onclick"=>"hU()"), false, false); ?></p>
-
-<?php $session->flash(); ?>
+<?php 
+echo $html->para(null, 
+                 $html->link(
+                             $html->image('actions/new.png', array('alt'=>'Add new share', 'title'=>'Add new share')), 
+                             '#', array('onclick'=>'hU()'), false, false
+                             )
+                 );
+ $session->flash();
+ ?></p>
 
 <div id="addshare" style="display:none">
   
-  <?php echo $html->formTag('/admin/shares/add/','post', array("enctype"=>"multipart/form-data") ); ?>
+  <?php echo $form->create('Share', array('type'=>'file', 'action'=>'admin_add') ); ?>
   <fieldset>
      <legend>Upload Share</legend>
      <?php 
-           echo $form->labelTag('Share/file', 'File:' );
-           echo $html->file('Share/file'); 
-           echo $html->tagErrorMsg('Share/file', 'Title is required.'); 
+           echo $form->label('Share.file', 'File:' );
+           echo $form->file('Share.file'); 
+           echo $form->error('Share.file', 'Title is required.'); 
 
-           echo $form->labelTag('Share/description', 'Description:' );
-           echo $html->input('Share/description', array("size"=>40)); 
-           echo $html->tagErrorMsg('Share/description', 'Title is required.'); 
-
-           echo $html->submit('Upload'); 
-     ?>
-</fieldset>
-</form>
+           echo $form->label('Share.description', 'Description:' );
+           echo $form->input('Share.description', array("size"=>40)); 
+           echo $form->error('Share.description', 'Title is required.'); 
+           echo '</fieldset>';
+           echo $form->end('Upload'); 
+    ?>
 </div>