[phpws-comm-commits] modules/phpwsbb/class Manager.php,1.15,1.16 Message.php,1.16,1.17 Thread.php,1.7,1.8

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

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

Modified Files:
	Manager.php Message.php Thread.php 
Log Message:
Changing the interface


Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Manager.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Manager.php	4 Jun 2003 15:38:03 -0000	1.15
--- Manager.php	4 Jun 2003 21:39:41 -0000	1.16
***************
*** 33,41 ****
  
  
!     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[]=" . $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>";
  
--- 33,39 ----
  
  
!     function _menu() {
          $links = array();
          $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=new\">" . $_SESSION["translate"]->it("New Topic") . "</a>";
          $links[] = "<a href=\"index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=list\">" . $_SESSION["translate"]->it("List Topics") . "</a>";
  
***************
*** 52,56 ****
          $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
  
--- 50,54 ----
          $this->setTable("mod_phpwsbb_threads");
          $this->setOrder("updated DESC");
!         $GLOBALS["CNT_phpwsbb"]["content"] .= $this->getList("threads", $_SESSION["translate"]->it("Bulletin Board Topics"), FALSE);
      }// END FUNC _list
  
***************
*** 68,71 ****
--- 66,75 ----
  
  
+     function _unlock() {
+         $this->thread = new PHPWSBB_Thread($_REQUEST["PHPWS_MAN_ITEMS"][0]);
+         $_REQUEST["PHPWSBB_THREAD_OP"] = "unlock";
+     }// END FUNC _lock
+ 
+ 
      function _delete() {
          $this->thread = new PHPWSBB_Thread($_REQUEST["PHPWS_MAN_ITEMS"][0]);
***************
*** 145,148 ****
--- 149,156 ----
              case "lock":
                  $this->_lock();
+                 break;
+ 
+             case "unlock":
+                 $this->_unlock();
                  break;
  

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Message.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Message.php	4 Jun 2003 15:45:12 -0000	1.16
--- Message.php	4 Jun 2003 21:39:42 -0000	1.17
***************
*** 327,331 ****
                      else
                          $title = $_SESSION["translate"]->it("New Message");
!                 $content = $_SESSION["PHPWSBB_Manager"]->_menu($this->_tid);
                  $content .= $this->_edit();
                  break;
--- 327,331 ----
                      else
                          $title = $_SESSION["translate"]->it("New Message");
!                 $content = $_SESSION["PHPWSBB_Manager"]->_menu();
                  $content .= $this->_edit();
                  break;
***************
*** 334,338 ****
                  break;
              case "view":
!                 $content = $_SESSION["PHPWSBB_Manager"]->_menu($this->_tid);
                  $content .= $this->_view();
                  break;
--- 334,338 ----
                  break;
              case "view":
!                 $content = $_SESSION["PHPWSBB_Manager"]->_menu();
                  $content .= $this->_view();
                  break;

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/Thread.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Thread.php	4 Jun 2003 18:43:47 -0000	1.7
--- Thread.php	4 Jun 2003 21:39:42 -0000	1.8
***************
*** 72,79 ****
          $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_thread.tpl");
  
          if($this->_locked)
--- 72,88 ----
          $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("Post Reply") . "</a>";
!         if($_SESSION["OBJ_user"]->allow_access("phpwsbb", "lock_threads")) {
!             if($this->_locked)
!                 $tags["LOCK"]   = "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=unlock&amp;PHPWS_MAN_ITEMS[]=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Unlock Thread") . "</a>";
!             else
!                 $tags["LOCK"]   = "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=lock&amp;PHPWS_MAN_ITEMS[]=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Lock Thread") . "</a>";
!         }
! 
!         if($_SESSION["OBJ_user"]->allow_access("phpwsbb", "delete_threads"))
!             $tags["DELETE"] = "<a href=\"./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=delete&amp;PHPWS_MAN_ITEMS[]=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Delete Thread") . "</a>";
  
          // Need to cycle through all messages and view
!         $content = $GLOBALS["core"]->processTemplate($tags, "phpwsbb", "view_thread.tpl");
  
          if($this->_locked)
***************
*** 161,165 ****
  
  
!     function _lock() {
          if(!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "lock_threads")) {
              $message = $_SESSION["translate"]->it("Access to lock this thread was denied due to lack of proper permissions.");
--- 170,174 ----
  
  
!     function _lock($unlock = FALSE) {
          if(!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "lock_threads")) {
              $message = $_SESSION["translate"]->it("Access to lock this thread was denied due to lack of proper permissions.");
***************
*** 170,180 ****
  
          $lockstr = "[" . $_SESSION["translate"]->it("LOCKED") . "] ";
!         if($this->_locked) {
              $strlen = strlen($lockstr);
              $this->_label = substr_replace($this->_label, NULL, 0, $strlen);
              $this->_locked = 0;
!         } else {
              $this->_label = $lockstr . $this->getLabel();
              $this->_locked = 1;
          }
  
--- 179,198 ----
  
          $lockstr = "[" . $_SESSION["translate"]->it("LOCKED") . "] ";
!         if($unlock && $this->_locked) {
              $strlen = strlen($lockstr);
              $this->_label = substr_replace($this->_label, NULL, 0, $strlen);
              $this->_locked = 0;
!         } elseif(!$unlock && !$this->_locked) {
              $this->_label = $lockstr . $this->getLabel();
              $this->_locked = 1;
+         } else {
+             if($this->_locked)
+                 $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("This thread is already locked.") . "</div><br />\n";
+             else
+                 $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("This thread is already unlocked.") . "</div><br />\n";
+ 
+             $_REQUEST["PHPWSBB_THREAD_OP"] = "view";
+             $this->action();
+             return;
          }
  
***************
*** 189,193 ****
              return;
          } else {
!             $GLOBALS["CNT_phpwsbb"]["content"] .= $_SESSION["translate"]->it("The thread was successfully locked.") . "<br />\n";
  
              $_REQUEST["PHPWSBB_THREAD_OP"] = "view";
--- 207,211 ----
              return;
          } else {
!             $GLOBALS["CNT_phpwsbb"]["content"] .= $_SESSION["translate"]->it("The thread was successfully saved.") . "<br />\n";
  
              $_REQUEST["PHPWSBB_THREAD_OP"] = "view";
***************
*** 213,216 ****
--- 231,238 ----
              case "lock":
                  $this->_lock();
+                 break;
+ 
+             case "unlock":
+                 $this->_lock(TRUE);
                  break;