Changeset 340

Timestamp:

02/27/10 15:20:15 (2 years ago)

Author:

aarkerio

Message:

News controller improved

Location:

trunk

Files:

• app_controller.php (modified) (1 diff)
• controllers/users_controller.php (modified) (2 diffs)
• models/user.php (modified) (1 diff)
• views/elements/new.ctp (modified) (4 diffs)
• views/helpers/gags.php (modified) (3 diffs)
• views/layouts/portal.ctp (modified) (4 diffs)
• views/pages/display.ctp (modified) (1 diff)
• views/users/admin_edit.ctp (modified) (1 diff)

trunk/app_controller.php

@@ -23 +23 @@
 
  # allowed characters in paranoid Sanitize
- public $para_allowed = array('.', ',', '-','_','@',' ','(', ')',"+","\n", "/", "ñ", "á", "é", "í", "ó", "ú", "Á", "É", "Í", "Ó", "Ú", '"',"'", "?", ";", ":");
+ public $para_allowed = array('.', ',', '-','_','@',' ','(', ')',"+","\n", "/", "ñ", "á", "é", "í", "ó", "ú", "Á", "É", "Í", "Ó", "Ú", '"',"'","¿" ,"?", ";", ":");
  # Use :  Sanitize::paranoid($this->data['Model']['title'], $this->para_allowed);
 

trunk/controllers/users_controller.php

@@ -196 +196 @@
         #die(debug( $this->data['User']));
         unset($this->data['User']['username']); #do not save this
-        unset($this->data['User']['email']);
+      #  unset($this->data['User']['email']);
+  // if($this->User->validates())
+  //{
         if ($this->User->save($this->data)):
             $this->msgFlash('Profile has been saved','/admin/users/edit/');
@@ -202 +204 @@
              die(debug($this->User->validationErrors));
         endif;
-  endif;   
+ 
+        //}
+        //else
+        //{
+
+    //debug($this->User->validationErrors);
+        //}
+ endif;   
  }
 

trunk/models/user.php

@@ -69 +69 @@
   'email' => array(
                               array(
-                            'rule'       => array('minLength', 8),
-                            'message'    => 'Email must be at least 8 characters long',
-                                'allowEmpty' => false,
-                            'on'         => 'create', // but not on update
+                            'rule'       => array('email'),
+                            'message'    => 'Please supply a valid email address.',
+                                'allowEmpty' => false, // but not on update
                                     'required'   => true
                                          ),

trunk/views/elements/new.ctp

@@ -3 +3 @@
 echo $html->div('titnew');
 echo $html->div('img_new',$html->link(
-                      $html->image('themes/'.$val['Theme']['img'], array('style'=>'height:35px;border:1px solid white;','alt'=>$val['Theme']['theme'], 'title'=>$val['Theme']['theme'])), 
-                           '/news/category/' .$val['News']['theme_id'], 
-                      null, null, false));
-//--SI ES ESPAM
+                      $html->image('themes/'.$val['Theme']['img'], array('style'=>'height:35px;border:1px solid white;','alt'=>$val['Theme']['theme'], 'title'=>$val['Theme']['theme'])),  '/news/category/' .$val['News']['theme_id'], Null, False, False));
+# --SI ES ESPAM
 if ($session->read('Auth.User.group_id')=='1'):
  echo  $html->link($html->image('images/nospam.png', array('style'=>'height:22px; border:1px solid white','width'=>'22px', 'alt'=>'NoSpam', 'title'=>'NoSpam')), '/admin/news/spam/'.$val['News']['id'],null, null, false); 
@@ -30 +28 @@
      $down = $h['vote']  < 0  ? 'adownmod.gif' : 'adowngray.gif';
      echo $html->image('static/'.$up,array('alt'=>'Vote')).$html->div('score',$votes).$html->image('static/'.$down,array('alt'=>'Vote'));
