phpwebsite-comm-cvs-commits — Read-Only CVS commits log list

[phpws-comm-commits] documents/docmanager/en 1.1_cvs_repository.html,1.6,1.7

[<mh...@us...>]

Update of /cvsroot/phpwebsite-comm/documents/docmanager/en
In directory sc8-pr-cvs1:/tmp/cvs-serv29988

Modified Files:
	1.1_cvs_repository.html 
Log Message:
added link for alternate win instructions

Index: 1.1_cvs_repository.html
===================================================================
RCS file: /cvsroot/phpwebsite-comm/documents/docmanager/en/1.1_cvs_repository.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** 1.1_cvs_repository.html	25 May 2003 18:22:01 -0000	1.6
--- 1.1_cvs_repository.html	4 Jun 2003 15:09:19 -0000	1.7
***************
*** 35,39 ****
  <a href="/docman/display_doc.php?docid=766&amp;group_id=1">F4. CVS
  client installation: WinCvs with PuTTY on 32-bit Microsoft Windows
! platforms</a></li>
  <li style="font: 10pt 'Vera Sans',Albany,Arial,Helvetica,sans-serif">
  <a href="/docman/display_doc.php?docid=2973&amp;group_id=1">F8. CVS
--- 35,39 ----
  <a href="/docman/display_doc.php?docid=766&amp;group_id=1">F4. CVS
  client installation: WinCvs with PuTTY on 32-bit Microsoft Windows
! platforms</a><br />Alternate Windows Instructions: <a href="http://www.devguy.com/fp/cfgmgmt/cvs/cvs_ssh.htm">Accessing CVS via SSH on Windows</a></li>
  <li style="font: 10pt 'Vera Sans',Albany,Arial,Helvetica,sans-serif">
  <a href="/docman/display_doc.php?docid=2973&amp;group_id=1">F8. CVS
***************
*** 66,70 ****
  <p style="font: 12pt 'Vera Serif',Thorndale,'Times New Roman',Times,serif">
  Write access is granted on an as needed basis. Our repository uses
! the <strong>cvs-acls</strong> script to control write access. The
  <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpwebsite-comm/CVSROOT/">
  CVSROOT/</a><strong>avail</strong> file defines write access. If
--- 66,70 ----
  <p style="font: 12pt 'Vera Serif',Thorndale,'Times New Roman',Times,serif">
  Write access is granted on an as needed basis. Our repository uses
! the <strong>cvs_acls</strong> script to control write access. The
  <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/phpwebsite-comm/CVSROOT/">
  CVSROOT/</a><strong>avail</strong> file defines write access. If
***************
*** 72,76 ****
  <a href="/tracker/?func=add&amp;group_id=81360&amp;atid=563509">submit
  a support request</a>. Additional information on the
! <strong>cvs-acls</strong> script and the <strong>avail</strong>
  file format is available in the document below.</p>
  <ul style="list-style-type: none">
--- 72,76 ----
  <a href="/tracker/?func=add&amp;group_id=81360&amp;atid=563509">submit
  a support request</a>. Additional information on the
! <strong>cvs_acls</strong> script and the <strong>avail</strong>
  file format is available in the document below.</p>
  <ul style="list-style-type: none">

[phpws-comm-commits] CVSROOT avail,1.6,1.7

[<mh...@us...>]

Update of /cvsroot/phpwebsite-comm/CVSROOT
In directory sc8-pr-cvs1:/tmp/cvs-serv13644

Modified Files:
	avail 
Log Message:
gave rylas write access to modules/wiki

Index: avail
===================================================================
RCS file: /cvsroot/phpwebsite-comm/CVSROOT/avail,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** avail	2 Jun 2003 15:56:33 -0000	1.6
--- avail	3 Jun 2003 23:37:00 -0000	1.7
***************
*** 5,8 ****
--- 5,9 ----
  avail|dtseiler, wendall911|modules/contacts
  avail|gbrackett|modules/jobman
+ avail|rylas|modules/wiki
  
  # Global access for all project members

[phpws-comm-commits] modules/phpwsbb/class Manager.php,1.13,1.14

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

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

Modified Files:
	Manager.php 
Log Message:
Prepping manager for lock and fork.  Will do items tomorrow.


Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Manager.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Manager.php	3 Jun 2003 22:16:08 -0000	1.13
--- Manager.php	3 Jun 2003 22:21:03 -0000	1.14
***************
*** 62,65 ****
--- 62,71 ----
  
  
+     function _lock() {
+         $this->thread = new PHPWSBB_Thread($_REQUEST["PHPWS_MAN_ITEMS"][0]);
+         $_REQUEST["PHPWSBB_THREAD_OP"] = "lock";
+     }// END FUNC _lock
+ 
+ 
      function _delete() {
          $this->thread = new PHPWSBB_Thread($_REQUEST["PHPWS_MAN_ITEMS"][0]);
***************
*** 89,93 ****
          $this->message = new PHPWSBB_Message($_REQUEST["PHPWS_MAN_ITEMS"][0]);
          $_REQUEST["PHPWSBB_MESSAGE_OP"] = "edit";
!     }
      
  
--- 95,105 ----
          $this->message = new PHPWSBB_Message($_REQUEST["PHPWS_MAN_ITEMS"][0]);
          $_REQUEST["PHPWSBB_MESSAGE_OP"] = "edit";
!     }// END FUNC _edit
! 
! 
!     function _fork() {
!         $this->message = new PHPWSBB_Message($_REQUEST["PHPWS_MAN_ITEMS"][0]);
!         $_REQUEST["PHPWSBB_MESSAGE_OP"] = "fork";
!     }// END FUNC _fork
      
  
***************
*** 127,130 ****
--- 139,150 ----
              case "reply":
                  $this->_reply();
+                 break;
+ 
+             case "lock":
+                 $this->_lock();
+                 break;
+ 
+             case "fork":
+                 $this->_fork();
                  break;
  

[phpws-comm-commits] modules/phpwsbb/class Manager.php,1.12,1.13 Message.php,1.12,1.13 Thread.php,1.3,1.4

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

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

Modified Files:
	Manager.php Message.php Thread.php 
Log Message:
Got message deletion working


Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Manager.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Manager.php	3 Jun 2003 21:54:28 -0000	1.12
--- Manager.php	3 Jun 2003 22:16:08 -0000	1.13
***************
*** 84,87 ****
--- 84,93 ----
          $_REQUEST["PHPWSBB_MESSAGE_OP"] = "edit";
      }// END FUNC _new
+ 
+ 
+     function _edit() {
+         $this->message = new PHPWSBB_Message($_REQUEST["PHPWS_MAN_ITEMS"][0]);
+         $_REQUEST["PHPWSBB_MESSAGE_OP"] = "edit";
+     }
      
  
***************
*** 121,124 ****
--- 127,134 ----
              case "reply":
                  $this->_reply();
+                 break;
+ 
+             case "deletemessage":
+                 $this->_deleteMessage();
                  break;
  

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Message.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Message.php	3 Jun 2003 21:54:28 -0000	1.12
--- Message.php	3 Jun 2003 22:16:08 -0000	1.13
***************
*** 79,85 ****
  
          $tags["POSTED"]     = $_SESSION["translate"]->it("Posted by [var1] on [var2]", $poster, $this->getCreated());
! 
!         if(!empty($this->_tid))
!             $tags["REPLY"]      = "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=reply&amp;PHPWS_MAN_ITEMS[]=" . $this->_tid . "\">" . $_SESSION["translate"]->it("Reply to Message") . "</a>";
  
          return $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "view.tpl");
--- 79,86 ----
  
          $tags["POSTED"]     = $_SESSION["translate"]->it("Posted by [var1] on [var2]", $poster, $this->getCreated());
