[phpws-comm-commits] modules/phpwsbb/class Manager.php,1.6,1.7 Message.php,1.7,1.8

[<dts...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/phpwsbb/class
In directory sc8-pr-cvs1:/tmp/cvs-serv29957/class

Modified Files:
	Manager.php Message.php 
Log Message:
Checking in before some big changes


Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Manager.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Manager.php	3 Jun 2003 16:22:41 -0000	1.6
--- Manager.php	3 Jun 2003 19:03:15 -0000	1.7
***************
*** 44,53 ****
          $GLOBALS["CNT_phpwsbb"]["content"] .= $this->_menu();
  
!         $GLOBALS["CNT_phpwsbb"]["content"] .= $this->getList("messages", $_SESSION["translate"]->it("Bulletin Board Messages"), FALSE);
      }// END FUNC _list
  
  
!     function _view($id) {
!         $this->phpwsbb_message = new PHPWSBB_Message($id[0]);
          $_REQUEST["PHPWSBB_MESSAGE_OP"] = "view";
      }// END FUNC _view
--- 44,53 ----
          $GLOBALS["CNT_phpwsbb"]["content"] .= $this->_menu();
  
!         $GLOBALS["CNT_phpwsbb"]["content"] .= $this->getList("messages", $_SESSION["translate"]->it("Bulletin Board Messages"));
      }// END FUNC _list
  
  
!     function _view() {
!         $this->phpwsbb_message = new PHPWSBB_Message($_REQUEST["PHPWS_MAN_ITEMS"][0]);
          $_REQUEST["PHPWSBB_MESSAGE_OP"] = "view";
      }// END FUNC _view
***************
*** 55,62 ****
  
      function _new() {
-         // Will pid be passed along so I don't need separate reply() function?
          $this->phpwsbb_message = new PHPWSBB_Message;
          $_REQUEST["PHPWSBB_MESSAGE_OP"] = "edit";
      }// END FUNC _new
      
  
--- 55,67 ----
  
      function _new() {
          $this->phpwsbb_message = new PHPWSBB_Message;
          $_REQUEST["PHPWSBB_MESSAGE_OP"] = "edit";
      }// END FUNC _new
+ 
+     function _reply() {
+         $this->phpwsbb_message = new PHPWSBB_Message;
+         $this->phpwsbb_message->_pid = $_REQUEST["PHPWS_MAN_ITEMS"][0];
+         $_REQUEST["PHPWSBB_MESSAGE_OP"] = "edit";
+     }// END FUNC _new
      
  
***************
*** 73,76 ****
--- 78,84 ----
              case "new":
                  $content = $this->_new();
+                 break;
+             case "reply":
+                 $content = $this->_reply();
                  break;
              case "access_denied":

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Message.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Message.php	3 Jun 2003 16:22:41 -0000	1.7
--- Message.php	3 Jun 2003 19:03:15 -0000	1.8
***************
*** 125,133 ****
          $tags["POSTED"]     = $_SESSION["translate"]->it("Posted by [var1] on [var2]", $poster, $this->getCreated());
  
!         $tags["REPLY"]      = "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MESSAGE_OP=reply&amp;PHPWSBB_pid=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Reply to Message") . "</a>";
  
          // Need to cycle through all children still
  
!         return $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "view.tpl");
  
      }// END FUNC _view
--- 125,142 ----
          $tags["POSTED"]     = $_SESSION["translate"]->it("Posted by [var1] on [var2]", $poster, $this->getCreated());
  
!         //$tags["REPLY"]      = "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=reply&amp;PHPWSBB_pid=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Reply to Message") . "</a>";
!         if(empty($this->_pid))
!             $tags["REPLY"]      = "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=reply&amp;PHPWS_MAN_ITEMS[]=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Reply to Message") . "</a>";
  
          // Need to cycle through all children still
  
!         $content = $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "view.tpl");
! 
!         foreach($this->children as $cid) {
!             $child = new PHPWSBB_Message($cid);
!             $content .= "<br />" . $child->_view();
!         }
! 
!         return $content;
  
      }// END FUNC _view
***************
*** 175,179 ****
  
          /* Message Body */
!         $form->add("Message_body", "textarea", $this->getLabel());
          $form->setTab("Message_body", $tabs);
          $tabs++;
--- 184,188 ----
  
          /* Message Body */
!         $form->add("Message_body", "textarea", $this->_body);
          $form->setTab("Message_body", $tabs);
          $tabs++;
***************
*** 187,191 ****
          $form->add("module", "hidden", "phpwsbb");
          $form->add("PHPWSBB_MESSAGE_OP", "hidden", "save");
!         $form->add("Message_pid", "hidden", $_REQUEST["Message_pid"]);
  
          $tags = array();
--- 196,200 ----
          $form->add("module", "hidden", "phpwsbb");
          $form->add("PHPWSBB_MESSAGE_OP", "hidden", "save");
!         $form->add("Message_pid", "hidden", $this->_pid);
  
          $tags = array();
***************
*** 218,222 ****
  
          if(isset($_REQUEST["Message_pid"]))
!             $this->_pid = $_REQUEST["Message_pid"];
  
          if(isset($_REQUEST["Message_guestname"]))
--- 227,234 ----
  
          if(isset($_REQUEST["Message_pid"]))
!             if(empty($_REQUEST["Message_pid"]))
!                 $this->_pid = 0;
!             else
!                 $this->_pid = $_REQUEST["Message_pid"];
  
          if(isset($_REQUEST["Message_guestname"]))
***************
*** 226,229 ****
--- 238,243 ----
              $this->_guestemail = $_REQUEST["Message_guestemail"];
  
+         $this->getLatest();
+ 
          $error = $this->commit();
          if(PHPWS_Error::isError($error)) {
***************
*** 243,246 ****
--- 257,276 ----
  
  
+     function getLatest() {
+             if(!empty($this->_id)) {
+                 $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages WHERE pid=" . $this->getId() . " ORDER BY created;";
+                 $this->children = $GLOBALS["core"]->getCol($sql);
+                 $this->_replies = count($this->children);
+                 if($this->_replies > 0) {
+                     $lastreply = new PHPWSBB_Message($this->childre[($this->_replies - 1)]);
+                     $this->_lastreply = $lastreply->getCreated();
+                 }
+             } else {
+                 $this->_replies = 0;
+                 $this->_lastreply = time();
+             }
+     }
+ 
+ 
      function action() {
          switch($_REQUEST["PHPWSBB_MESSAGE_OP"]) {
***************
*** 249,253 ****
                      $title = $_SESSION["translate"]->it("Edit Message");
                  else
!                     $title = $_SESSION["translate"]->it("New Message");
                  $content = $_SESSION["PHPWSBB_Manager"]->_menu();
                  $content .= $this->_edit();
--- 279,286 ----
                      $title = $_SESSION["translate"]->it("Edit Message");
                  else
!                     if(isset($this->_pid))
!                         $title = $_SESSION["translate"]->it("Reply to Message");
!                     else
!                         $title = $_SESSION["translate"]->it("New Message");
                  $content = $_SESSION["PHPWSBB_Manager"]->_menu();
                  $content .= $this->_edit();
***************
*** 270,274 ****
          if(isset($content)) {
              $GLOBALS["CNT_phpwsbb"]["title"] = $title;
!             $GLOBALS["CNT_phpwsbb"]["content"] = $content;
          }
      }// END FUNC _action
--- 303,307 ----
          if(isset($content)) {
              $GLOBALS["CNT_phpwsbb"]["title"] = $title;
!             $GLOBALS["CNT_phpwsbb"]["content"] .= $content;
          }
      }// END FUNC _action