-elseif( !$already && $session->read('Auth.User')): 
+ elseif ( !$already && $session->read('Auth.User')):
      echo $ajax->link($html->image('static/aupgray.gif', array('alt'=>'Vote')), '/quicks/vote/up/'.$q['Quick']['id'],
                    array('update'   => $ajax_update,
@@ -68 +66 @@
  ?>
  <br /><br />
- <b>Reference:</b>
- <?php echo $html->link(
-                        $html->image('admin/newwindow.gif', array('alt'=>"Abre Ventana", 'title'=>"Abre Ventana")),
-                        $val['News']['reference'],
-                        array("onclick"=>"window.open(this.href,'_help','status,scrollbars,resizable,width=800,height=600,left=10,top=10,menubar,toolbar')"), 
-                        null, 
-                        null, 
-                        false). "&nbsp;";
+<?php
+if ( strlen($val['News']['reference'])  > 10) :
+   echo $html->para(null, __('Reference', true). ' ' .$html->link(
+                           $html->image('admin/newwindow.gif', array('alt'=>'Open new window', 'title'=>'Open new window')),
+                           '#new'.$val['News']['id'],
+                           array('onclick'=>"window.open('".h($val['News']['reference'])."', '_help', 'status,scrollbars,resizable,width=800,height=600,left=10,top=10,menubar,toolbar')"), Null, False, False));
+endif;    
                           
 if ( $frontend == True):    
-   if ( $val['News']['comments'] == 1 ):  // comments enabled
+   if ( $val['News']['comments'] == 1 ):  # comments enabled
       $num_coment = count($val['Comentnews']);
       if ( $num_coment > 0 ):
@@ -89 +86 @@
 
  else: # showin permalink
-   if ( $data['News']['comments'] == 1 ):  // comments are enabled
+   if ( $data['News']['comments'] == 1 ):  # comments are enabled
         $i = 1;
         echo $html->div('cnews');
         foreach($val['Comentnews'] as $v):
               $bg = ($i%2==0) ? '#e2e2e2' : '#fff';
-              if ( $v['user_id'] != 0 ):   // 0 = anonymous comment
+              if ( $v['user_id'] != 0 ):   # 0 = anonymous comment
                           $avatar = $html->image('avatars/'.$v['User']['avatar'], 
                             array('alt'=>$v['User']['username'], 'title'=>$v['User']['username'],  'height'=>20, 'width'=>20));

trunk/views/helpers/gags.php

@@ -73 +73 @@
                      google_color_border = "FFFFFF";
                      google_color_bg = "FFFFFF";
-                     google_color_link = "b70909";
+                     google_color_link = "177477";
                      google_color_text = "000000";
-                     google_color_url = "b70909";
+                     google_color_url = "177477";
                      //-->
                      </script>
@@ -104 +104 @@
        google_color_border = "FFFFFF";
        google_color_bg = "FFFFFF";
-       google_color_link = "b70909";
+       google_color_link = "177477";
        google_color_text = "000000";
-       google_color_url = "b70909";
+       google_color_url = "177477";
        //--></script>
        <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
@@ -124 +124 @@
         google_color_border = "FFFFFF";
         google_color_bg = "FFFFFF";
-        google_color_link = "b70909";
+        google_color_link = "177477";
         google_color_text = "000000";
-        google_color_url = "b70909";
+        google_color_url = "177477";
         //-->
         </script>

trunk/views/layouts/portal.ctp

@@ -101 +101 @@
                                           $html->image('static/banner_karamelo.jpg',array('alt'=>'e-Learning Solution', 'title'=>'e-Learning solution', 
                                            'style'=>'border:1px solid black')), 
-                                          'http://www.chipotle-software.com', array(), false, false));
-?>
-<br />
-<script type="text/javascript" src="http://www.ohloh.net/p/16759/widgets/project_partner_badge.js"></script>
-<?php 
-  echo  $this->element('poll');
-  echo  $this->element('rankpages');
+                                          'http://www.chipotle-software.com', Null, False, False));
+  echo $this->element('poll');
+  echo $this->element('rankpages');
   echo $this->element('adsense');
  ?>
