Changeset 348

Timestamp:

03/26/08 12:17:56 (10 months ago)

Author:

aarkerio

Message:

Fix help bug report

Location:

trunk/app

Files:

• controllers/helps_controller.php (modified) (7 diffs)
• views/elements/admin_menu.ctp (modified) (1 diff)
• views/elements/email/text/report.ctp (added)
• views/elements/login.ctp (modified) (1 diff)
• views/helps/admin_newticket.ctp (added)
• views/helps/newticket.ctp (modified) (1 diff)

trunk/app/controllers/helps_controller.php

@@ -3 +3 @@
 *  Chipotle Software TM
 *  Manuel Montoya 2002-2008 
-*  GPLv3 manuel<at>mononeurona<dot>org
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
 
@@ -12 +12 @@
  public $helpers       = array('Javascript', 'Ajax', 'Fck', 'Gags');
    
- public $components    = array('Portal', 'Edublog');
+ public $components    = array('Portal', 'Edublog', 'Email');
 
+ public function beforeFilter() 
+ {
+     $this->Auth->allow(array('display', 'tour'));
+     parent::beforeFilter();
+ }
+  
  public function isAuthorized() 
- {
-    if ($this->action == 'delete') 
-      {
-    if ($this->Auth->user('group_id') == 1) 
-          {
-        return true;
-          } else {
-        return false;
-          }
-      }
- 
-    return true;
-  }
+ {      
+    if (isset( $this->params[Configure::read('Routing.admin')] )) 
+    {
+         if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 )  // admin and teachers
+     {
+           return true;
+         } 
+    } 
+        return false;  // go away !!
+ }
 
  public function tour() 
@@ -54 +57 @@
         $this->set('data', $this->Help->findAll($conditions, $fields));
  }
-
- public function newticket() 
+ 
+ /**  === ADMIN METHODS === **/
+ //bug report
+ public function admin_newticket() 
  {
         $this->layout    = 'admin';
@@ -63 +68 @@
         $this->set('data', $this->Help->findAll($conditions, $fields));
  }
+ 
+ public function admin_submit()
+ {     
+       if ( !empty( $this->data['Help'] ) )
+       {  
+      $this->Sanitize = new Sanitize;
+          
+          $this->Sanitize->clean($this->data['Help']);
+      
+      $report  = $this->Auth->user('username') .' with email '. $this->Auth->user('email') .', wrote: ';
+      
+      $report .= $this->data['Help']['report'] .'.  Kind: ' . $this->data['Help']['kind'];
+      
+          if ( $this->_sendNewReport( $report ) )
+          {
+                 $this->msgFlash('Email sent, Thanks!', '/admin/entries/start');
+      }
+          
+        }
+ }
+ 
  public function about() 
  {
@@ -69 +95 @@
         $this->set('Element', $this->Portal->statics()); // Charge Portal components aka Sidebars
  }
-   
- /**
-  === ADMIN METHODS === 
- **/
-   
-   public function admin_listing()
-   {
+ 
+ public function admin_listing()
+ {
       $this->layout = 'admin';
       $conditions = null;
@@ -84 +106 @@
       
       $this->set('data', $this->Help->findAll($conditions, $fields, $order));
-   }
-   
-   public function admin_add() 
-   {
+ }
+ 
+ public function admin_add() 
+ {
      $this->layout = 'admin';
-
+     
      if (!empty($this->data['Help']))
      {
@@ -125 +147 @@
         }
     }
-}
-  
-  public function admin_delete($id)
-  {
+ }
+ 
+ public function admin_delete($id)
+ {
       $this->Help->del($id);
       $this->msgFlash('Help deleted','/admin/helps/listing');
   }
+  
+ /** ===PRIVATE ===*/
+ private function _sendNewReport($report) 
+ {
+    $this->Email->to       = 'mmontoya@gmail.com';
+    $this->Email->bcc      = array('contact@chipotle-software.com');  // note
+    // this could be just a string too
+    $this->Email->subject  = 'Karamelo e-Learning:: bug report';
+    $this->Email->replyTo  = 'support@karamelo.org';
+    $this->Email->from     = 'Chipotle-software.com';
+    $this->Email->template = 'report'; // note no '.ctp'
+    //Send as 'html', 'text' or 'both' (default is 'text')
+    $this->Email->sendAs   = 'text'; // because we like to send pretty mail
+    //Set view variables as normal
+    $this->set('report', $report);
+    //Do not pass any args to send() 
+    if ( $this->Email->send() ) 
+    {
+            return true; 
+    } 
+    else
+    {
+            return false;
+    }
+ }
 }
 ?>

trunk/app/views/elements/admin_menu.ctp

@@ -45 +45 @@
   </li>
 
-  <li><a href="/helps/index/set">Help</a>
+  <li><?php echo $html->link('Helps', '/admin/helps/listing'); ?>
         <ul>
-          <li><a href="/helps/newticket">Report Bug</a> </li>
-           <li><a href="http://www.chipotle-software.com/index.php?id=9">Get support</a> </li>
+          <li><?php echo $html->link('Report bug', '/admin/helps/newticket'); ?> </li>
+           <li><?php echo $html->link('Get support', 'http://www.chipotle-software.com/index.php?id=9'); ?></li>
        </ul>
   </li>

trunk/app/views/elements/login.ctp

@@ -4 +4 @@
 <legend> Login</legend>
   <?php 
-   echo  $form->input('User.email', array('size' => 15, 'maxlength'=> 45)) . '<br />';
-   echo  $form->label('User.pwd', 'Password: ');
-   echo  $form->password('User.pwd', array('id' => 'user_pwd', 'size' => 9, 'maxlength' => 9));
+   echo  $form->input('User.email', array('size' => 15, 'maxlength'=> 45, 'between'=>'<br />')) . '<br />';
+   echo  $form->label('User.pwd', 'Password: ').'<br />';
+   echo  $form->password('User.pwd', array('id' => 'user_pwd', 'size' => 9, 'maxlength' => 9)) . '<br />';
    echo  $form->label('User.remember_me', 'Remember me: ');
    echo  $form->checkbox('User.remember_me');

trunk/app/views/helps/newticket.ctp

@@ -1 +1 @@
 <h1>Reporting bugs</h1>
-
-<p>You can help the Karamelo developrment team by reporting bugs and making suggestions to improve this application. </p>
-
-
-
 <?php 
-
-  echo $form->create('Help', array('admin_submit'));
-
+  echo $html->para(null, 'You can help the Karamelo development team by reporting bugs and making suggestions to improve this application.');
+  echo $form->create('Help', array('action'=>'submit'));
+  
   echo $form->label('Help.report', 'Description:') . '<br />';
   echo $form->textarea('Help.report', array('rows'=>8, 'cols'=>60)) . '<br />';
-
+  
   echo $form->label('Help.kind', 'Kind:') . '<br />';
   echo $form->select('Help.kind', array('Enhancement'=>'Enhancement', 'Bug'=>'Bug', 'Suggestion'=>'Suggestion'), null, null, false) . '<br />';
-
+  
   echo $form->end('Send');
-
+  
   $html->link('Submit new ticket', 'http://trac.mononeurona.org/karamelo/newticket');