Changeset 788

Timestamp:

10/01/08 20:21:44 (7 weeks ago)

Author:

aarkerio

Message:

Update unit testing

Location:

trunk/app

Files:

• config/sql/postgresql/langs.sql (modified) (1 diff)
• controllers/confirms_controller.php (modified) (1 diff)
• controllers/users_controller.php (modified) (4 diffs)
• views/entries/admin_comments.ctp (modified) (1 diff)
• views/users/register.ctp (modified) (1 diff)

trunk/app/config/sql/postgresql/langs.sql

@@ -5 +5 @@
  "lang" varchar(80) NOT NULL UNIQUE
 );
-INSERT INTO langs (code, lang) VALUES ('es_MX', 'Spanish Argentina');
-INSERT INTO langs (code, lang) VALUES ('es_MX', 'Spanish Spain');
+INSERT INTO langs (code, lang) VALUES ('es_AR', 'Spanish Argentina');
+INSERT INTO langs (code, lang) VALUES ('es_ES', 'Spanish Spain');
 INSERT INTO langs (code, lang) VALUES ('es_MX', 'Spanish Mexico');
 INSERT INTO langs (code, lang) VALUES ('en_US', 'English USA');

trunk/app/controllers/confirms_controller.php

@@ -35 +35 @@
      
      if ($this->User->save($this->data) && $this->Confirm->delete($data['Confirm']['id'])):
-                 $this->flash(__('Your account has been activated', true), '/users/login', 1);
+                 $this->flash(__('Your account has been activated', true), '/', 2);
      endif;
    else:
-             $this->flash('There is not such account', '/users/login', 2);
+             $this->flash('There is not such account', '/', 2);
    endif;
  }

trunk/app/controllers/users_controller.php

@@ -268 +268 @@
   $this->Sanitize = new Sanitize;
   
-  $this->Sanitize->html($this->data["User"]["name"]);
-  
-  $this->Sanitize->html($this->data["User"]["username"]);
-  
-  $this->Sanitize->html($this->data["User"]["description"]);
-  
-  $this->Sanitize->html($this->data["User"]["email"]);
+  $this->Sanitize->html($this->data['User']['name']);
+  
+  $this->Sanitize->html($this->data['User']['username']);
+  
+  $this->Sanitize->html($this->data['User']['cv']);
+  
+  $this->Sanitize->html($this->data['User']['email']);
   
   // adds new classroom to database
   if (!empty($this->data['User']))
   {
-   $message     = array("oops"=>"Oooppps!");
+   $message     = array('oops'=>'Oooppps!');
    
    /** Check Passwd **/
@@ -292 +292 @@
    /** username check **/
    if (strlen($this->data['User']['username']) < 5):
-       $message['pwd_username'] = "The username has less than 5 characters ";
+       $message['pwd_username'] = 'The username has less than 5 characters ';
    endif;
     
    /** name check **/
    if (strlen($this->data['User']['name']) < 5):
-       $message['pwd_username'] = "The name is too short";
+       $message['pwd_username'] = 'The name is too short';
    endif;
     
     if (strpos($this->data['User']['pwd'], ' ')):  // pwd no spaces
-       $message['username_spaces'] = "Your password should not contain spaces";
+       $message['username_spaces'] = 'Your password should not contain spaces';
     endif;
     
     /** description check **/
-    if (strlen($this->data['User']['description']) < 5):
-       $message['description_too_short'] = "C'mon pal, talk us about you!";
+    if (strlen($this->data['User']['cv']) < 5):
+       $message['description_too_short'] = 'C\'mon pal, talk us about you!';
     endif;
     
     /** email check **/
     if ($this->Adds->validEmail($this->data['User']['email']) === false):
-       $message['pwd_username'] = "Typed email is invalid";
+       $message['pwd_username'] = 'Email is invalid';
     endif;
     
@@ -332 +332 @@
     
     if ( $this->data['User']['code'] != $code ):
-        $message['wrong_code'] = "The code is incorrect, please put in contact with your school webmaster.";
+        $message['wrong_code'] = 'The code is incorrect, please put in contact with your school webmaster.';
     endif;
     
@@ -345 +345 @@
         $this->data['Confirm']['user_id']  = $this->User->getLastInsertID();   // the user id
         $this->data['Confirm']['secret']   = $this->Adds->genPassword(14);     // secret confirm ID
-    
-    $this->User->Confirm->create();
         
          // put the user in confirm model, this is, waiting for user confirmation trough email

trunk/app/views/entries/admin_comments.ctp

@@ -2 +2 @@
 echo $html->div('title_section', __('Comments in your eduBlog', true));
 //debug($data);
+if ( count($data) < 1 ):
+  echo '<h1>'.__('No comments yet', true) .'</h1>';;
+endif;
+
 foreach($data as $v):
  $tmp  = $html->para(null, 'Entry: '.$html->link($v['Entry']['title'], 'http://'.$_SERVER['HTTP_HOST'].'/entries/view/'.$session->read('Auth.User.username').'/'.$v['Entry']['id']), array('style'=>'font-size:14pt;font-weigth:bold;'));

trunk/app/views/users/register.ctp

@@ -43 +43 @@
     
     echo $html->div(null, '<br />');  
-    echo $form->label('User.description', __('About you and your interests', true) ) . '<br />';
-    echo $form->textarea('User.description', array("rows"=>4, "cols"=>50)).'<br />'; 
+    echo $form->label('User.cv', __('About you and your interests', true) ) . '<br />';
+    echo $form->textarea('User.cv', array('rows'=>4, 'cols'=>50)).'<br />'; 
         
     $tmp = $html->link(__('I read and I do agree with terms', true),'#header',