Changeset 409

Timestamp:

04/18/08 14:30:29 (9 months ago)

Author:

aarkerio

Message:

Discussions fixed

Location:

trunk/app

Files:

• config/core.php (modified) (3 diffs)
• config/sql/karamelo_postgres.sql (modified) (1 diff)
• controllers/discussions_controller.php (modified) (5 diffs)
• controllers/users_controller.php (modified) (1 diff)
• views/discussions (added)
• views/discussions/admin_listing.ctp (added)
• views/discussions/renka.ctp (added)
• views/elements/email/text/newdiscussion.ctp (added)
• views/news/display.ctp (modified) (2 diffs)
• views/news/view.ctp (modified) (2 diffs)

trunk/app/config/core.php

@@ -14 +14 @@
  * In development mode, you need to click the flash message to continue.
  */
-    Configure::write('debug', 1);
+    Configure::write('debug', 2);
 /**
  * Application wide charset encoding
@@ -75 +75 @@
  *
  */
-    Configure::write('Session.save', 'cake');
+    Configure::write('Session.save', 'database');
 /**
  * The name of the table used to store CakePHP database sessions.
@@ -199 +199 @@
  *                  );
  */
-    Cache::config('default', array('engine' => 'File'));
+     Cache::config('default', array('engine' => 'File'));
 ?>

trunk/app/config/sql/karamelo_postgres.sql

@@ -148 +148 @@
  "level" int NOT NULL,
  "discussion_id" int NOT NULL,
- "user_id" int REFERENCES news(id) NOT NULL,
+ "user_id" int REFERENCES users(id) NOT NULL,
  "status" int NOT NULL DEFAULT 0
 );

trunk/app/controllers/discussions_controller.php

@@ -16 +16 @@
 class DiscussionsController extends AppController
 {
- public $name = 'Discussions';
+ public $name          = 'Discussions';
 
- public $helpers    = array('Ajax', 'Time', 'Gags');
-    
- public $components = array('Captcha');
+ public $helpers       = array('Ajax', 'Gags');
+
+ public $components    = array('Captcha', 'Email');
 
  public function beforeFilter() 
  {
-    $this->Auth->allow(array('captcha', 'agregar', 'renka'));
+    $this->Auth->allow(array('captcha', 'add'));
     parent::beforeFilter();
  }
@@ -40 +40 @@
  }
 
- public function agregar()
+ public function add()
  {
- 
-  $this->layout = 'portal';
-  
-  echo 'I am in agregar function !!!<br />';
-
-  die(debug($this->data));
+   //die(debug($this->data));
 
    if ( !empty($this->data['Discussion']) )
    {
+     $this->data['Discussion']['level']         = 1;
+     $this->data['Discussion']['discussion_id'] = 1;
+
      $this->Sanitize = new Sanitize;
            
@@ -57 +55 @@
      $this->data['Discussion']['comment'] = nl2br($this->data['Discussion']['comment']);
            
-     if ( $this->Auth->user('id') )
+     if ( $this->Auth->user() )
      {
-          $this->data['Discussion']['user_id'] = $this->Auth->user('id');
+          $this->data['Discussion']['user_id']  = $this->Auth->user('id');
+          $this->data['Discussion']['username'] = $this->Auth->user('username');
      }
      else
      {
-       if ($this->data['Discussion']['captcha'] != $this->Session->read('captcha') || strlen($this->data['Discussion']['captcha']) < 3)
+       /*if ($this->data['Discussion']['captcha'] != $this->Session->read('captcha') || strlen($this->data['Discussion']['captcha']) < 3)
        {
          $this->flash('Code incorrect, please pulse back button', '/news/view/'.$this->data["Discussion"]["new_id"], 6);  // wrong captcha, spambot ??
-         exit();
-       }
+       } */
                 
          $this->data['Discussion']['user_id'] = 0;
@@ -84 +82 @@
    }
  }
-  
+
  /* == PRIVATE == **/
- private function __sendEmail($user_id, $new_id)
+ private function __sendMail($user_id, $new_id)
  {  
-   $User = new User;
+   $this->User = new User;
 
    $this->User->unbindModel(array("hasMany"=>array('Entry', 'Lesson', 'Faq', 'Vclassroom', 'Acquaintance')));                
                                                                               
-   $user = $this->User->find(array('User.id'=>$user_id), array("User.name", "User.email"));
- 
-    $this->layout          = 'newcomment';
-    $this->Email->to       = $user['email'];
+   $val = $this->User->find(array('User.id'=>$user_id), array("User.name", "User.email"));
+   
+    $this->layout          = 'default';
+    $this->Email->to       = $val['User']['email'];
     $this->Email->subject  = 'Karamelo e-Learning:: New comment';
     $this->Email->replyTo  = 'support@karamelo.org';
     $this->Email->from     = 'Chipotle-software.com';
-    $this->Email->template = 'confirmation'; // note no '.ctp'
+    $this->Email->template = 'newdiscussion'; // 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('name',   $user['name']);
+    $this->set('name',   $val['User']['name']);
     $this->set('new_id', $new_id);
 
@@ -115 +113 @@
             return false;
     }
- }
-
- public function renka()
- {
-   $this->layout = 'portal';
-   //return $this->Captcha->render();
  }
 

trunk/app/controllers/users_controller.php

