Changeset 327

Show
Ignore:
Timestamp:
03/19/08 21:33:28 (10 months ago)
Author:
aarkerio
Message:

Deleting othAuth

Location:
trunk/app
Files:
1 removed
15 modified

Legend:

Unmodified
Added
Removed

  • trunk/app/controllers/answers_controller.php

    r302 r327  
    4040        $this->Sanitize->cleanArray($this->data["Answer"]); 
    4141         
    42         $this->data["Answer"]['user_id'] = $this->othAuth->user('id'); 
     42        $this->data["Answer"]['user_id'] = $this->Auth->user('id'); 
    4343 
    4444        $this->Answer->create(); 
    … …  
    8787        $this->layout    = 'ajax'; 
    8888         
    89         $conditions = array("Answer.user_id"=>$this->othAuth->user('id'), "Answer.question_id"=>$question_id); 
     89        $conditions = array("Answer.user_id"=>$this->Auth->user('id'), "Answer.question_id"=>$question_id); 
    9090         
    9191        $fields     = array("Answer.id", "Answer.user_id", "Answer.correct"); 
    … …  
    104104        $this->pageTitle = 'Answers'; 
    105105         
    106         $conditions = array("Answer.user_id"=>$this->othAuth->user('id'), "Answer.id"=>$test_id); 
     106        $conditions = array("Answer.user_id"=>$this->Auth->user('id'), "Answer.id"=>$test_id); 
    107107         
    108108        $fields     = array("Answer.id", "Answer.user_id", "Answer.title", "Answer.description"); 

  • trunk/app/controllers/categories_controller.php

    r247 r327  
    88uses('sanitize'); 
    99 
    10  
    1110class CategoriesController extends AppController 
    1211{ 
    13     public $helpers       = array('Ajax'); 
     12 public $helpers       = array('Ajax'); 
    1413     
    15     public $displayField = 'Blog'; 
     14 public $displayField = 'Blog'; 
    1615     
    17   public function isAuthorized()  
    18   { 
     16 public function isAuthorized()  
     17 { 
    1918    if ($this->action == 'delete')  
    20       { 
    21     if ($this->Auth->user('group_id') == 1)  
    22           { 
     19    { 
     20    if ($this->Auth->user('group_id') == 1 )  
     21        { 
    2322        return true; 
    24           } else { 
     23        }  
     24    else  
     25    { 
    2526        return false; 
    26           } 
    27       } 
     27        } 
     28    } 
    2829  
    2930    return true; 
    … …  
    4647       $this->layout    = 'popup'; 
    4748        
    48        $conditions = array("Category.user_id" => $this->othAuth->user('id')); 
     49       $conditions = array("Category.user_id" => $this->Auth->user('id')); 
    4950        
    5051       $data = $this->Category->findAll($conditions, $order); 
    … …  
    5556 
    5657    
    57    public function add() 
     58   public function admin_add() 
    5859   { 
    5960    
    … …  
    6768     if ($this->Category->save($this->params['data'])) 
    6869     {  
    69           $conditions = array("user_id" => $this->othAuth->user('id')); 
     70          $conditions = array("user_id" => $this->Auth->user('id')); 
    7071           
    71               $this->set('data', $this->Category->findAll($conditions)); 
     72          $this->set('data', $this->Category->findAll($conditions)); 
    7273           
    73               $this->render('todo', 'ajax'); 
    74            
    75      } else { 
     74          $this->render('todo', 'ajax');   
     75     }  
     76     else  
     77     { 
    7678           
    7779          $this->flash('Database error!', '/entries/listing'); 
    … …  
    8082  } 
    8183   
    82   public function edit($id = null) 
     84  public function admin_edit($id = null) 
    8385  { 
    8486     $this->layout    = 'admin'; 
    … …  
    101103   
    102104   
    103   public function delete($id) 
    104     { 
     105  public function admin_delete($id) 
     106  { 
    105107        // deletes category from DBKARAMELO database 
    106108        $this->Category->del($id); 
    107109     
    108     $conditions = array("user_id" => $this->othAuth->user('id')); 
     110                $conditions = array("user_id" => $this->Auth->user('id')); 
    109111     
    110112        $this->set('data', $this->Category->findAll($conditions)); 

  • trunk/app/controllers/galleries_controller.php

    r247 r327  
    8585      $this->Sanitize = new Sanitize; 
    8686       
    87       $this->Sanitize->cleanArray($this->data["Gallery"]); //Hopefully this is enough 
     87      $this->Sanitize->clean($this->data["Gallery"]); //Hopefully this is enough 
    8888       
    8989      /** Database stuff  **/ 
    9090       
    91       $this->data['Gallery']['user_id'] = $this->othAuth->user('id'); 
     91      $this->data['Gallery']['user_id'] = $this->Auth->user('id'); 
    9292       
    9393      $this->Gallery->create(); 

  • trunk/app/controllers/groups_controller.php

    r247 r327  
    4949        $this->Sanitize->cleanArray($this->data["Group"]);  
    5050 
    51         $this->data["Group"]["user_id"] = $this->othAuth->user('id'); 
     51        $this->data["Group"]["user_id"] = $this->Auth->user('id'); 
    5252        
    5353        $this->Group->create(); 

  • trunk/app/controllers/medias_controller.php

    r247 r327  
    109109       $this->layout    = 'admin'; 
    110110        
    111        $conditions = array("Media.user_id"=>$this->othAuth->user('id')); 
     111       $conditions = array("Media.user_id"=>$this->Auth->user('id')); 
    112112        
    113113       $fields     = array("id", "file", "user_id", "size", "created", "status"); 
    … …  
    210210    $next_id = $this->get_sequence(); 
    211211     
    212       $user_file_name   = $this->othAuth->user('username') . "_media_" .  $next_id .$extension; 
     212      $user_file_name   = $this->Auth->user('username') . "_media_" .  $next_id .$extension; 
    213213       
    214214    //die($user_file_name); 
    … …  
    227227   /** Database stuff  **/ 
    228228    
    229    $this->params['data']['Media']['user_id']   =   $this->othAuth->user('id'); 
     229   $this->params['data']['Media']['user_id']   =   $this->Auth->user('id'); 
    230230   $this->params['data']['Media']['file']      =   $user_file_name; 
    231231   $this->params['data']['Media']['size']      =   $file_size; 
    … …  
    249249    $field       = "Media.id"; 
    250250     
    251     $conditions  = array("user_id" => $this->othAuth->user('id')); 
     251    $conditions  = array("user_id" => $this->Auth->user('id')); 
    252252     
    253253    $order       = "Media.id DESC"; 

  • trunk/app/controllers/messages_controller.php

    r279 r327  
    4848     $this->Sanitize->cleanArray($this->data["Message"]); 
    4949          
    50          $this->data["Message"]["sender"] = $this->othAuth->user('id');  
     50         $this->data["Message"]["sender"] = $this->Auth->user('id');  
    5151          
    5252         $this->Message->create(); 
    … …  
    8888   /**  if (!empty($this->data["Message"])) 
    8989    {      
    90         $this->data["Message"]['Message']['sender'] = $othAuth->user('id');  
     90        $this->data["Message"]['Message']['sender'] = $Auth->user('id');  
    9191         
    9292        $this->Sanitize = new Sanitize; 
    … …  
    102102 } 
    103103 
    104 /*** 
    105 ==== ADMIN  METHODS 
    106 ***/ 
     104/*** ==== ADMIN  METHODS   ***/ 
    107105 
    108106 public function admin_listing() 
    … …  
    111109      $this->pageTitle = 'Messages'; 
    112110       
    113       $conditions      = array("user_id" => $this->othAuth->user('id')); 
     111      $conditions      = array("user_id" => $this->Auth->user('id')); 
    114112      $fields          = array("id", "title", "body", "created", "sender"); 
    115113      $order           = "title DESC"; 

  • trunk/app/controllers/newsletters_controller.php

    r278 r327  
    8080       $this->Sanitize->cleanArray($this->data["Newsletter"]); 
    8181                
    82        $this->data["Newsletter"]['user_id'] = $this->othAuth->user('id'); 
     82       $this->data["Newsletter"]['user_id'] = $this->Auth->user('id'); 
    8383     
    8484       $this->Newsletter->create(); 
    … …  
    160160       $this->Sanitize->html($this->data["Newsletter"]["body"]); 
    161161                
    162        $this->data["Newsletter"]['user_id'] = $this->othAuth->user('id'); 
     162       $this->data["Newsletter"]['user_id'] = $this->Auth->user('id'); 
    163163     
    164164       $this->Newsletter->create(); 
    … …  
    177177  public function admin_listing() 
    178178  {    
    179         $this->pageTitle = $this->othAuth->user('username') . '\'s News'; 
     179        $this->pageTitle = $this->Auth->user('username') . '\'s News'; 
    180180         
    181181        $this->layout = 'admin'; 

  • trunk/app/controllers/podcasts_controller.php

    r321 r327  
    6262    public function admin_listing() 
    6363    {    
    64         $this->pageTitle = $this->othAuth->user('username') . '\'s Podcasts'; 
     64        $this->pageTitle = $this->Auth->user('username') . '\'s Podcasts'; 
    6565         
    6666        $this->layout = 'admin'; 
    6767         
    68         $conditions   = array("Podcast.user_id"=>$this->othAuth->user('id')); 
     68        $conditions   = array("Podcast.user_id"=>$this->Auth->user('id')); 
    6969        $fields       = array("id", "title", "description", "created", "length"); 
    7070        $order        = "Podcast.id DESC"; 
    … …  
    137137    $field       = "id"; 
    138138     
    139     $conditions  = array("user_id" =>  $this->othAuth->user('id')); 
     139    $conditions  = array("user_id" =>  $this->Auth->user('id')); 
    140140     
    141141    $order       = "Podcast.id DESC"; 
    … …  
    152152    } 
    153153     
    154      $Name        = $this->othAuth->user('username') . "_" . $next_id . '.'. $extension; 
     154     $Name        = $this->Auth->user('username') . "_" . $next_id . '.'. $extension; 
    155155      
    156156    /** setup final file location and name */ 

  • trunk/app/controllers/polls_controller.php

    r247 r327  
    9292{ 
    9393     
    94     if (empty($this->data["Poll"])) 
     94    if (empty($this->data['Poll'])) 
    9595    { 
    9696        $this->layout = 'admin'; 
    … …  
    9999               
    100100        $this->data = $this->Poll->read(); 
    101          
    102         //die(print_r($this->data)); 
    103101    } 
    104102    else 
    … …  
    106104        $this->Sanitize = new Sanitize; 
    107105         
    108         $this->Sanitize->cleanArray($this->data); 
     106        $this->Sanitize->clean($this->data); 
    109107         
    110108        if ($this->Poll->save($this->data["Poll"])) 

  • trunk/app/controllers/questions_controller.php

    r247 r327  
    3737        $this->Sanitize = new Sanitize; 
    3838         
    39         $this->Sanitize->cleanArray($this->data["Question"]); 
     39        $this->Sanitize->clean($this->data['Question']); 
    4040         
    41         $this->data["Question"]['user_id'] = $this->othAuth->user('id'); 
     41        $this->data["Question"]['user_id'] = $this->Auth->user('id'); 
    4242 
    4343        $this->Question->create(); 
    … …  
    9494        $this->pageTitle = 'Questions'; 
    9595         
    96         $conditions = array("Question.user_id"=>$this->othAuth->user('id')); 
     96        $conditions = array("Question.user_id"=>$this->Auth->user('id')); 
    9797         
    9898        $fields     = array("Question.id", "Question.user_id", "Question.title", "Question.description"); 
    … …  
    109109        $this->pageTitle = 'Questions'; 
    110110         
    111         $conditions = array("Question.user_id"=>$this->othAuth->user('id'), "Question.id"=>$test_id); 
     111        $conditions = array("Question.user_id"=>$this->Auth->user('id'), "Question.id"=>$test_id); 
    112112         
    113113        $fields     = array("Question.id", "Question.user_id", "Question.title", "Question.description"); 
    … …  
    124124        $this->pageTitle = 'Answers'; 
    125125         
    126         $conditions = array("Question.user_id"=>$this->othAuth->user('id'), "Question.id"=>$question_id); 
     126        $conditions = array("Question.user_id"=>$this->Auth->user('id'), "Question.id"=>$question_id); 
    127127         
    128128        $this->set('data', $this->Question->find($conditions)); 

  • trunk/app/controllers/themeblogs_controller.php

    r247 r327  
    3030       $this->layout = 'popup'; 
    3131        
    32        $conditions   = array("Themeblog.user_id" => $this->othAuth->user('id')); 
     32       $conditions   = array("Themeblog.user_id" => $this->Auth->user('id')); 
    3333        
    3434       $order        = "Themeblog.title"; 
    … …  
    4646        $this->Sanitize->cleanArray($this->params['data']); //Hopefully this is enough 
    4747         
    48         $this->params['data']["Themeblog"]["user_id"] = $this->othAuth->user('id'); 
     48        $this->params['data']["Themeblog"]["user_id"] = $this->Auth->user('id'); 
    4949         
    5050        if ($this->Themeblog->save($this->params['data'])) 
    5151        {    
    52             $conditions = array("user_id" => $this->othAuth->user('id')); 
     52            $conditions = array("user_id" => $this->Auth->user('id')); 
    5353             
    5454        $this->set('data', $this->Themeblog->findAll($conditions, null, "title")); 
    … …  
    112112     $this->Themeblog->del($id); 
    113113      
    114      $conditions = array("user_id" => $this->othAuth->user('id')); 
     114     $conditions = array("user_id" => $this->Auth->user('id')); 
    115115      
    116116     $this->set('data', $this->Themeblog->findAll($conditions, null, "title")); 

  • trunk/app/controllers/treasures_controller.php

    r302 r327  
    8181 public function admin_listing() 
    8282 {    
    83         $this->pageTitle = $this->othAuth->user('username') . '\'s Treasures'; 
     83        $this->pageTitle = $this->Auth->user('username') . '\'s Treasures'; 
    8484         
    8585        $this->layout = 'admin'; 
    8686         
    87         $conditions   = array("Treasure.user_id"=>$this->othAuth->user('id')); 
     87        $conditions   = array("Treasure.user_id"=>$this->Auth->user('id')); 
    8888        $fields       = array("id", "title", "created", "status"); 
    8989        $order        = "Treasure.id DESC"; 
    … …  
    105105          $this->Sanitize->html($this->data["Treasure"]["instructions"]); 
    106106          
    107           $this->data["Treasure"]["user_id"] = $this->othAuth->user('id'); 
     107          $this->data["Treasure"]["user_id"] = $this->Auth->user('id'); 
    108108 
    109109          $this->Treasure->create(); 

  • trunk/app/controllers/users_controller.php

    r323 r327  
    458458    if (empty($this->data)) 
    459459    { 
    460         $this->User->id = $this->othAuth->user('id'); 
     460        $this->User->id = $this->Auth->user('id'); 
    461461        $this->data = $this->User->read(); 
    462462    } 
    … …  
    484484       $this->layout  = 'admin'; 
    485485        
    486        $conditions    = null; //array("Entry.user_id"=>$this->othAuth->user('id')); 
     486       $conditions    = null; //array("Entry.user_id"=>$this->Auth->user('id')); 
    487487        
    488488       if ($order == null) 
    … …  
    506506       $this->layout  = 'admin'; 
    507507        
    508        $conditions    = array("User.id"=>$this->othAuth->user('id')); 
     508       $conditions    = array("User.id"=>$this->Auth->user('id')); 
    509509 
    510510       $this->User->unbindModel(array('hasMany' => array('Confirm'))); 
    … …  
    633633    $extension   = $this->get_extension($type); 
    634634     
    635     $Name        = $this->othAuth->user('username') . "_avatar" . $extension; 
     635    $Name        = $this->Auth->user('username') . "_avatar" . $extension; 
    636636     
    637637    /** setup final file location and name */ 
    … …  
    648648       { 
    649649          /** if an error occurs the file could not be written, read or possibly does not exist */ 
    650           die($this->flash('Error Uploading File.', '/users/edit/'.$this->othAuth->user('id'))); 
     650          die($this->flash('Error Uploading File.', '/users/edit/'.$this->Auth->user('id'))); 
    651651       } 
    652652   } 
    … …  
    658658   if ($this->User->save($this->data)) 
    659659    { 
    660            $this->redirect('/admin/users/edit/'. $this->othAuth->user('id')); 
     660           $this->redirect('/admin/users/edit/'. $this->Auth->user('id')); 
    661661    } 
    662662     

  • trunk/app/controllers/webquests_controller.php

    r302 r327  
    8787 public function admin_listing() 
    8888 {     
    89       $this->pageTitle = $this->othAuth->user('username') . '\'s Webquests'; 
     89      $this->pageTitle = $this->Auth->user('username') . '\'s Webquests'; 
    9090       
    9191      $this->layout = 'admin'; 
    9292       
    93       $conditions   = array("Webquest.user_id"=>$this->othAuth->user('id')); 
     93      $conditions   = array("Webquest.user_id"=>$this->Auth->user('id')); 
    9494      $fields       = array("Webquest.id", "Webquest.title", "Webquest.status", "Webquest.created"); 
    9595      $order        = "Webquest.id DESC"; 
    … …  
    116116         $this->Sanitize->paranoid($this->data["Webquest"]["title"]);  
    117117 
    118          $this->data["Webquest"]["user_id"] = $this->othAuth->user('id'); 
     118         $this->data["Webquest"]["user_id"] = $this->Auth->user('id'); 
    119119          
    120120         $this->Webquest->create(); 

  • trunk/app/views/forums/display.ctp

    r325 r327  
    11<?php 
    22//die(print_r($data)); 
    3 echo $html->para(null, 'Foro: '. $html->link($data["Catforum"]["title"], '/catforums/display/'.$blog["User"]["username"].'/'.$blog["User"]["id"].'/'.$data["Catforum"]["id"])); 
     3echo $html->para(null,  
     4                 'Foro: '.$html->link($data["Catforum"]["title"],  
     5                    '                 /catforums/display/'.$blog["User"]["username"].'/'.$blog["User"]["id"].'/'.$data["Catforum"]["id"] 
     6                                      ) 
     7               ); 
    48 
    59 echo '<div style="padding:6px;border:1px dotted gray;margin:15px 0 15px 0">'; 
    … …  
    711    echo '<span ="font-size:pt">'. $data["Forum"]["description"] . "</span>";        
    812    echo '<div style="width:100px;margin-top:15px">'; 
    9     echo $html->link($html->image('static/new_post.gif', array("alt"=>"Add new topic", "title"=>"Add new topic")),  
     13 
     14    echo $html->div('space',  
     15                    $html->link($html->image('static/new_post.gif', array("alt"=>"Add new topic", "title"=>"Add new topic")),  
    1016                      '/topics/add/'.$blog["User"]["username"].'/'.$data["Forum"]["id"],  
    11                       null, null, false); 
    12     echo '</div>'; 
     17                      null, null, false) 
     18              ); 
     19   
    1320          
    1421    //Topics