@@ -113 +109 @@
 </tr>
 <tr><td colspan="3" style="margin-top:30px;"><br />
-<?php  echo $html->link($html->image('static/top.png', array('alt'=>'Go top', 'title'=>'Go Top')), '#maintable', null, null, false); ?>
+<?php  echo $html->link($html->image('static/top.png', array('alt'=>'Go top', 'title'=>'Go Top')), '#maintable', Null, False, False); ?>
 </td></tr>
 <tr><td colspan="3" id="footer">
@@ -122 +118 @@
 <div style="margin:20px auto 20px auto;width:800px;text-align:center;">
 <?php
-   echo $html->link($html->image("static/debian-80x15.gif", array('alt'=>"The Queen is here", 'title'=>"The Queen is here")), 
-        'http://www.debian.org/', null, null, false) . "&nbsp;";
+   echo $html->link($html->image('static/debian-80x15.gif', array('alt'=>'The Queen is here', 'title'=>'The Queen is here')), 
+        'http://www.debian.org/', Null, False, False) . "&nbsp;";
 
    echo $html->link($html->image("static/firefox-80x15.png", array('alt'=>"Mozilla Firefox", 'title'=>"Mozilla Firefox")), 
-        'http://www.mozilla.org/products/firefox/', null, null, false) . "&nbsp;";
+        'http://www.mozilla.org/products/firefox/', Null, False, False) . "&nbsp;";
    
    echo $html->link($html->image("static/pgsql-80x15.png", array('alt'=>"The Best DataBase", 'title'=>"The Best DataBase")), 
-        'http://www.postgresql.org/', null, null, false) . "&nbsp;";
+        'http://www.postgresql.org/', Null, False, False) . "&nbsp;";
    
    echo $html->link($html->image("static/cakephp-80x15.png", array('alt'=>"CakePHP Framework", 'title'=>"CakePHP Framework")), 
-        'http://www.cakephp.org/', null, null, false) . "&nbsp;";
+        'http://www.cakephp.org/', Null, False, False) . "&nbsp;";
    
    echo $html->link($html->image("static/valid_xhtml10_80x15_22.png", array('alt'=>"XHTML", 'title'=>"XHTML")), 
@@ -138 +134 @@
    
    echo $html->link($html->image("static/hacker-80x15.png", array('alt'=>"GNU Hacker", 'title'=>"GNU Hacker")), 
-        'http://www.fsfla.org/', null, null, false) . "&nbsp;";
+        'http://www.fsfla.org/', Null, False, False) . "&nbsp;";
                   
    echo $html->link($html->image('static/chipotle80x15.png', array('alt'=>'Chipotle Software', 'title'=>'Chipotle Software')), 
-        'http://www.chipotle-software.com', null, null, false);
+        'http://www.chipotle-software.com', Null, False, False);
    
  echo '</div>'; 

trunk/views/pages/display.ctp

@@ -11 +11 @@
  echo $html->link($html->image('secs/'.$data['Section']['img'], 
         array('alt'=>$data['Section']['description'], 'title'=>$data['Section']['description'], 'class'=>'imgborder')), 
-        '/pages/section/'.$data['Section']['id'], null, null, false);
+        '/pages/section/'.$data['Section']['id'], Null, False, False);
 echo '</div>';
 

trunk/views/users/admin_edit.ctp

@@ -24 +24 @@
   echo $form->input('User.newsletter', array('type'=>'checkbox','label'=> __('Subscribe to newsletter', True).': ')); 
   echo $form->input('User.fck', array('type'=>'checkbox','label'=> __('Active HTML editor', True))); 
-
+  echo  $form->input('User.email', array('size'=>35, 'maxlength'=>50));
   echo $html->div(null, $form->input('User.pwd', array('size'=>9, 'maxlength'=>9, 'value'=>'', 'label'=>__('Password', true))) . '  '.__('Left empty if you do not want to change', true), array('style'=>'clear:both;margin:25px 0 16px 0;'));