@@ -19 +19 @@
  public function beforeFilter() 
  {
-    $this->Auth->allow(array('blog', 'entry','portfolio', 'about', 'register', 'directory', 'bloggers', 'insert', 'validate'));
+    $this->Auth->allow(array('blog', 'entry','portfolio', 'about', 'register', 'directory', 'bloggers', 'insert', 'validate', 'logout'));
     parent::beforeFilter();
  }

trunk/app/views/news/display.ctp

@@ -6 +6 @@
 foreach ($data as $val)
 {
-  $tmp  = $html->div('news_title', $html->link($val['News']['title'], '/news/view/'. $val['News']['id']));
+  echo '<div class="wrapnew">';
+ 
+  echo $html->div('news_title', $html->link($val['News']['title'], '/news/view/'. $val['News']['id']));
   
-  $tmp .= $html->div('news_date',  $val['News']['created']);
+  echo $html->div('news_date',  $val['News']['created']);
 
-  $tmp .= $html->div('news_body',
+  echo $html->div('news_body',
                             $html->div('img_new', $html->link(
                                                           $html->image('themes/'.$val['Theme']['img'], 
@@ -23 +25 @@
   
   
-  $tmp .= $val['News']['body'];
-  
-  if (strlen($val['News']['reference'])  > 5 )  // the reference
+  echo $val['News']['body'];
+
+  if ($val['News']['comments'] == 1 )  // comments enabled on this new
   {
-      $tmp .= $html->div(null, $html->link('Reference', $val['News']['reference']));
-  }
-   
-  if ($val['News']['comments'] == 1 )  // the reference
-  {
-    $tmp .= $html->div(null, $html->link('Put your comment', '/news/view/'.$val['News']['id']));
+    echo $html->para(null, $html->link('Put your comment', '/news/view/'.$val['News']['id']));
   } 
-  echo $html->div('wrapnew', $tmp); 
+
+
+?>
+  <br />
+    <span style="font-size:7pt;">Permalink:</span> <br />
+    <?php echo $html->link(
+               'http://'.$_SERVER['SERVER_NAME'].'/news/view/'.$val['News']['id'], 
+                           'http://'.$_SERVER['SERVER_NAME'].'/news/view/'.$val['News']['id']
+               ); 
+?>
+    <br /><br />
+    <b>Reference:</b>
+    
+    <?php echo $html->link(
+                           $html->image('static/newwindow.gif', array("alt"=>"Open new window", "title"=>"Open new window")),
+                           $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);
+      
+echo $news->socialNets($val['News']['id'], $val['News']['title']); // Social nets buttons
+      
+    
+
+  echo '</div>';
  }
 ?>

trunk/app/views/news/view.ctp

@@ -46 +46 @@
               
       echo '<div class="comentnew" style="background-color:'.$bg.'">';  
-      echo $time->timeAgoInWords($v['created']) . ' <b>'. $v['name']    . '</b> wrote:<br />';
+      echo $time->timeAgoInWords($v['created']) . ' <b>'. $v['username']    . '</b> wrote:<br />';
       echo $v["comment"];
       echo "</div>";
@@ -53 +53 @@
   echo "</div>";
 
-  echo $form->create('Discussion', array('action'=>'agregar'));
-  //echo '<form action="/discussions/agregar" method="post">';
+if ( isset( $cU['User']['id'] ) ):
+  echo $form->create('Discussion', array('action'=>'add'));
+  echo $form->hidden('Discussion.new_id', array('value'=>$data['News']['id'])); 
 ?>
-
-
 <fieldset>
    <legend>Write comment:</legend>
 <?php 
-  echo $form->hidden('Discussion.new_id', array('value'=>$data['News']['id'])); 
-  echo $form->hidden('Discussion.level', array('value'=>1));
-  echo $form->hidden('Discussion.comentnew_id', array('value'=>1));
-
-  if ( isset( $cU['User']['id'] ) ):
-       echo $form->hidden('Discussion.user_id', array('value'=> $cU['User']['id']));
-       echo $form->hidden('Discussion.name',  array('value'=>$cU['User']['username']));
-       echo '<b>'. $cU['User']['username'] . '</b>  write: <br />';
-
-  else:
-
-      echo $form->hidden('Discussion.user_id', array('value'=> 0));
-      echo $form->input('Discussion.name', array('size'=> 25, 'maxlength' => 40));
-      // echo '<br /><br /> <img src="'. $html->url('/discussions/captcha') .'" alt="Captcha" title="Captcha" /> <br />';
-      //echo $form->input('Discussion.captcha', array("size" => 6, "maxlength" => 6));
-      //echo $form->label('Discussion.captcha', 'Introduce el código, todas la letras son minúsculas' ).'<br />';
-  endif;
-  
-  echo $form->textarea('Discussion.comment', array('cols'=>60, 'rows'=>10)) . $form->end('Send comment'); 
-
+    echo $form->label('Discussion.comment', '<b>'. $cU['User']['username'] . '</b>  write:').'<br />'; 
+    echo $form->textarea('Discussion.comment', array('cols'=>60, 'rows'=>10));
+    echo $form->end('Send comment');
+ else:
+    echo $html->para(null, $html->link('Login to write comments', '/users/login')); 
+ endif; 
 } 
 ?>