Changeset 454

Timestamp:

05/29/10 19:09:34 (21 months ago)

Author:

aarkerio

Message:

Little changes

Location:

trunk

Files:

• controllers/entries_controller.php (modified) (3 diffs)
• controllers/news_controller.php (modified) (4 diffs)
• controllers/quicks_controller.php (modified) (5 diffs)
• controllers/themeblogs_controller.php (modified) (3 diffs)
• models/quick.php (modified) (2 diffs)
• models/themeblog.php (modified) (1 diff)
• views/entries/display.ctp (modified) (2 diffs)
• views/entries/view.ctp (modified) (1 diff)
• views/quicks/admin_listing.ctp (modified) (1 diff)
• views/quicks/voted.ctp (modified) (1 diff)
• views/themeblogs/admin_edit.ctp (modified) (1 diff)
• views/themeblogs/admin_listing.ctp (modified) (1 diff)
• views/users/admin_edit.ctp (modified) (1 diff)

trunk/controllers/entries_controller.php

@@ -9 +9 @@
  */
 # File: /app/controllers/images_controller.php
-
 
 App::import('Sanitize');
@@ -59 +58 @@
  public function display($username) 
  {
-  $this->pageTitle = $username . '\'s Blog';      
   $this->layout = 'blog';
   $this->Blog->setUserId($username); 
@@ -82 +80 @@
  {
   $this->layout    = 'blog';
-  $this->pageTitle = $username . '\'s Blog';
   $this->Blog->setUserId($username);   # set blog sidebars
   $user_id = $this->Blog->getUserId();

trunk/controllers/news_controller.php

@@ -193 +193 @@
  */
  public function admin_spam($new_id)
- {
- 
+ { 
   $status = 0;
   $this->News->id = (int) $new_id;
@@ -201 +200 @@
       $this->msgFlash(__('Noticia eliminada por SPAM', true),'/news/view');
   endif;
-
  }
 
@@ -230 +228 @@
   public function admin_edit($news_id = null)
   {
+    if ( !$this->Auth->user('id') ):
+        $this->redirect('/');
+        return False;
+    endif;
     $this->layout = 'admin';   
     $this->set('themes',Set::combine($this->News->Theme->find('all',array('order'=>'theme')),"{n}.Theme.id","{n}.Theme.theme"));
     if (!empty($this->data['News'])):       
-        $this->data['News']['user_id'] = (int) $this->Auth->user('id');      
+        $this->data['News']['user_id'] = (int) $this->Auth->user('id');
         if ($this->News->save($this->data)):
             if ($this->data['News']['end'] == 0 && !isset($this->data['News']['id'])):
@@ -275 +277 @@
  }
 }
-# ? >
+# ? > EOF

trunk/controllers/quicks_controller.php

@@ -73 +73 @@
                         );
       
-    $this->Quick->unbindAll();     
+    $this->Quick->contain();
    
     $params = array('fields' => array('Quick.id', 'Quick.title', 'Quick.reference'),
@@ -85 +85 @@
 
 /**
- * 
+ * Vote
  * @access public
  * @return void
@@ -101 +101 @@
       $this->data['QuicksVote']['vote']     = (int) $new_vote;
       $this->Quick->QuicksVote->save($this->data);
+      $params = array('conditions'=>array('quick_id'=>$quick_id));
+      $new_vote = $this->Quick->QuicksVote->find('count', $params);
       $this->set('votes', $new_vote);
       $this->set('karma',$karma);
@@ -260 +262 @@
         $this->data['Quick']['user_id'] = (int) $this->Auth->user('id');
             if ($this->Quick->save($this->data)):
-                 $this->msgFlash('Data saved', '/admin/quicks/listing'); 
+                $this->msgFlash('Data saved', '/admin/quicks/listing'); 
         else:
-                 $msg =implode('<br />',$this->Quick->validationErrors);
-                 $this->msgFlash($msg, '/admin/quicks/listing');
+                $msg =implode('<br />',$this->Quick->validationErrors);
+                $this->msgFlash($msg, '/admin/quicks/listing');
             endif;
     endif;
@@ -318 +320 @@
   }
 }
-# ? >
+# ? > EOF

trunk/controllers/themeblogs_controller.php

@@ -22 +22 @@
    $this->Auth->allow(array('display', 'vote'));
  }
- /** Admin section ***/  
+/**======= Admin section ===========0***/  
 /**
  * Listing
@@ -49 +49 @@
    if ( !empty($this->data['Themeblog']) ):
        if (  !isset($this->data['Themeblog']['id']) ):
-           $this->data['Themeblog']['user_id'] = (int)  $this->Auth->user('id');
+           $this->data['Themeblog']['user_id'] = (int) $this->Auth->user('id');
        endif;
        if ( $this->Themeblog->save($this->data) ):
+           #die(debug($this->data));
            $return = '/admin/themeblogs/listing';
            $this->msgFlash(__('Data saved', True), $return);   
@@ -67 +68 @@
 }
 
-# ? >
+# ? > EOF

trunk/models/quick.php

@@ -40 +40 @@
  public $validate = array(
   'title' => array(
-                    'rule'       => array('minLength', 4),
-                    'message'    => 'Title must be at least four characters long',
-                            'allowEmpty' => False,
-                    'required'   => True 
+                   'rule'       => array('minLength', 4),
+                   'message'    => 'Title must be at least four characters long',
+                           'allowEmpty' => False,
+                   'required'   => True 
                     ),
       
   'reference' => array(
                        array(
-               'rule'       => 'url',
-               'message'    => 'Does not look like a valid URL',
-                       'allowEmpty' => False,
-                       'required'   => True
+                   'rule'       => 'url',
+                   'message'    => 'Does not look like a valid URL',
+                           'allowEmpty' => False,
+                           'required'   => True
                              ) ,
-                       array(
-                             'rule' => 'isUnique',
-                             'message' => 'This URL has already been taken.'
+               array(
+                           'rule'       => 'isUnique',
+                   'message'    => 'This URL has already been taken.'
                        )
                     ),
   'user_id' => array(
-                     'rule'       => 'numeric',
-             'allowEmpty' => False,
-             'on' => 'create', # but not on update
-                     'required'   => true 
+                           'rule'       => 'numeric',
+                   'allowEmpty' => False,
+                   'on'         => 'create', # but not on update
+                   'required'   => true 
                      ),
   'theme_id' => array(
-                     'rule'       => 'numeric',
-                     'allowEmpty' => false,
-                     'on' => 'create', # but not on update
-                     'required'   => true 
+                   'rule'       => 'numeric',
+                   'allowEmpty' => False,
+                   'on'         => 'create', # but not on update
+                   'required'   => True 
                      )
    );
@@ -74 +74 @@
  public function validateUrl($data) 
  {
-   return (filter_var($data['reference'], FILTER_VALIDATE_URL)) ? true : false;
+   return (filter_var($data['reference'], FILTER_VALIDATE_URL)) ? True : False;
  }
 }
-# ? >
+# ? > EOF

trunk/models/themeblog.php

@@ -27 +27 @@
  */
 public $validate = array(
-                    'name' =>    array('rule'       => array('minLength', 4),
-                                       'message'    => 'Minimum 8 characters long',
-                                       'required'   => True,
-                                       'allowEmpty' => False),
-                    'descrip' => array('rule' => array('minLength', 4),
-                                       'message'    => 'Minimum 8 characters long',
-                                       'required'   => True,
-                                       'allowEmpty' => False),
-                    'image' =>   array('rule' => array('minLength', 4),
-                                       'message'    => 'Minimum 8 characters long',
+                    'title' =>    array('rule'      => array('minLength', 2),
+                                       'message'    => 'Minimum 2 characters long',
                                        'required'   => True,
                                        'allowEmpty' => False),
                     'user_id' => array('rule'       => 'numeric',
-                                      'allowEmpty' => False,
-                                      'required'   => True,
-                                      'on'         => 'create' 
+                                      'allowEmpty'  => False,
+                                      'required'    => True,
+                                      'on'          => 'create' # but not on update 
                                        )
    );
 }
-# ? >
+# ? > EOF

trunk/views/entries/display.ctp

@@ -1 +1 @@
 <?php
 #exit(debug($data));
-foreach ($data as $val):  $user_id   =  $val['Entry']['user_id'];
+$this->set('title_for_layout',  $blogger['User']['username'] . '\'s Blog');
+
+foreach ($data as $val):  
+    $user_id   =  $val['Entry']['user_id'];
     $link      =  '/entries/view/'.$blogger['User']['username'].'/'.$val['Entry']['id'];
     echo '<h3>'.$this->Html->link($val['Entry']['title'],$link,array('class'=>'title')) . '</h3>';
@@ -25 +28 @@
 $t .= $this->Html->div(null,$this->Paginator->counter(), array('style'=>'width:200px;float:center'));
 echo  $this->Html->div(null,$t, array('style'=>'font-size:9pt;width:400px;margin:15px auto;'));
-# ? >
+# ? > EOF

trunk/views/entries/view.ctp

@@ -1 +1 @@
 <?php
-#exit(debug($Element));
-    
+$this->set('title_for_layout',  $blogger['User']['username'] . '\'s Blog');
+
+#exit(debug($Element));    
 $discution =  $data['Entry']['discution'];
 $entry_id  =  $data['Entry']['id'];

trunk/views/quicks/admin_listing.ctp

@@ -1 +1 @@
 <?php
-  echo $this->Html->div('title_section','Quick News');
-  echo $this->Html->para(null, $this->Html->link($this->Html->image('admin/new.gif', array('alt'=>'Add new', 'title'=>'Add new')), '#', 
+echo $this->Html->div('title_section','Quick News');
+echo $this->Html->para(null, $this->Html->link($this->Html->image('admin/new.gif', array('alt'=>'Add new', 'title'=>'Add new')), '#', 
                                                  array('onclick'=>'hU()', 'escape'=>False))); 
- echo $this->Html->div(Null, Null, array('style'=>'text-align:left;display:none;width:100%', 'id'=>'trh'));
- echo $this->Form->create('Quick'); 
+echo $this->Html->div(Null, Null, array('style'=>'text-align:left;display:none;width:100%', 'id'=>'trh'));
+echo $this->Form->create('Quick', array('action'=>'add')); 
 ?>
  <fieldset>
     <legend>Add Quick new</legend>
 <?php 
-   echo $this->Form->input('Quick.title', array('size'=>40, 'maxlength'=>100));
-   echo $this->Form->input('Quick.reference', array('size'=>70, 'maxlength'=>300, 'value'=>'http://'));
-   echo $this->Form->select('Quick.theme_id', array('options'=>$themes));
-   echo $this->Form->end('Send'); 
+ echo $this->Form->input('Quick.title', array('size'=>40, 'maxlength'=>100));
+ echo $this->Form->input('Quick.reference', array('size'=>70, 'maxlength'=>300, 'value'=>'http://'));
+ echo $this->Form->input('Quick.theme_id', array('options'=>$themes));
+ echo $this->Form->end('Send'); 
 ?>
 </fieldset>

trunk/views/quicks/voted.ctp

@@ -3 +3 @@
   $down = $karma == 'down' ? 'adownmod.gif' : 'adowngray.gif';
   echo $this->Html->image('static/'.$up,array('alt'=>'Vote')).$this->Html->div('score',$votes).$this->Html->image('static/'.$down,array('alt'=>'Vote'));
-?>
+# ? > EOF

trunk/views/themeblogs/admin_edit.ctp

@@ -1 +1 @@
 <?php
-  echo $this->Form->create('Themeblog', array('action'=>'edit')); 
-  echo $this->Form->input('Themeblog.id', array('type' => 'hidden'));
+$this->Html->addCrumb('Control Tools', '/admin/entries/start');  
+$this->Html->addCrumb('Entries', '/admin/themeblogs/listing'); 
+echo $this->Html->getCrumbs(' > ');
+
+echo $this->Form->create('Themeblog', array('action'=>'edit')); 
+ echo $this->Form->input('Themeblog.id', array('type' => 'hidden'));
 ?>
 <fieldset>

trunk/views/themeblogs/admin_listing.ctp

@@ -13 +13 @@
   echo "</fieldset></div>";
 
-  echo$gags->ajaxDiv('container', array('style'=>'border:1px dotted green;padding:8px;width:600px'));
+  echo $gags->ajaxDiv('container', array('style'=>'border:1px dotted green;padding:8px;width:600px'));
   foreach ($data as $val):
       echo $this->Html->div(null);

trunk/views/users/admin_edit.ctp

@@ -13 +13 @@
 ?>
 <fieldset>
-<?php
- 
+<?php 
   echo '<legend>'.$session->read('Auth.User.username') .'\'s '.__('profile', true).'</legend>';
   echo $this->Html->div(null, '<b>'.$this->data['User']['email'].'</b>');