!         if($_SESSION["OBJ_user"]->allow_access("phpwsbb", "edit_messages") || ($_SESSION["OBJ_user"]->username == $this->getOwner())) {
!             $tags["EDIT"]      = "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=edit&amp;PHPWS_MAN_ITEMS[]=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Edit") . "</a>";
!             $tags["DELETE"]      = "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=deletemessage&amp;PHPWS_MAN_ITEMS[]=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Delete") . "</a>";
!         }
  
          return $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "view.tpl");
***************
*** 89,93 ****
  
      function _edit() {
!         if(!empty($this->_id) && !$_SESSION["OBJ_user"]->allow_access("phpwsbb", "edit_messages")) {
              //$_REQUEST["PHPWSBB_MAN_OP"] = "access_denied";
              //$_SESSION["PHPWSBB_Manager"]->action();
--- 90,94 ----
  
      function _edit() {
!         if(!empty($this->_id) && !$_SESSION["OBJ_user"]->allow_access("phpwsbb", "edit_messages") && ($_SESSION["OBJ_user"]->username != $this->getOwner())) {
              //$_REQUEST["PHPWSBB_MAN_OP"] = "access_denied";
              //$_SESSION["PHPWSBB_Manager"]->action();
***************
*** 161,165 ****
  
      function _save() {
!         if(!empty($this->_id) && !$_SESSION["OBJ_user"]->allow_access("phpwsbb", "edit_messages")) {
              $message = $_SESSION["translate"]->it("Access to save message $this->_id was denied due to lack of proper permissions.");
              $error = new PHPWS_Error("phpwsbb", "PHPWSBB_Manager::_accessDenied()", $message, "exit", 1);
--- 162,166 ----
  
      function _save() {
!         if(!empty($this->_id) && !$_SESSION["OBJ_user"]->allow_access("phpwsbb", "edit_messages") && ($_SESSION["OBJ_user"]->username != $this->getOwner())) {
              $message = $_SESSION["translate"]->it("Access to save message $this->_id was denied due to lack of proper permissions.");
              $error = new PHPWS_Error("phpwsbb", "PHPWSBB_Manager::_accessDenied()", $message, "exit", 1);
***************
*** 205,209 ****
              // Update thread object with new statistics
              $thread = new PHPWSBB_Thread($this->_tid);
!             $thread->updateThreadStats();
  
              $_REQUEST["PHPWSBB_THREAD_OP"] = "view";
--- 206,210 ----
              // Update thread object with new statistics
              $thread = new PHPWSBB_Thread($this->_tid);
!             $thread->updateThread();
  
              $_REQUEST["PHPWSBB_THREAD_OP"] = "view";
***************
*** 213,216 ****
--- 214,267 ----
  
  
+     function _delete() {
+         if(!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "delete_messages") && ($_SESSION["OBJ_user"]->username != $this->getOwner())) {
+             $message = $_SESSION["translate"]->it("Access to delete this message was denied due to lack of proper permissions.");
+             $error = new PHWPS_Error("phpwsbb", "PHPWSBB_Message::_delete()", $message, "exit", 1);
+             $error->message();
+             return FALSE;
+         }
+ 
+         if(isset($_REQUEST["Message_yes"])) {
+             $this->kill();
+ 
+             // Update thread object with new statistics
+             $thread = new PHPWSBB_Thread($this->_tid);
+             $thread->updateThread();
+ 
+             $message = $_SESSION["translate"]->it("The message [var1] by [var2] was successfully deleted from the database.", "<b><i>" . $this->getLabel() . "</i></b>", $this->getOwner());
+             $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb");
+             //$_REQUEST["PHPWS_MAN_ITEMS"][] = $this->_tid;
+             $_REQUEST["PHPWSBB_MAN_OP"] = "list";
+             $_SESSION["PHPWSBB_Manager"]->action();
+             $_SESSION["PHPWSBB_Manager"]->managerAction();
+ 
+         } elseif(isset($_REQUEST["Message_no"])) {
+             $message = $_SESSION["translate"]->it("No message was deleted from the database.");
+             $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb");
+             //$_REQUEST["PHPWS_MAN_ITEMS"][0] = $this->_tid;
+             $_REQUEST["PHPWSBB_MAN_OP"] = "list";
+             $_SESSION["PHPWSBB_Manager"]->action();
+             $_SESSION["PHPWSBB_Manager"]->managerAction();
+ 
+         } else {
+             $title = $_SESSION["translate"]->it("Delete Message Confirmation");
+ 
+             $form = new EZform("PHPWSBB_Message_delete");
+             $form->add("module", "hidden", "phpwsbb");
+             $form->add("PHPWSBB_MESSAGE_OP", "hidden", "delete");
+ 
+             $form->add("Message_yes", "submit", $_SESSION["translate"]->it("Yes"));
+             $form->add("Message_no", "submit", $_SESSION["translate"]->it("No"));
+ 
+             $tags = array();
+             $tags = $form->getTemplate();
+             $tags["MESSAGE"] = $_SESSION["translate"]->it("Are you sure you want to delete this message?");
+             
+             $content = $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "delete_message.tpl");
+             $_SESSION["OBJ_layout"]->popbox($title, $content, NULL, "CNT_phpwsbb");
+         }
+     }// END FUNC _delete
+ 
+ 
      function action() {
          switch($_REQUEST["PHPWSBB_MESSAGE_OP"]) {
***************
*** 234,237 ****
--- 285,290 ----
                  break;
              case "delete":
+                 $this->_delete($this->_tid);
+                 break;
              case "fork":
              case "lock":

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Thread.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Thread.php	3 Jun 2003 21:13:26 -0000	1.3
--- Thread.php	3 Jun 2003 22:16:08 -0000	1.4
***************
*** 87,95 ****
  
  
!     function updateThreadStats() {
          if(!empty($this->_id)) {
              $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages WHERE tid=" . $this->getId() . " ORDER BY created;";
              $this->messages = $GLOBALS["core"]->getCol($sql);
              $this->_replies = count($this->messages) - 1;
          } else {
              $this->_replies = 0;
--- 87,103 ----
  
  
!     function updateThread() {
          if(!empty($this->_id)) {
              $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages WHERE tid=" . $this->getId() . " ORDER BY created;";
              $this->messages = $GLOBALS["core"]->getCol($sql);
              $this->_replies = count($this->messages) - 1;
+             if($this->_replies < 0) {
+                 /*
+                  * This means the only message in the thread was deleted via
+                  * the message delete inteface.  Kill this thread.
+                  */
+                  $this->kill();
+                  return;
+             }
          } else {
              $this->_replies = 0;

[phpws-comm-commits] modules/phpwsbb/templates view.tpl,1.4,1.5

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

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

Modified Files:
	view.tpl 
Log Message:
Got message deletion working


Index: view.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/templates/view.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** view.tpl	3 Jun 2003 21:13:31 -0000	1.4
--- view.tpl	3 Jun 2003 22:16:12 -0000	1.5
***************
*** 5,9 ****
  <hr size="1" width="100%" noshade /><br />
  {BODY}<br />
! <div class="smalltext" align="right">{QUOTE}</div>
  </td></tr>
  </table>
--- 5,9 ----
  <hr size="1" width="100%" noshade /><br />
  {BODY}<br />
! <div class="smalltext" align="right">{EDIT} {DELETE}</div>
  </td></tr>
  </table>

[phpws-comm-commits] modules/phpwsbb/class Message.php,1.13,1.14 Thread.php,1.4,1.5

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

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

Modified Files:
	Message.php Thread.php 
Log Message:
Still need thread locking and message forking


Index: Message.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Message.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Message.php	3 Jun 2003 22:16:08 -0000	1.13
--- Message.php	3 Jun 2003 22:18:31 -0000	1.14
***************
*** 288,292 ****
                  break;
              case "fork":
-             case "lock":
              default:
                  $title = "NO OP";
--- 288,291 ----

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Thread.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Thread.php	3 Jun 2003 22:16:08 -0000	1.4
--- Thread.php	3 Jun 2003 22:18:31 -0000	1.5
***************
*** 168,172 ****
                  break;
  
-             case "fork":
              case "lock":
              default:
--- 168,171 ----

[phpws-comm-commits] modules/phpwsbb/class Manager.php,1.11,1.12 Message.php,1.11,1.12

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

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

Modified Files:
	Manager.php Message.php 
Log Message:
Got search working


Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Manager.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Manager.php	3 Jun 2003 21:26:42 -0000	1.11
--- Manager.php	3 Jun 2003 21:54:28 -0000	1.12
***************
*** 37,41 ****
          $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=new\">" . $_SESSION["translate"]->it("New Topic") . "</a>";
          if($tid)
!             $links[] =  "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=reply&amp;PHPWS_MAN_ITEMS[]=" . $this->thread->getId() . "\">" . $_SESSION["translate"]->it("Post Reply") . "</a>";
          $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=list\">" . $_SESSION["translate"]->it("List Topics") . "</a>";
  
--- 37,41 ----
          $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=new\">" . $_SESSION["translate"]->it("New Topic") . "</a>";
          if($tid)
!             $links[] =  "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=reply&amp;PHPWS_MAN_ITEMS[]=" . $tid . "\">" . $_SESSION["translate"]->it("Post Reply") . "</a>";
          $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=list\">" . $_SESSION["translate"]->it("List Topics") . "</a>";
  
***************
*** 95,103 ****
  
      function search($where) {
!         $sql = "SELECT tid,label FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages $where";
          $result = $GLOBALS["core"]->query($sql);
  
!         if($results) {
!             while($row = $result->fetchRow(DB_FETCHMOD_ASSOC)) {
                  $array[$row["tid"]] = $row["label"];
              }
--- 95,105 ----
  
      function search($where) {
!         $array = array();
! 
!         $sql = "SELECT tid, label FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages $where";
          $result = $GLOBALS["core"]->query($sql);
  
!         if($result) {
!             while($row = $result->fetchRow(DB_FETCHMODE_ASSOC)) {
                  $array[$row["tid"]] = $row["label"];
              }

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Message.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Message.php	3 Jun 2003 21:13:26 -0000	1.11
--- Message.php	3 Jun 2003 21:54:28 -0000	1.12
***************
*** 187,191 ****
              $thread = new PHPWSBB_Thread;
              $thread->setLabel($this->getLabel());
-             $thread->_lastreply = time();
              $thread->commit();
              $this->_tid = $thread->getId();
--- 187,190 ----

[phpws-comm-commits] modules/phpwsbb/boost install.php,1.2,1.3

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

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

Modified Files:
	install.php 
Log Message:
Got search working


Index: install.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/boost/install.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install.php	3 Jun 2003 21:26:38 -0000	1.2
--- install.php	3 Jun 2003 21:54:20 -0000	1.3
***************
*** 17,21 ****
          $search["search_class"] = "PHPWSBB_Manager";
          $search["search_function"] = "search";
!         $search["search_cols"] = "label,body";
          $search["view_string"] = "&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=";
          $search["show_block"] = 1;
--- 17,21 ----
          $search["search_class"] = "PHPWSBB_Manager";
          $search["search_function"] = "search";
!         $search["search_cols"] = "label, body";
          $search["view_string"] = "&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=";
          $search["show_block"] = 1;

[phpws-comm-commits] modules/phpwsbb/boost install.php,1.1,1.2

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

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

Modified Files:
	install.php 
Log Message:
Updated description and work on searches


Index: install.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/boost/install.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** install.php	20 May 2003 19:29:38 -0000	1.1
--- install.php	3 Jun 2003 21:26:38 -0000	1.2
***************
*** 16,23 ****
          $search["module"] = "phpwsbb";
          $search["search_class"] = "PHPWSBB_Manager";
!         $search["search_function"] = "searchMessages";
!         $search["search_cols"] = "none";
!         $search["view_string"] = "none";
!         $search["show_block"] = 0;
  
          if(!$GLOBALS["core"]->sqlInsert($search, "mod_search_register"))
--- 16,23 ----
          $search["module"] = "phpwsbb";
          $search["search_class"] = "PHPWSBB_Manager";
!         $search["search_function"] = "search";
!         $search["search_cols"] = "label,body";
!         $search["view_string"] = "&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=";
!         $search["show_block"] = 1;
  
          if(!$GLOBALS["core"]->sqlInsert($search, "mod_search_register"))

[phpws-comm-commits] modules/phpwsbb/conf controlpanel.php,1.1,1.2

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

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

Modified Files:
	controlpanel.php 
Log Message:
Updated description and work on searches


Index: controlpanel.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/conf/controlpanel.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** controlpanel.php	23 May 2003 20:45:12 -0000	1.1
--- controlpanel.php	3 Jun 2003 21:26:43 -0000	1.2
***************
*** 10,14 ****
  		 "url"=>"index.php?module=phpwsbb&PHPWSBB_MAN_OP=list",
  		 "image"=>$image,
! 		 "description"=>"Blah blah blah",
  		 "tab"=>"content");
  
--- 10,14 ----
  		 "url"=>"index.php?module=phpwsbb&PHPWSBB_MAN_OP=list",
  		 "image"=>$image,
! 		 "description"=>"A bulletin board module.",
  		 "tab"=>"content");
  

[phpws-comm-commits] modules/phpwsbb/class Manager.php,1.10,1.11

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

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

Modified Files:
	Manager.php 
Log Message:
Updated description and work on searches


Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Manager.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Manager.php	3 Jun 2003 21:13:26 -0000	1.10
--- Manager.php	3 Jun 2003 21:26:42 -0000	1.11
***************
*** 94,97 ****
--- 94,111 ----
  
  
+     function search($where) {
+         $sql = "SELECT tid,label FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages $where";
+         $result = $GLOBALS["core"]->query($sql);
+ 
+         if($results) {
+             while($row = $result->fetchRow(DB_FETCHMOD_ASSOC)) {
+                 $array[$row["tid"]] = $row["label"];
+             }
+         }
+ 
+         return $array;
+     }
+ 
+ 
      function action() {
          if(PHPWS_Message::isMessage($this->notice))

[phpws-comm-commits] modules/phpwsbb/class Manager.php,1.9,1.10 Message.php,1.10,1.11 Thread.php,1.2,1.3

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

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

Modified Files:
	Manager.php Message.php Thread.php 
Log Message:
Updates


Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Manager.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Manager.php	3 Jun 2003 20:45:29 -0000	1.9
--- Manager.php	3 Jun 2003 21:13:26 -0000	1.10
***************
*** 33,42 ****
  
  
!     function _menu() {
          $links = array();
!         $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=list\">" . $_SESSION["translate"]->it("List Messages") . "</a>";
!         $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=new\">" . $_SESSION["translate"]->it("Add New Message") . "</a>";
  
!         $menu = "<div align=\"right\">" . implode("&#160;|&#160;", $links) . "</div><br />";
          return $menu;
      }
--- 33,44 ----
  
  
!     function _menu($tid = NULL) {
          $links = array();
!         $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=new\">" . $_SESSION["translate"]->it("New Topic") . "</a>";
!         if($tid)
!             $links[] =  "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=reply&amp;PHPWS_MAN_ITEMS[]=" . $this->thread->getId() . "\">" . $_SESSION["translate"]->it("Post Reply") . "</a>";
!         $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=list\">" . $_SESSION["translate"]->it("List Topics") . "</a>";
  
!         $menu = "<div align=\"right\">" . implode("&#160;|&#160;", $links) . "</div>";
          return $menu;
      }
***************
*** 45,52 ****
      function _list() {
          $GLOBALS["CNT_phpwsbb"]["title"] = $_SESSION["translate"]->it("Bulletin Board Messages");
- 
-         $links = array();
-         $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=list\">" . $_SESSION["translate"]->it("List Topics") . "</a>";
-         $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=new\">" . $_SESSION["translate"]->it("Add New Topic") . "</a>";
  
          $GLOBALS["CNT_phpwsbb"]["content"] .= $this->_menu();
--- 47,50 ----

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Message.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Message.php	3 Jun 2003 20:45:29 -0000	1.10
--- Message.php	3 Jun 2003 21:13:26 -0000	1.11
***************
*** 224,235 ****
                      else
                          $title = $_SESSION["translate"]->it("New Message");
!                 $content = $_SESSION["PHPWSBB_Manager"]->_menu();
                  $content .= $this->_edit();
                  break;
              case "save":
!                 $this->_save();
                  break;
              case "view":
!                 $content = $_SESSION["PHPWSBB_Manager"]->_menu();
                  $content .= $this->_view();
                  break;
--- 224,235 ----
                      else
                          $title = $_SESSION["translate"]->it("New Message");
!                 $content = $_SESSION["PHPWSBB_Manager"]->_menu($this->_tid);
                  $content .= $this->_edit();
                  break;
              case "save":
!                 $this->_save($this->_tid);
                  break;
              case "view":
!                 $content = $_SESSION["PHPWSBB_Manager"]->_menu($this->_tid);
                  $content .= $this->_view();
                  break;

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Thread.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Thread.php	3 Jun 2003 20:45:29 -0000	1.2
--- Thread.php	3 Jun 2003 21:13:26 -0000	1.3
***************
*** 75,79 ****
  
          // Need to cycle through all messages and view
!         $content = $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "view.tpl");
  
          foreach($this->messages as $mid) {
--- 75,79 ----
  
          // Need to cycle through all messages and view
!         //$content = $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "view_thread.tpl");
  
          foreach($this->messages as $mid) {
***************
*** 152,156 ****
              case "view":
                  $title = $this->getLabel();
!                 $content = $_SESSION["PHPWSBB_Manager"]->_menu();
                  $content .= $this->_view();
                  break;
--- 152,156 ----
              case "view":
                  $title = $this->getLabel();
!                 $content = $_SESSION["PHPWSBB_Manager"]->_menu($this->getId());
                  $content .= $this->_view();
                  break;

[phpws-comm-commits] modules/phpwsbb/templates view.tpl,1.3,1.4

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

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

Modified Files:
	view.tpl 
Log Message:
Updates


Index: view.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/templates/view.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** view.tpl	3 Jun 2003 19:03:21 -0000	1.3
--- view.tpl	3 Jun 2003 21:13:31 -0000	1.4
***************
*** 1,3 ****
- {REPLY}
  <table border="0" cellpadding="1" cellspacing="0" width="100%">
  <tr class="bg_medium"><td><b>{SUBJECT}</b></td></tr>
--- 1,2 ----
***************
*** 5,9 ****
  <span class="smalltext">{POSTED}</span><br />
  <hr size="1" width="100%" noshade /><br />
! {BODY}
  </td></tr>
  </table>
--- 4,9 ----
  <span class="smalltext">{POSTED}</span><br />
  <hr size="1" width="100%" noshade /><br />
! {BODY}<br />
! <div class="smalltext" align="right">{QUOTE}</div>
  </td></tr>
  </table>

[phpws-comm-commits] modules/phpwsbb/class Manager.php,1.8,1.9 Message.php,1.9,1.10 Thread.php,1.1,1.2

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

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

Modified Files:
	Manager.php Message.php Thread.php 
Log Message:
phat tight boss updatez


Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Manager.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Manager.php	3 Jun 2003 20:07:10 -0000	1.8
--- Manager.php	3 Jun 2003 20:45:29 -0000	1.9
***************
*** 53,56 ****
--- 53,57 ----
  
          $this->setTable("mod_phpwsbb_threads");
+         $this->setOrder("updated DESC");
          $GLOBALS["CNT_phpwsbb"]["content"] .= $this->getList("threads", $_SESSION["translate"]->it("Bulletin Board Topics"));
      }// END FUNC _list
***************
*** 63,66 ****
--- 64,79 ----
  
  
+     function _delete() {
+         $this->thread = new PHPWSBB_Thread($_REQUEST["PHPWS_MAN_ITEMS"][0]);
+         $_REQUEST["PHPWSBB_THREAD_OP"] = "delete";
+     }// END FUNC _delete
+ 
+ 
+     function _deleteMessage() {
+         $this->message = new PHPWSBB_Message($_REQUEST["PHPWS_MAN_ITEMS"][0]);
+         $_REQUEST["PHPWSBB_MESSAGE_OP"] = "delete";
+     }// END FUNC _deleteMessage
+ 
+ 
      function _new() {
          $this->message = new PHPWSBB_Message;
***************
*** 84,94 ****
  
      function action() {
          switch($_REQUEST["PHPWSBB_MAN_OP"]) {
              case "new":
!                 $content = $this->_new();
                  break;
              case "reply":
!                 $content = $this->_reply();
                  break;
              case "access_denied":
                  $this->_accessDenied();
--- 97,112 ----
  
      function action() {
+         if(PHPWS_Message::isMessage($this->notice))
+             $this->notice->display();
+ 
          switch($_REQUEST["PHPWSBB_MAN_OP"]) {
              case "new":
!                 $this->_new();
                  break;
+ 
              case "reply":
!                 $this->_reply();
                  break;
+ 
              case "access_denied":
                  $this->_accessDenied();

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Message.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Message.php	3 Jun 2003 20:07:10 -0000	1.9
--- Message.php	3 Jun 2003 20:45:29 -0000	1.10
***************
*** 73,79 ****
  
          $poster = $this->getOwner();
!         if(empty($poster)) {
!             $poster = $this->guestname;
!             $posteremail = $this->guestemail;
          }
  
--- 73,79 ----
  
          $poster = $this->getOwner();
!         if(is_null($poster)) {
!             $poster = $this->_guestname;
!             $posteremail = $this->_guestemail;
          }
  
***************
*** 107,111 ****
          /* Guest information, if not registered user */
          if(empty($_SESSION["OBJ_user"]->user_id)) {
-             $tags["GUESTNAME_TEXT"] = $_SESSION["translate"]->it("Guest Name");
              $form->add("Message_guestname", "text", $this->_guestname);
              $form->setSize("Message_guestname", 33);
--- 107,110 ----
***************
*** 114,118 ****
              $tabs++;
  
-             $tags["GUESTEMAIL_TEXT"] = $_SESSION["translate"]->it("Guest Email");
              $form->add("Message_guestemail", "text", $this->_guestemail);
              $form->setSize("Message_guestemail", 33);
--- 113,116 ----
***************
*** 146,149 ****
--- 144,152 ----
          $tags = $form->getTemplate();
  
+         if(empty($_SESSION["OBJ_user"]->user_id)) {
+             $tags["GUESTNAME_TEXT"] = $_SESSION["translate"]->it("Guest Name");
+             $tags["GUESTEMAIL_TEXT"] = $_SESSION["translate"]->it("Guest Email");
+         }
+ 
          $tags["LABEL_TEXT"] = $_SESSION["translate"]->it("Subject");
          $tags["BODY_TEXT"] = $_SESSION["translate"]->it("Body");
***************
*** 182,186 ****
          else {
              // Need to create thread
-             echo "<h3>creating new thread</h3>";
              $thread = new PHPWSBB_Thread;
              $thread->setLabel($this->getLabel());
--- 185,188 ----
***************
*** 188,192 ****
              $thread->commit();
              $this->_tid = $thread->getId();
-             echo "<h3>thread has tid " . $this->getId() . "</h3>";
          }
  
--- 190,193 ----

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Thread.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Thread.php	3 Jun 2003 20:07:10 -0000	1.1
--- Thread.php	3 Jun 2003 20:45:29 -0000	1.2
***************
*** 96,100 ****
          }
          $this->commit();
!     }
  
  
--- 96,149 ----
          }
          $this->commit();
!     }// END FUNC updateThreadStats
! 
! 
!     function _delete() {
!         if(!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "delete_threads")) {
!             $message = $_SESSION["translate"]->it("Access to delete this thread was denied due to lack of proper permissions.");
!             $error = new PHWPS_Error("phpwsbb", "PHPWSBB_Thread::_delete()", $message, "exit", 1);
!             $error->message();
!             return FALSE;
!         }
! 
!         if(isset($_REQUEST["Thread_yes"])) {
!             $this->kill();
! 
!             // Need to delete all messages
!             $GLOBALS["core"]->sqlDelete("mod_phpwsbb_messages", "tid", $this->getId());
! 
!             $message = $_SESSION["translate"]->it("The thread [var1] was successfully deleted from the database.", "<b><i>" . $this->getLabel() . "</i></b>");
!             $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb");
!             $_REQUEST["PHPWSBB_MAN_OP"] = "list";
!             $_SESSION["PHPWSBB_Manager"]->action();
!             $_SESSION["PHPWSBB_Manager"]->managerAction();
! 
!         } elseif(isset($_REQUEST["Thread_no"])) {
!             $message = $_SESSION["translate"]->it("No thread was deleted from the database.");
!             $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb");
!             $_REQUEST["PHPWSBB_MAN_OP"] = "list";
!             $_SESSION["PHPWSBB_Manager"]->action();
!             $_SESSION["PHPWSBB_Manager"]->managerAction();
! 
!         } else {
!             $title = $_SESSION["translate"]->it("Delete Thread Confirmation");
! 
!             $form = new EZform("PHPWSBB_Thread_delete");
!             $form->add("module", "hidden", "phpwsbb");
!             $form->add("PHPWSBB_THREAD_OP", "hidden", "delete");
! 
!             $form->add("Thread_yes", "submit", $_SESSION["translate"]->it("Yes"));
!             $form->add("Thread_no", "submit", $_SESSION["translate"]->it("No"));
! 
!             $tags = array();
!             $tags = $form->getTemplate();
!             $tags["MESSAGE"] = $_SESSION["translate"]->it("Are you sure you want to delete this thread?");
!             
!             $content = $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "delete_thread.tpl");
!             $_SESSION["OBJ_layout"]->popbox($title, $content, NULL, "CNT_phpwsbb");
!         }
! 
! 
!     }// END FUNC _delete
  
  
***************
*** 106,110 ****
--- 155,163 ----
                  $content .= $this->_view();
                  break;
+ 
              case "delete":
+                 $this->_delete();
+                 break;
+ 
              case "fork":
              case "lock":

[phpws-comm-commits] modules/phpwsbb/templates delete_message.tpl,NONE,1.1 delete_thread.tpl,NONE,1.1

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

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

Added Files:
	delete_message.tpl delete_thread.tpl 
Log Message:
phat tight boss updatez


--- NEW FILE: delete_message.tpl ---
{START_FORM}
{MESSAGE}<br /><br />
{MESSAGE_NO}&#160;&#160;{MESSAGE_YES}
{END_FORM}

--- NEW FILE: delete_thread.tpl ---
{START_FORM}
{MESSAGE}<br /><br />
{THREAD_NO}&#160;&#160;{THREAD_YES}
{END_FORM}

[phpws-comm-commits] modules/phpwsbb/class Thread.php,NONE,1.1 Manager.php,1.7,1.8 Message.php,1.8,1.9

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

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

Modified Files:
	Manager.php Message.php 
Added Files:
	Thread.php 
Log Message:
Adding thread layer


--- NEW FILE: Thread.php ---
<?php
/**
* @version  $Id: Thread.php,v 1.1 2003/06/03 20:07:10 dtseiler Exp $
* @author   Don Seiler <do...@NO...>
*/

class PHPWSBB_Thread extends PHPWS_Item {

    /**
    * Sticky flag
    *
    * @var      bit
    * @access   private
    */
    var $_sticky = 0;

    /**
    * Locked flag
    *
    * @var      bit
    * @access   private
    */
    var $_locked = 0;

    /**
    * Number of replies to this message
    *
    * @var      integer
    * @access   private
    */
    var $_replies = 0;

    /**
    * The ids of all the messages under this one
    *
    * @var      array
    * @access   private
    */
    var $messages = array();

    function PHPWSBB_Thread($THREAD_ID = NULL) {
        /* These variable are excluded when calling commit() */
        $exclude = array("messages");
        $this->addExclude($exclude);

        /* Set database table */
        $this->setTable("mod_phpwsbb_threads");

        /* Populate this object if ID exists */
        if(isset($THREAD_ID)) {
            $this->setId($THREAD_ID);
            $this->init();
            $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages WHERE tid=" . $this->getId() . " ORDER BY created;";
            $this->messages = $GLOBALS["core"]->getCol($sql);
        }

    }// END FUNC PHPWSBB_Thread


    function _view() {
        $tags = array();

        $tags["ID"]         = $this->getId();
        $tags["OWNER"]      = $this->getOwner();
        $tags["EDITOR"]     = $this->getEditor();
        $tags["IP"]         = $this->getIp();
        $tags["CREATED"]    = $this->getCreated();
        $tags["UPDATED"]    = $this->getUpdated();
        $tags["LABEL"]    = $this->getLabel();
        $tags["STICKY"]     = $this->_sticky;
        $tags["LOCKED"]     = $this->_locked;
        $tags["REPLIES"]    = $this->_replies;

        //$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 messages and view
        $content = $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "view.tpl");

        foreach($this->messages as $mid) {
            $message = new PHPWSBB_Message($mid);
            $content .= "<br />" . $message->_view();
        }

        return $content;

    }// END FUNC _view


    function updateThreadStats() {
        if(!empty($this->_id)) {
            $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages WHERE tid=" . $this->getId() . " ORDER BY created;";
            $this->messages = $GLOBALS["core"]->getCol($sql);
            $this->_replies = count($this->messages) - 1;
        } else {
            $this->_replies = 0;
        }
        $this->commit();
    }


    function action() {
        switch($_REQUEST["PHPWSBB_THREAD_OP"]) {
            case "view":
                $title = $this->getLabel();
                $content = $_SESSION["PHPWSBB_Manager"]->_menu();
                $content .= $this->_view();
                break;
            case "delete":
            case "fork":
            case "lock":
            default:
                $title = "NO OP";
                $content = "This function is not yet implemented";
        }

        if(isset($content)) {
            $GLOBALS["CNT_phpwsbb"]["title"] = $title;
            $GLOBALS["CNT_phpwsbb"]["content"] .= $content;
        }
    }// END FUNC _action

}// END CLASS PHPWSBB_Message

Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Manager.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Manager.php	3 Jun 2003 19:03:15 -0000	1.7
--- Manager.php	3 Jun 2003 20:07:10 -0000	1.8
***************
*** 7,11 ****
  class PHPWSBB_Manager extends PHPWS_Manager {
  
!     var $message = NULL;
  
      /**
--- 7,20 ----
  class PHPWSBB_Manager extends PHPWS_Manager {
  
!     var $notice = NULL;
! 
!     /**
!     * The thread object
!     *
!     * @var      PHPWSBB_Message
!     * @access   public
!     */
!     var $thread = NULL;
! 
  
      /**
***************
*** 15,23 ****
      * @access   public
      */
!     var $phpwsbb_message = NULL;
      
      function PHPWSBB_Manager() {
          $this->setModule("phpwsbb");
-         $this->setTable("mod_phpwsbb_messages");
          $this->setRequest("PHPWSBB_MAN_OP");
          $this->init();
--- 24,31 ----
      * @access   public
      */
!     var $message = NULL;
      
      function PHPWSBB_Manager() {
          $this->setModule("phpwsbb");
          $this->setRequest("PHPWSBB_MAN_OP");
          $this->init();
***************
*** 39,65 ****
  
          $links = array();
!         $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=list\">" . $_SESSION["translate"]->it("List Messages") . "</a>";
!         $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=new\">" . $_SESSION["translate"]->it("Add New Message") . "</a>";
  
          $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
  
  
      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
--- 47,74 ----
  
          $links = array();
!         $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=list\">" . $_SESSION["translate"]->it("List Topics") . "</a>";
!         $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=new\">" . $_SESSION["translate"]->it("Add New Topic") . "</a>";
  
          $GLOBALS["CNT_phpwsbb"]["content"] .= $this->_menu();
  
!         $this->setTable("mod_phpwsbb_threads");
!         $GLOBALS["CNT_phpwsbb"]["content"] .= $this->getList("threads", $_SESSION["translate"]->it("Bulletin Board Topics"));
      }// END FUNC _list
  
  
      function _view() {
!         $this->thread = new PHPWSBB_Thread($_REQUEST["PHPWS_MAN_ITEMS"][0]);
!         $_REQUEST["PHPWSBB_THREAD_OP"] = "view";
      }// END FUNC _view
  
  
      function _new() {
!         $this->message = new PHPWSBB_Message;
          $_REQUEST["PHPWSBB_MESSAGE_OP"] = "edit";
      }// END FUNC _new
  
      function _reply() {
!         $this->message = new PHPWSBB_Message;
!         $this->message->_tid = $_REQUEST["PHPWS_MAN_ITEMS"][0];
          $_REQUEST["PHPWSBB_MESSAGE_OP"] = "edit";
      }// END FUNC _new

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Message.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Message.php	3 Jun 2003 19:03:15 -0000	1.8
--- Message.php	3 Jun 2003 20:07:10 -0000	1.9
***************
*** 8,17 ****
  
      /**
!     * The parent id of this message
      *
      * @var      integer
      * @access   private
      */
!     var $_pid = 0;
  
      /**
--- 8,17 ----
  
      /**
!     * The thread id of this message
      *
      * @var      integer
      * @access   private
      */
!     var $_tid = 0;
  
      /**
***************
*** 39,86 ****
      var $_body = NULL;
  
-     /**
-     * Sticky flag
-     *
-     * @var      bit
-     * @access   private
-     */
-     var $_sticky = 0;
- 
-     /**
-     * Locked flag
-     *
-     * @var      bit
-     * @access   private
-     */
-     var $_locked = 0;
- 
-     /**
-     * Number of replies to this message
-     *
-     * @var      integer
-     * @access   private
-     */
-     var $_replies = 0;
- 
-     /**
-     * Timestamp of last post
-     *
-     * @var      string
-     * @access   private
-     */
-     var $_lastreply = NULL;
- 
-     /**
-     * The ids of all the messages under this one
-     *
-     * @var      array
-     * @access   private
-     */
-     var $children = array();
  
      function PHPWSBB_Message($MESSAGE_ID = NULL) {
          /* These variable are excluded when calling commit() */
!         $exclude = array("children");
!         $this->addExclude($exclude);
  
          /* Set database table */
--- 39,47 ----
      var $_body = NULL;
  
  
      function PHPWSBB_Message($MESSAGE_ID = NULL) {
          /* These variable are excluded when calling commit() */
!         //$exclude = array("children");
!         //$this->addExclude($exclude);
  
          /* Set database table */
***************
*** 91,96 ****
              $this->setId($MESSAGE_ID);
              $this->init();
-             $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages WHERE pid=" . $this->getId() . " ORDER BY created;";
-             $this->children = $GLOBALS["core"]->getCol($sql);
          }
  
--- 52,55 ----
***************
*** 111,119 ****
          $tags["GUESTNAME"]  = $this->_guestname;
          $tags["GUESTEMAIL"] = $this->_guestemail;
!         $tags["PID"]        = $this->_pid;
!         $tags["STICKY"]     = $this->_sticky;
!         $tags["LOCKED"]     = $this->_locked;
!         $tags["REPLIES"]    = $this->_replies;
!         $tags["LASTREPLY"]   = $this->_lastreply;
  
          $poster = $this->getOwner();
--- 70,74 ----
          $tags["GUESTNAME"]  = $this->_guestname;
          $tags["GUESTEMAIL"] = $this->_guestemail;
!         $tags["TID"]        = $this->_tid;
  
          $poster = $this->getOwner();
***************
*** 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
--- 80,87 ----
          $tags["POSTED"]     = $_SESSION["translate"]->it("Posted by [var1] on [var2]", $poster, $this->getCreated());
  
!         if(!empty($this->_tid))
!             $tags["REPLY"]      = "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=reply&amp;PHPWS_MAN_ITEMS[]=" . $this->_tid . "\">" . $_SESSION["translate"]->it("Reply to Message") . "</a>";
  
!         return $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "view.tpl");
  
      }// END FUNC _view
***************
*** 196,200 ****
          $form->add("module", "hidden", "phpwsbb");
          $form->add("PHPWSBB_MESSAGE_OP", "hidden", "save");
!         $form->add("Message_pid", "hidden", $this->_pid);
  
          $tags = array();
--- 141,145 ----
          $form->add("module", "hidden", "phpwsbb");
          $form->add("PHPWSBB_MESSAGE_OP", "hidden", "save");
!         $form->add("Message_tid", "hidden", $this->_tid);
  
          $tags = array();
***************
*** 226,234 ****
              $this->_body = $_REQUEST["Message_body"];
  
-         if(isset($_REQUEST["Message_pid"]))
-             if(empty($_REQUEST["Message_pid"]))
-                 $this->_pid = 0;
-             else
-                 $this->_pid = $_REQUEST["Message_pid"];
  
          if(isset($_REQUEST["Message_guestname"]))
--- 171,174 ----
***************
*** 238,242 ****
              $this->_guestemail = $_REQUEST["Message_guestemail"];
  
!         $this->getLatest();
  
          $error = $this->commit();
--- 178,193 ----
              $this->_guestemail = $_REQUEST["Message_guestemail"];
  
!         if(!empty($_REQUEST["Message_tid"]))
!             $this->_tid = $_REQUEST["Message_tid"];
!         else {
!             // Need to create thread
!             echo "<h3>creating new thread</h3>";
!             $thread = new PHPWSBB_Thread;
!             $thread->setLabel($this->getLabel());
!             $thread->_lastreply = time();
!             $thread->commit();
!             $this->_tid = $thread->getId();
!             echo "<h3>thread has tid " . $this->getId() . "</h3>";
!         }
  
          $error = $this->commit();
***************
*** 251,274 ****
          } else {
              $GLOBALS["CNT_phpwsbb"]["content"] .= $_SESSION["translate"]->it("Your message was successfully saved.") . "<br />\n";
-             $_REQUEST["PHPWSBB_MESSAGE_OP"] = "view";
-             $this->action();
-         }
-     }// END FUNC _save
  
  
!     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();
!             }
!     }
  
  
--- 202,214 ----
          } else {
              $GLOBALS["CNT_phpwsbb"]["content"] .= $_SESSION["translate"]->it("Your message was successfully saved.") . "<br />\n";
  
+             // Update thread object with new statistics
+             $thread = new PHPWSBB_Thread($this->_tid);
+             $thread->updateThreadStats();
  
!             $_REQUEST["PHPWSBB_THREAD_OP"] = "view";
!             $thread->action();
!         }
!     }// END FUNC _save
  
  
***************
*** 279,283 ****
                      $title = $_SESSION["translate"]->it("Edit Message");
                  else
!                     if(isset($this->_pid))
                          $title = $_SESSION["translate"]->it("Reply to Message");
                      else
--- 219,223 ----
                      $title = $_SESSION["translate"]->it("Edit Message");
                  else
!                     if(isset($this->_tid))
                          $title = $_SESSION["translate"]->it("Reply to Message");
                      else

[phpws-comm-commits] modules/phpwsbb/boost install.sql,1.4,1.5 uninstall.sql,1.1,1.2

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

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

Modified Files:
	install.sql uninstall.sql 
Log Message:
Adding thread layer


Index: install.sql
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/boost/install.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** install.sql	3 Jun 2003 16:22:40 -0000	1.4
--- install.sql	3 Jun 2003 20:07:09 -0000	1.5
***************
*** 1,4 ****
--- 1,21 ----
  -- $Id$
  
+ CREATE TABLE mod_phpwsbb_threads (
+     id          int NOT NULL default '0',
+     owner       varchar(20) default '',
+     editor      varchar(20) default '',
+     ip          text,
+     label       text NOT NULL,
+     groups      text,
+     created     int NOT NULL default '0',
+     updated     int NOT NULL default '0',
+     hidden      smallint NOT NULL default '1',
+     approved    smallint NOT NULL default '0',
+     sticky      smallint,
+     locked      smallint,
+     replies     int NOT NULL default '0',
+     PRIMARY KEY (id)
+ );
+ 
  CREATE TABLE mod_phpwsbb_messages (
      id          int NOT NULL default '0',
***************
*** 12,23 ****
      hidden      smallint NOT NULL default '1',
      approved    smallint NOT NULL default '0',
!     pid         int NOT NULL default '0',
      guestname   varchar(50),
      guestemail  varchar(80),
      body        text,
-     sticky      smallint,
-     locked      smallint,
-     replies     int NOT NULL default '0',
-     lastreply   int NOT NULL default 0,
      PRIMARY KEY (id)
  );
--- 29,36 ----
      hidden      smallint NOT NULL default '1',
      approved    smallint NOT NULL default '0',
!     tid         int NOT NULL default '0',
      guestname   varchar(50),
      guestemail  varchar(80),
      body        text,
      PRIMARY KEY (id)
  );

Index: uninstall.sql
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/boost/uninstall.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** uninstall.sql	20 May 2003 19:29:38 -0000	1.1
--- uninstall.sql	3 Jun 2003 20:07:09 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  -- $Id$
  
+ DROP TABLE mod_phpwsbb_threads;
  DROP TABLE mod_phpwsbb_messages;

[phpws-comm-commits] modules/phpwsbb index.php,1.2,1.3

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

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

Modified Files:
	index.php 
Log Message:
Adding thread layer


Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	3 Jun 2003 16:22:27 -0000	1.2
--- index.php	3 Jun 2003 20:06:57 -0000	1.3
***************
*** 15,20 ****
  }
  
! if(isset($_REQUEST["PHPWSBB_MESSAGE_OP"]) && isset($_SESSION["PHPWSBB_Manager"]->phpwsbb_message))
!     $_SESSION["PHPWSBB_Manager"]->phpwsbb_message->action();
  
  ?>
--- 15,23 ----
  }
  
! if(isset($_REQUEST["PHPWSBB_THREAD_OP"]) && isset($_SESSION["PHPWSBB_Manager"]->thread))
!     $_SESSION["PHPWSBB_Manager"]->thread->action();
! 
! if(isset($_REQUEST["PHPWSBB_MESSAGE_OP"]) && isset($_SESSION["PHPWSBB_Manager"]->message))
!     $_SESSION["PHPWSBB_Manager"]->message->action();
  
  ?>

[phpws-comm-commits] modules/phpwsbb/templates/manager list.tpl,1.5,1.6 row.tpl,1.4,1.5

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

Update of /cvsroot/phpwebsite-comm/modules/phpwsbb/templates/manager
In directory sc8-pr-cvs1:/tmp/cvs-serv32753/templates/manager

Modified Files:
	list.tpl row.tpl 
Log Message:
Adding thread layer


Index: list.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/templates/manager/list.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** list.tpl	3 Jun 2003 19:03:22 -0000	1.5
--- list.tpl	3 Jun 2003 20:07:12 -0000	1.6
***************
*** 7,11 ****
  <td align="center" valign="middle" class="smalltext"><b>{OWNER_LABEL}</b></td>
  <td align="center" valign="middle" class="smalltext"><b>{REPLIES_LABEL}</b></td>
! <td align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTREPLY_LABEL}</b></td>
  </tr>
  {LIST_ITEMS}
--- 7,11 ----
  <td align="center" valign="middle" class="smalltext"><b>{OWNER_LABEL}</b></td>
  <td align="center" valign="middle" class="smalltext"><b>{REPLIES_LABEL}</b></td>
! <td align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{UPDATED_LABEL}</b></td>
  </tr>
  {LIST_ITEMS}

Index: row.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/templates/manager/row.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** row.tpl	3 Jun 2003 19:03:22 -0000	1.4
--- row.tpl	3 Jun 2003 20:07:13 -0000	1.5
***************
*** 7,10 ****
  <td class="smalltext">{OWNER}</td>
  <td class="smalltext">{REPLIES}</td>
! <td class="smalltext">{LASTREPLY}</td>
  </tr>
--- 7,10 ----
  <td class="smalltext">{OWNER}</td>
  <td class="smalltext">{REPLIES}</td>
! <td class="smalltext">{UPDATED}</td>
  </tr>

[phpws-comm-commits] modules/phpwsbb/conf boost.php,1.2,1.3 manager.php,1.5,1.6 module_rights.txt,1.1,1.2

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

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

Modified Files:
	boost.php manager.php module_rights.txt 
Log Message:
Adding thread layer


Index: boost.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/conf/boost.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** boost.php	20 May 2003 21:59:16 -0000	1.2
--- boost.php	3 Jun 2003 20:07:11 -0000	1.3
***************
*** 17,21 ****
  $admin_op = "&PHPWSBB_MAN_OP=list";
  
! $mod_class_files = array("Message.php", "Manager.php");
  $mod_sessions = array("PHPWSBB_Manager");
  $init_object = array("PHPWSBB_Manager"=>"PHPWSBB_Manager");
--- 17,21 ----
  $admin_op = "&PHPWSBB_MAN_OP=list";
  
! $mod_class_files = array("Thread.php", "Message.php", "Manager.php");
  $mod_sessions = array("PHPWSBB_Manager");
  $init_object = array("PHPWSBB_Manager"=>"PHPWSBB_Manager");

Index: manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/conf/manager.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** manager.php	3 Jun 2003 16:22:43 -0000	1.5
--- manager.php	3 Jun 2003 20:07:11 -0000	1.6
***************
*** 6,19 ****
  
  /* The name of my lists and their corresponding database constraints */
! $lists = array("messages"=>"pid=0");
  
  /* The directory where my templates are located */
! $templates = array("messages"=>"manager");
  
  /* The columns to list for my defined "saved" list and their labels */
! $messagesColumns = array(   "label"=>$_SESSION["translate"]->it("Subject"),
                              "owner"=>$_SESSION["translate"]->it("Poster"),
                              "replies"=>$_SESSION["translate"]->it("Replies"),
!                             "lastreply"=>$_SESSION["translate"]->it("Last Reply"),
                              "id"=>NULL,
                              "locked"=>NULL,
--- 6,19 ----
  
  /* The name of my lists and their corresponding database constraints */
! $lists = array("threads"=>"approved=1");
  
  /* The directory where my templates are located */
! $templates = array("threads"=>"manager");
  
  /* The columns to list for my defined "saved" list and their labels */
! $threadsColumns = array(   "label"=>$_SESSION["translate"]->it("Topic"),
                              "owner"=>$_SESSION["translate"]->it("Poster"),
                              "replies"=>$_SESSION["translate"]->it("Replies"),
!                             "updated"=>$_SESSION["translate"]->it("Last Reply"),
                              "id"=>NULL,
                              "locked"=>NULL,
***************
*** 21,41 ****
  
  /* The actions to show in the defined "saved" list and their labels */
! $messagesActions = array(   "view"=>"View",
!                             "edit"=>"Edit",
                              "delete"=>"Delete",
-                             "fork"=>"Fork",
                              "lock"=>"Lock"
                          );
  
  /* The permissions associated with the defined actions above */
! $messagesPermissions = array(   "view"=>NULL,
!                                 "edit"=>"edit_messages",
!                                 "delete"=>"delete_messages",
!                                 "fork"=>"fork_messages",
                                  "lock"=>"lock_threads"
                              );
  
  /* The paging parameters for the list */
! $messagesPaging = array(    "op"=>"PHPWSBB_MAN_OP=list",
                              "limit"=>50,
                              "secion"=>1,
--- 21,37 ----
  
  /* The actions to show in the defined "saved" list and their labels */
! $threadsActions = array(   "view"=>"View",
                              "delete"=>"Delete",
                              "lock"=>"Lock"
                          );
  
  /* The permissions associated with the defined actions above */
! $threadsPermissions = array(   "view"=>NULL,
!                                 "delete"=>"delete_threads",
                                  "lock"=>"lock_threads"
                              );
  
  /* The paging parameters for the list */
! $threadsPaging = array(    "op"=>"PHPWSBB_MAN_OP=list",
                              "limit"=>50,
                              "secion"=>1,

Index: module_rights.txt
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/conf/module_rights.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** module_rights.txt	20 May 2003 19:29:38 -0000	1.1
--- module_rights.txt	3 Jun 2003 20:07:11 -0000	1.2
***************
*** 1,4 ****
  edit_messages::Add/Edit Messages
! delete_messages::Delete Messages/Threads
  fork_messages::Fork Messages Into New Threads
  lock_threads::Lock Threads
--- 1,5 ----
  edit_messages::Add/Edit Messages
! delete_messages::Delete Messages
  fork_messages::Fork Messages Into New Threads
  lock_threads::Lock Threads
+ delete_threads::Delete Threads

[phpws-comm-commits] modules/phpwsbb/templates/manager list.tpl,1.4,1.5 row.tpl,1.3,1.4

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

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

Modified Files:
	list.tpl row.tpl 
Log Message:
Checking in before some big changes


Index: list.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/templates/manager/list.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** list.tpl	3 Jun 2003 16:22:44 -0000	1.4
--- list.tpl	3 Jun 2003 19:03:22 -0000	1.5
***************
*** 1,14 ****
  <table border="0" width="100%" cellspacing="1" cellpadding="4">
  <tr class="bg_medium">
! <td width="100%" class="smalltext">{LABEL_LABEL}</td>
! <td align="center" valign="middle" class="smalltext">{OWNER_LABEL}</td>
! <td align="center" valign="middle" class="smalltext">{REPLIES_LABEL}</td>
! <td align="center" valign="middle" nowrap="nowrap" class="smalltext">{LASTREPLY_LABEL}</td>
  </tr>
  {LIST_ITEMS}
  <!-- BEGIN navigation -->
  <tr class="bg_medium">
! <td>{NAV_LIMITS}&#160;&#160;&#160;&#160;{NAV_BACKWARD}&#160;{NAV_SECTIONS}&#160;{NAV_FORWARD}</td>
! <td align="right">{ACTION_SELECT} {ACTION_BUTTON}</td>
  </tr>
  <!-- END navigation -->
--- 1,17 ----
  <table border="0" width="100%" cellspacing="1" cellpadding="4">
  <tr class="bg_medium">
! <!-- BEGIN SELECT_LABEL -->
! <td class="smalltext"><b>{SELECT_LABEL}</b></td>
! <!-- END SELECT_LABEL -->
! <td width="100%" class="smalltext"><b>{LABEL_LABEL}</b></td>
! <td align="center" valign="middle" class="smalltext"><b>{OWNER_LABEL}</b></td>
! <td align="center" valign="middle" class="smalltext"><b>{REPLIES_LABEL}</b></td>
! <td align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTREPLY_LABEL}</b></td>
  </tr>
  {LIST_ITEMS}
  <!-- BEGIN navigation -->
  <tr class="bg_medium">
! <td colspan="2">{NAV_LIMITS}&#160;&#160;&#160;&#160;{NAV_BACKWARD}&#160;{NAV_SECTIONS}&#160;{NAV_FORWARD}</td>
! <td align="right" colspan="3">{ACTION_SELECT} {ACTION_BUTTON}</td>
  </tr>
  <!-- END navigation -->

Index: row.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/templates/manager/row.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** row.tpl	3 Jun 2003 16:22:45 -0000	1.3
--- row.tpl	3 Jun 2003 19:03:22 -0000	1.4
***************
*** 1,5 ****
  <tr{ROW_CLASS}>
  <td class="smalltext">
! <a href="./index.php?module=phpwsbb&amp;PHPWSBB_OP=view&amp;PHPWSBB_id={ID}">{LABEL}</a></td>
  <td class="smalltext">{OWNER}</td>
  <td class="smalltext">{REPLIES}</td>
--- 1,8 ----
  <tr{ROW_CLASS}>
+ <!-- BEGIN SELECT -->
+ <td class="smalltext" align="center">{SELECT}</td>
+ <!-- END SELECT -->
  <td class="smalltext">
! <a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=view&amp;PHPWS_MAN_ITEMS[]={ID}">{LABEL}</a></td>
  <td class="smalltext">{OWNER}</td>
  <td class="smalltext">{REPLIES}</td>

[phpws-comm-commits] modules/phpwsbb/templates view.tpl,1.2,1.3

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

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

Modified Files:
	view.tpl 
Log Message:
Checking in before some big changes


Index: view.tpl
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/templates/view.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** view.tpl	23 May 2003 04:09:28 -0000	1.2
--- view.tpl	3 Jun 2003 19:03:21 -0000	1.3
***************
*** 1,5 ****
  {REPLY}
  <table border="0" cellpadding="1" cellspacing="0" width="100%">
! <tr class="bg_medium"><td><h3>{SUBJECT}</h3></td></tr>
  <tr valign="top"><td>
  <span class="smalltext">{POSTED}</span><br />
--- 1,5 ----
  {REPLY}
  <table border="0" cellpadding="1" cellspacing="0" width="100%">
! <tr class="bg_medium"><td><b>{SUBJECT}</b></td></tr>
  <tr valign="top"><td>
  <span class="smalltext">{POSTED}</span><br />

[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

[phpws-comm-commits] modules/phpwsbb/boost install.sql,1.3,1.4

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

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

Modified Files:
	install.sql 
Log Message:
Updates for adding replies and lastreply fields


Index: install.sql
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/boost/install.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install.sql	23 May 2003 04:09:28 -0000	1.3
--- install.sql	3 Jun 2003 16:22:40 -0000	1.4
***************
*** 18,21 ****
--- 18,23 ----
      sticky      smallint,
      locked      smallint,
+     replies     int NOT NULL default '0',
+     lastreply   int NOT NULL default 0,
      PRIMARY KEY (id)
  );

[phpws-comm-commits] modules/phpwsbb index.php,1.1,1.2

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

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

Modified Files:
	index.php 
Log Message:
Updates for adding replies and lastreply fields


Index: index.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.php	20 May 2003 19:29:38 -0000	1.1
--- index.php	3 Jun 2003 16:22:27 -0000	1.2
***************
*** 15,20 ****
  }
  
! if(isset($_REQUEST["PHPWSBB_OP"]) && isset($_SESSION["PHPWSBB_Manager"]->message))
!     $_SESSION["PHPWSBB_Manager"]->message->action();
  
  ?>
--- 15,20 ----
  }
  
! if(isset($_REQUEST["PHPWSBB_MESSAGE_OP"]) && isset($_SESSION["PHPWSBB_Manager"]->phpwsbb_message))
!     $_SESSION["PHPWSBB_Manager"]->phpwsbb_message->action();
  
  ?>