phpwsbb-commits — phpwsBB CVS Commits Notifications

[phpwsbb-commits] phpwsbb/boost install.sql,1.16,1.17

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29163/boost

Modified Files:
	install.sql 
Log Message:
No idea where in the hell this ugly SQL came from

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.sql,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** install.sql	13 Sep 2004 16:27:27 -0000	1.16
--- install.sql	13 Sep 2004 19:12:04 -0000	1.17
***************
*** 109,114 ****
      PRIMARY KEY (rank_id)
  );
! INSERT INTO 'mod_phpwsbb_user_ranks' VALUES (0, 'Site Admin', 0, 1, NULL, NULL);
! INSERT INTO 'mod_phpwsbb_user_ranks' VALUES (1, 'Member', 0, 0, NULL, NULL);
  
  CREATE TABLE mod_phpwsbb_user_info (
--- 109,114 ----
      PRIMARY KEY (rank_id)
  );
! INSERT INTO mod_phpwsbb_user_ranks VALUES (0, 'Site Admin', 0, 1, NULL, NULL);
! INSERT INTO mod_phpwsbb_user_ranks VALUES (1, 'Member', 0, 0, NULL, NULL);
  
  CREATE TABLE mod_phpwsbb_user_info (

[phpwsbb-commits] phpwsbb/boost update.php,1.37,1.38

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18180/boost

Modified Files:
	update.php 
Log Message:
Need to make sure Manager is in session

Index: update.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** update.php	13 Sep 2004 16:07:18 -0000	1.37
--- update.php	13 Sep 2004 18:23:09 -0000	1.38
***************
*** 37,43 ****
  
  // Load needed classes
! require_once(PHPWS_SOURCE_DIR . "mod/phpwsbb/class/Forum.php");
! require_once(PHPWS_SOURCE_DIR . "mod/phpwsbb/class/Thread.php");
! require_once(PHPWS_SOURCE_DIR . "mod/phpwsbb/class/Message.php");
  
  // Load help information
--- 37,41 ----
  
  // Load needed classes
! require_once(PHPWS_SOURCE_DIR . "mod/phpwsbb/class/Manager.php");
  
  // Load help information
***************
*** 53,56 ****
--- 51,58 ----
  $status = 1;
  
+ // This might not exist during update
+ if (!isset($_SESSION["PHPWSBB_Manager"]))
+     $_SESSION["PHPWSBB_Manager"] = new PHPWSBB_Manager;
+ 
  if(version_compare($currentVersion, "0.4.0") < 0) {
      if ($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/phpwsbb/boost/update040.sql", TRUE)) {
***************
*** 248,253 ****
--- 250,257 ----
      if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_messages ADD owner_id int NOT NULL default 0 AFTER owner', TRUE)
        && $status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_messages',array('owner_id'))) {
+ 
          /* Make a list of names and message ids of all message contributors */
          $msg_list = $name_list = array();
+ 
          $result = $GLOBALS['core']->query('SELECT id,owner from mod_phpwsbb_messages WHERE owner IS NOT NULL', true);
          while ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC)) {
***************
*** 257,260 ****
--- 261,265 ----
          }
          unset($result);
+ 
          /* Make a list of all user ids for the users in the last list */
          $result = $GLOBALS['core']->query('SELECT username,user_id from mod_users WHERE username IN ("' . implode('","', $name_list) .'")', true);
***************
*** 262,265 ****
--- 267,271 ----
              $name_tbl[$row['username']] = $row['user_id'];
          unset($result);
+ 
          /* Update user id information for all messages submitted by each user */
          if (count($msg_list) && count($name_list)) {

[phpwsbb-commits] phpwsbb/class Forum.php,1.24,1.25 Manager.php,1.39,1.40 Message.php,1.59,1.60 Thread.php,1.52,1.53

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16688/class

Modified Files:
	Forum.php Manager.php Message.php Thread.php 
Log Message:
PHPWS_TBL_PREFIX is deprecated

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** Thread.php	10 Sep 2004 02:01:33 -0000	1.52
--- Thread.php	13 Sep 2004 18:17:21 -0000	1.53
***************
*** 127,131 ****
                  $this->setId($THREAD_ID);
                  $this->init();
!                 $sql = "SELECT id FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_messages WHERE tid=" . $this->getId();
                  if (!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "hide_threads"))
                      $sql .= " AND hidden=0";
--- 127,131 ----
                  $this->setId($THREAD_ID);
                  $this->init();
!                 $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages WHERE tid=" . $this->getId();
                  if (!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "hide_threads"))
                      $sql .= " AND hidden=0";
***************
*** 266,270 ****
      function updateThread($new = FALSE) {
          if (!empty($this->_id)) {
!             $sql = "SELECT id FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_messages WHERE tid=" . $this->getId() . " ORDER BY created;";
              $this->messages = $GLOBALS["core"]->getCol($sql);
              $this->_replies = count($this->messages) - 1;
--- 266,270 ----
      function updateThread($new = FALSE) {
          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;
***************
*** 310,316 ****
  
          // Send email to monitors for new messages
!         $user = $_SESSION['PHPWSBB_Manager']->_load_user_settings($_SESSION['OBJ_user']->user_id);
          if ($_SESSION["PHPWSBB_Manager"]->_allow_user_monitors && $new && !$user['suspendmonitors']) {
!             $sql = "SELECT email FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_monitors a," . $GLOBALS["core"]->tbl_prefix . "mod_users b WHERE a.thread_id=" . $this->getId() . " AND b.user_id=a.user_id and a.user_id != '" . $_SESSION["OBJ_user"]->user_id . "'";
              $emails = $GLOBALS["core"]->getCol($sql);
      
--- 310,321 ----
  
          // Send email to monitors for new messages
!         if (!isset($_SESSION["PHPWSBB_Manager"]))
!             echo "<h3>phpwsbb manager not set!</h3>";
!         if (!isset($_SESSION["OBJ_user"]))
!             echo "<h3>session user not set!</h3>";
! 
!         $user = $_SESSION["PHPWSBB_Manager"]->_load_user_settings($_SESSION["OBJ_user"]->user_id);
          if ($_SESSION["PHPWSBB_Manager"]->_allow_user_monitors && $new && !$user['suspendmonitors']) {
!             $sql = "SELECT email FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_monitors a," . $GLOBALS["core"]->tbl_prefix . "mod_users b WHERE a.thread_id=" . $this->getId() . " AND b.user_id=a.user_id and a.user_id != '" . $_SESSION["OBJ_user"]->user_id . "'";
              $emails = $GLOBALS["core"]->getCol($sql);
      

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** Message.php	10 Sep 2004 02:01:33 -0000	1.59
--- Message.php	13 Sep 2004 18:17:21 -0000	1.60
***************
*** 145,149 ****
                  require_once(PHPWS_SOURCE_DIR.'mod/phpwscontacts/class/Contact.php');
                  // Find contact owned by this username
!                 $sql = "select id from " . PHPWS_TBL_PREFIX . "mod_phpwscontacts_contacts where owner='" . $this->getOwner() . "' and mine=1";
                  $results = $GLOBALS["core"]->getCol($sql);
                  if ($results) {
--- 145,149 ----
                  require_once(PHPWS_SOURCE_DIR.'mod/phpwscontacts/class/Contact.php');
                  // Find contact owned by this username
!                 $sql = "select id from " . $GLOBALS["core"]->tbl_prefix . "mod_phpwscontacts_contacts where owner='" . $this->getOwner() . "' and mine=1";
                  $results = $GLOBALS["core"]->getCol($sql);
                  if ($results) {

Index: Forum.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Forum.php	10 Sep 2004 02:01:33 -0000	1.24
--- Forum.php	13 Sep 2004 18:17:20 -0000	1.25
***************
*** 297,306 ****
          if(!empty($this->_id)) {
              /* Develop total replies and extended thread information */
!             $sql = 'SELECT COUNT(id),SUM(replies) FROM ' . PHPWS_TBL_PREFIX . 'mod_phpwsbb_threads WHERE fid=' . $this->getId() . ' ORDER BY lastpost DESC';
!             $t = $GLOBALS['core']->getRow($sql);
              $this->_threads = $t['COUNT(id)'];
              $this->_posts = $t['SUM(replies)'];
  
!             $sql = "SELECT id FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_threads WHERE fid=" . $this->getId() . " ORDER BY lastpost DESC";
              $t = $GLOBALS["core"]->getOne($sql);
              $thread = new PHPWSBB_Thread($t);
--- 297,306 ----
          if(!empty($this->_id)) {
              /* Develop total replies and extended thread information */
!             $sql = 'SELECT COUNT(id),SUM(replies) FROM ' . $GLOBALS["core"]->tbl_prefix . 'mod_phpwsbb_threads WHERE fid=' . $this->getId() . ' ORDER BY lastpost DESC';
!             $t = $GLOBALS["core"]->getRow($sql);
              $this->_threads = $t['COUNT(id)'];
              $this->_posts = $t['SUM(replies)'];
  
!             $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_threads WHERE fid=" . $this->getId() . " ORDER BY lastpost DESC";
              $t = $GLOBALS["core"]->getOne($sql);
              $thread = new PHPWSBB_Thread($t);
***************
*** 332,336 ****
                  $_SESSION["OBJ_fatcat"]->purge($this->getId(), "phpwsbb");
  
!             $sql = "SELECT id FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_threads WHERE fid=" . $this->getId() . " ORDER BY created;";
              $results = $GLOBALS["core"]->getCol($sql);
              foreach($results as $tid) {
--- 332,336 ----
                  $_SESSION["OBJ_fatcat"]->purge($this->getId(), "phpwsbb");
  
!             $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_threads WHERE fid=" . $this->getId() . " ORDER BY created;";
              $results = $GLOBALS["core"]->getCol($sql);
              foreach($results as $tid) {

Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Manager.php	10 Sep 2004 02:01:33 -0000	1.39
--- Manager.php	13 Sep 2004 18:17:20 -0000	1.40
***************
*** 478,482 ****
              $GLOBALS["CNT_phpwsbb"]["content"] = $_SESSION["translate"]->it("Anonymous viewing of this bulletin board has been disabled.  You must log-in to view this bulletin board.");
          } else {
!             $sql = "SELECT tid, label FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_messages $where";
              $result = $GLOBALS["core"]->query($sql);
      
--- 478,482 ----
              $GLOBALS["CNT_phpwsbb"]["content"] = $_SESSION["translate"]->it("Anonymous viewing of this bulletin board has been disabled.  You must log-in to view this bulletin board.");
          } else {
!             $sql = "SELECT tid, label FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_messages $where";
              $result = $GLOBALS["core"]->query($sql);
      
***************
*** 563,567 ****
          $GLOBALS["CNT_phpwsbb"]["content"] .= $this->_menu();
  
!         $sql = "SELECT id FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_threads ORDER BY updated ASC";
          $result = $GLOBALS["core"]->getCol($sql);
          if($result) {
--- 563,567 ----
          $GLOBALS["CNT_phpwsbb"]["content"] .= $this->_menu();
  
!         $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_threads ORDER BY updated ASC";
          $result = $GLOBALS["core"]->getCol($sql);
          if($result) {
***************
*** 750,754 ****
          }
          
!         if($GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_info',  'user_id', $_SESSION['OBJ_user']->user_id)) {
  // This had to be moved to the user settings table.  
  //  Use of setUserVar creates too many SELECTs to retrieve the values
--- 750,754 ----
          }
          
!         if($GLOBALS["core"]->sqlUpdate($data, 'mod_phpwsbb_user_info',  'user_id', $_SESSION['OBJ_user']->user_id)) {
  // This had to be moved to the user settings table.  
  //  Use of setUserVar creates too many SELECTs to retrieve the values
***************
*** 1000,1008 ****
                else
                  $data['rank_special'] = 0;
!               $GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_ranks', 'rank_id', $rank_id);
              }
              else {
                // Erase rank if title is empty
!               $GLOBALS['core']->sqlDelete('mod_phpwsbb_user_ranks', 'rank_id', $rank_id);
              }
            }
--- 1000,1008 ----
                else
                  $data['rank_special'] = 0;
!               $GLOBALS["core"]->sqlUpdate($data, 'mod_phpwsbb_user_ranks', 'rank_id', $rank_id);
              }
              else {
                // Erase rank if title is empty
!               $GLOBALS["core"]->sqlDelete('mod_phpwsbb_user_ranks', 'rank_id', $rank_id);
              }
            }
***************
*** 1020,1024 ****
            else
              $data['rank_special'] = 0;
!           $GLOBALS['core']->sqlInsert($data, 'mod_phpwsbb_user_ranks', 'rank_id');
          }
          // Now, reload the rank data into this class
--- 1020,1024 ----
            else
              $data['rank_special'] = 0;
!           $GLOBALS["core"]->sqlInsert($data, 'mod_phpwsbb_user_ranks', 'rank_id');
          }
          // Now, reload the rank data into this class
***************
*** 1275,1279 ****
              case "recalc_users":
                  /* Resets all post count to 0 so they'll be recalculated on user_load */ 
!                 $GLOBALS['core']->query('UPDATE mod_phpwsbb_user_info SET posts=0', true);
                  $GLOBALS["CNT_phpwsbb"]["title"] = $_SESSION["translate"]->it('Bulletin Board Forums');
                  $GLOBALS["CNT_phpwsbb"]["content"] = $_SESSION["translate"]->it('All user post counts have been reset.');
--- 1275,1279 ----
              case "recalc_users":
                  /* Resets all post count to 0 so they'll be recalculated on user_load */ 
!                 $GLOBALS["core"]->query('UPDATE mod_phpwsbb_user_info SET posts=0', true);
                  $GLOBALS["CNT_phpwsbb"]["title"] = $_SESSION["translate"]->it('Bulletin Board Forums');
                  $GLOBALS["CNT_phpwsbb"]["content"] = $_SESSION["translate"]->it('All user post counts have been reset.');
***************
*** 1293,1301 ****
  	function _load_user_ranks ()
  	{
!     $results = $GLOBALS['core']->sqlSelect('mod_phpwsbb_user_ranks',NULL,NULL,'rank_min');
!     if($results) 
!         $this->_user_ranks = $results;
!     else
!         $this->_user_ranks = NULL;
  	}
  
--- 1293,1301 ----
  	function _load_user_ranks ()
  	{
!         $results = $GLOBALS["core"]->sqlSelect('mod_phpwsbb_user_ranks',NULL,NULL,'rank_min');
!         if($results) 
!             $this->_user_ranks = $results;
!         else
!             $this->_user_ranks = NULL;
  	}
  
***************
*** 1310,1379 ****
  	function _load_user_settings ($id)
  	{
! 	  // If this is not a member, mark them as a guest
! 	  if(!$id) 
!       return array();
! 
!     // If user data was passed in, use it
! 	  elseif(is_array($id) && !empty($id['user_id'])) {
! 	    $result = $id;
! 	  }
!     // Using 1 sql statement instead of loading user classes which would use more memory  
!     // and generate an additional query per user.
!     elseif (!$result = $GLOBALS['core']->getRow('SELECT * FROM '
!     . PHPWS_TBL_PREFIX . 'mod_phpwsbb_user_info AS i LEFT JOIN ' . PHPWS_TBL_PREFIX 
!     . 'mod_users AS u ON ( u.user_id = i.user_id ) WHERE i.user_id ='.$id)) 
!     {
!       // If no record was found, create one
!       $result = array();
!       // Develop correct user post counts
!       $posts = $GLOBALS['core']->getRow('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1);
!       $result['posts'] = $posts['COUNT(owner_id)'];
!       // If the user has uservars set for this module...
!       $monitordefault = $_SESSION['OBJ_user']->getUserVar('monitordefault', NULL, 'phpwsbb');
!       if ($monitordefault!==NULL) {
!         // transfer the values to the table
!         $result['monitordefault'] = $monitordefault;
!         $result['suspendmonitors'] = $_SESSION['OBJ_user']->getUserVar('suspendmonitors', NULL, 'phpwsbb');
!       }
!       $GLOBALS['core']->sqlInsert($result,'mod_phpwsbb_user_info');
!       $result['location']=$result['avatar']=$result['signature']=$result['monitordefault']=$result['suspendmonitors']=null;
!     }
  
!     // If user's post count is set to 0, recalculate it.
!     if($result['posts']==0) {
!       // Develop correct user post counts
!       $result['posts'] = $data['posts'] = $GLOBALS['core']->getOne('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1);
!       $GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_info',  'user_id', $id);
!     }
  
!     $result['POSTS'] = $_SESSION['translate']->it('Posts').': '.$result['posts'];
!     $result['MONITORDEFAULT'] = $result['monitordefault'];
!     $result['SUSPENDMONITORS'] = $result['suspendmonitors'];
!     if (!empty($result['location'])) 
!       $result['FROM'] = $_SESSION['translate']->it('From').': '.PHPWS_Text::parseOutput($result['location']);
!     $result['AVATAR'] = null;
!     if (!empty($result['avatar_file']) && $this->_use_avatars) 
!     {
!       // Gallery Avatar
!       if (!empty($result['avatar_dir']))
!         $result['AVATAR'] = '<img src="images/phpwsbb/'.$result['avatar_dir'].$result['avatar_file'].'" alt="" title="" border="0" />';
!       // Offsite Avatar
!       elseif ($this->_use_offsite_avatars && empty($result['avatar_dir']))
!         $result['AVATAR'] = '<img src="http://'.$result['avatar_file'].'" alt="" title="" border="0" />';
!     }
!     if (!empty($result['signature']) && $this->_use_signatures) 
!       $result['SIGNATURE'] = PHPWS_Text::parseOutput($result['signature']);
!     // Determine user's rank
!     if($result['posts']&& $this->_user_ranks) {
!       $isSpecialuser = $result['deity'] || stristr($result['varValue'], 'lock_threads');
!       foreach ($this->_user_ranks as $rank) 
!         if(($rank['rank_min']<=$result['posts'])
!               && (($rank['rank_special'] && $isSpecialuser) 
!                   || (!$rank['rank_special'] && !$isSpecialuser))) {
!           $result['RANK'] = $rank['rank_title'];
          }
      }
-     return $result;
-   }
  
  }
--- 1310,1375 ----
  	function _load_user_settings ($id)
  	{
! 	    // If this is not a member, mark them as a guest
! 	    if(!$id) {
!             return array();
!         } elseif(is_array($id) && !empty($id['user_id'])) {
!         // If user data was passed in, use it
! 	        $result = $id;
! 	    } elseif (!$result = $GLOBALS["core"]->getRow('SELECT * FROM '
!     . $GLOBALS["core"]->tbl_prefix . 'mod_phpwsbb_user_info AS i LEFT JOIN ' . $GLOBALS["core"]->tbl_prefix 
!     . 'mod_users AS u ON ( u.user_id = i.user_id ) WHERE i.user_id ='.$id)) {
!             // Using 1 sql statement instead of loading user classes which would use more memory  
!             // and generate an additional query per user.
!             // If no record was found, create one
!             $result = array();
!             // Develop correct user post counts
!             $posts = $GLOBALS["core"]->getRow('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1);
!             $result['posts'] = $posts['COUNT(owner_id)'];
!             // If the user has uservars set for this module...
!             $monitordefault = $_SESSION['OBJ_user']->getUserVar('monitordefault', NULL, 'phpwsbb');
!             if ($monitordefault!==NULL) {
!                 // transfer the values to the table
!                 $result['monitordefault'] = $monitordefault;
!                 $result['suspendmonitors'] = $_SESSION['OBJ_user']->getUserVar('suspendmonitors', NULL, 'phpwsbb');
!             }
!             $GLOBALS["core"]->sqlInsert($result,'mod_phpwsbb_user_info');
!             $result['location']=$result['avatar']=$result['signature']=$result['monitordefault']=$result['suspendmonitors']=null;
!         }
  
!         // If user's post count is set to 0, recalculate it.
!         if($result['posts']==0) {
!             // Develop correct user post counts
!             $result['posts'] = $data['posts'] = $GLOBALS["core"]->getOne('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1);
!             $GLOBALS["core"]->sqlUpdate($data, 'mod_phpwsbb_user_info',  'user_id', $id);
!         }
  
!         $result['POSTS'] = $_SESSION['translate']->it('Posts').': '.$result['posts'];
!         $result['MONITORDEFAULT'] = $result['monitordefault'];
!         $result['SUSPENDMONITORS'] = $result['suspendmonitors'];
!         if (!empty($result['location'])) 
!             $result['FROM'] = $_SESSION['translate']->it('From').': '.PHPWS_Text::parseOutput($result['location']);
!         $result['AVATAR'] = null;
!         if (!empty($result['avatar_file']) && $this->_use_avatars) {
!             // Gallery Avatar
!             if (!empty($result['avatar_dir']))
!                 $result['AVATAR'] = '<img src="images/phpwsbb/'.$result['avatar_dir'].$result['avatar_file'].'" alt="" title="" border="0" />';
!             // Offsite Avatar
!             elseif ($this->_use_offsite_avatars && empty($result['avatar_dir']))
!                 $result['AVATAR'] = '<img src="http://'.$result['avatar_file'].'" alt="" title="" border="0" />';
!         }
!         if (!empty($result['signature']) && $this->_use_signatures) 
!             $result['SIGNATURE'] = PHPWS_Text::parseOutput($result['signature']);
!         // Determine user's rank
!         if($result['posts']&& $this->_user_ranks) {
!             $isSpecialuser = $result['deity'] || stristr($result['varValue'], 'lock_threads');
!             foreach ($this->_user_ranks as $rank) 
!                 if(($rank['rank_min']<=$result['posts'])
!                     && (($rank['rank_special'] && $isSpecialuser) 
!                     || (!$rank['rank_special'] && !$isSpecialuser))) {
!                     $result['RANK'] = $rank['rank_title'];
!                 }
          }
+         return $result;
      }
  
  }

[phpwsbb-commits] phpwsbb/boost uninstall.php,1.10,1.11

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24212/boost

Modified Files:
	uninstall.php 
Log Message:
setting prelim status

Index: uninstall.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/uninstall.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** uninstall.php	10 Sep 2004 02:01:33 -0000	1.10
--- uninstall.php	13 Sep 2004 16:31:16 -0000	1.11
***************
*** 33,36 ****
--- 33,38 ----
  }
  
+ $status = 1;
+ 
  if($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/phpwsbb/boost/uninstall.sql", 1, 1)) {
      $content .= "All Bulletin Board tables successfully removed!<br />";

[phpwsbb-commits] phpwsbb/boost install.sql,1.15,1.16

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23415/boost

Modified Files:
	install.sql 
Log Message:
backticks?

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.sql,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** install.sql	13 Aug 2004 21:32:36 -0000	1.15
--- install.sql	13 Sep 2004 16:27:27 -0000	1.16
***************
*** 109,118 ****
      PRIMARY KEY (rank_id)
  );
! INSERT INTO `mod_phpwsbb_user_ranks` VALUES (0, 'Site Admin', 0, 1, NULL, NULL);
! INSERT INTO `mod_phpwsbb_user_ranks` VALUES (1, 'Member', 0, 0, NULL, NULL);
  
  CREATE TABLE mod_phpwsbb_user_info (
      user_id           int NOT NULL,
!     posts             int NOT NULL default `0`,
      location          varchar(50) NOT NULL,
      avatar_dir        varchar(50) NOT NULL,
--- 109,118 ----
      PRIMARY KEY (rank_id)
  );
! INSERT INTO 'mod_phpwsbb_user_ranks' VALUES (0, 'Site Admin', 0, 1, NULL, NULL);
! INSERT INTO 'mod_phpwsbb_user_ranks' VALUES (1, 'Member', 0, 0, NULL, NULL);
  
  CREATE TABLE mod_phpwsbb_user_info (
      user_id           int NOT NULL,
!     posts             int NOT NULL default '0',
      location          varchar(50) NOT NULL,
      avatar_dir        varchar(50) NOT NULL,

[phpwsbb-commits] phpwsbb/docs INSTALL,1.2,1.3

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20150/docs

Modified Files:
	INSTALL 
Log Message:
Adding note about imglib install

Index: INSTALL
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/docs/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** INSTALL	6 Apr 2004 04:05:40 -0000	1.2
--- INSTALL	13 Sep 2004 16:11:15 -0000	1.3
***************
*** 65,68 ****
--- 65,71 ----
     Layout Admin in control panel and "Reinitialize Default Theme".  FYI.
  
+ 8. If you are installing on phpwebsite < 0.9.3-5, you'll need to follow the
+    instructions in the README in the imglib directory.
+ 
  If you are having trouble with these procedures please file a Support
  Request at our sourceforge.net project site:

[phpwsbb-commits] phpwsbb/docs ChangeLog,1.112,1.113

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19106/docs

Modified Files:
	ChangeLog 
Log Message:
Forgot to make note about Eloi's big patch

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/docs/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** ChangeLog	11 Aug 2004 02:10:25 -0000	1.112
--- ChangeLog	13 Sep 2004 16:07:48 -0000	1.113
***************
*** 2,5 ****
--- 2,8 ----
  # $Id$
  
+     13 Sep 2004; Don Seiler <do...@NO...>
+     PATCH #1002850: Patch from Eloi that changes everything.
+ 
  *phpwsbb-0.9.7 (10 Aug 2004)
  

[phpwsbb-commits] phpwsbb/boost update.php,1.36,1.37

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18964/boost

Modified Files:
	update.php 
Log Message:
Going 1.0.0 to get around core version comparison bug

Index: update.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** update.php	10 Sep 2004 02:01:33 -0000	1.36
--- update.php	13 Sep 2004 16:07:18 -0000	1.37
***************
*** 245,249 ****
  }
  
! if(version_compare($currentVersion, "0.10.0") < 0) {
      if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_messages ADD owner_id int NOT NULL default 0 AFTER owner', TRUE)
        && $status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_messages',array('owner_id'))) {
--- 245,249 ----
  }
  
! if(version_compare($currentVersion, "1.0.0") < 0) {
      if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_messages ADD owner_id int NOT NULL default 0 AFTER owner', TRUE)
        && $status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_messages',array('owner_id'))) {

[phpwsbb-commits] phpwsbb/conf boost.php,1.36,1.37

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18964/conf

Modified Files:
	boost.php 
Log Message:
Going 1.0.0 to get around core version comparison bug

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/boost.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** boost.php	10 Sep 2004 02:01:34 -0000	1.36
--- boost.php	13 Sep 2004 16:07:17 -0000	1.37
***************
*** 32,36 ****
  $admin_mod = 1;
  $active = "on";
! $version = "0.10.0";
  $admin_op = "&PHPWSBB_MAN_OP=list";
  $mod_class_files = array("Manager.php");
--- 32,36 ----
  $admin_mod = 1;
  $active = "on";
! $version = "1.0.0";
  $admin_op = "&PHPWSBB_MAN_OP=list";
  $mod_class_files = array("Manager.php");

[phpwsbb-commits] phpwsbb/docs AUTHORS,1.1,1.2

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11587/docs

Modified Files:
	AUTHORS 
Log Message:
Adding Eloi to AUTHORS

Index: AUTHORS
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/docs/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AUTHORS	6 Apr 2004 03:56:14 -0000	1.1
--- AUTHORS	10 Sep 2004 02:04:03 -0000	1.2
***************
*** 7,10 ****
--- 7,13 ----
       - QA, Requirements Engineering
  
+     Eloi George <el...@NO...>
+      - Developer
+ 
      Bobby Kennedy <bob...@NO...>
       - QA, Requirements Engineering

[phpwsbb-commits] phpwsbb index.php,1.9,1.10

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10996

Modified Files:
	index.php 
Log Message:
Adding vim control line now that we have another cook in the kitchen

Index: index.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.php	8 Apr 2004 20:15:06 -0000	1.9
--- index.php	10 Sep 2004 02:01:32 -0000	1.10
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

[phpwsbb-commits] phpwsbb/class Forum.php,1.23,1.24 Manager.php,1.38,1.39 Message.php,1.58,1.59 Runtime.php,1.10,1.11 Thread.php,1.51,1.52

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10996/class

Modified Files:
	Forum.php Manager.php Message.php Runtime.php Thread.php 
Log Message:
Adding vim control line now that we have another cook in the kitchen

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** Thread.php	13 Aug 2004 21:32:37 -0000	1.51
--- Thread.php	10 Sep 2004 02:01:33 -0000	1.52
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** Message.php	10 Sep 2004 01:51:03 -0000	1.58
--- Message.php	10 Sep 2004 02:01:33 -0000	1.59
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Manager.php	13 Aug 2004 21:32:36 -0000	1.38
--- Manager.php	10 Sep 2004 02:01:33 -0000	1.39
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: Forum.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Forum.php	13 Aug 2004 21:32:36 -0000	1.23
--- Forum.php	10 Sep 2004 02:01:33 -0000	1.24
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: Runtime.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Runtime.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Runtime.php	13 Aug 2004 21:32:37 -0000	1.10
--- Runtime.php	10 Sep 2004 02:01:33 -0000	1.11
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

[phpwsbb-commits] phpwsbb/conf boost.php,1.35,1.36 controlpanel.php,1.6,1.7 help.php,1.10,1.11 layout.php,1.5,1.6 manager.php,1.11,1.12 menuman.php,1.5,1.6 search.php,1.4,1.5

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10996/conf

Modified Files:
	boost.php controlpanel.php help.php layout.php manager.php 
	menuman.php search.php 
Log Message:
Adding vim control line now that we have another cook in the kitchen

Index: controlpanel.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/controlpanel.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** controlpanel.php	9 Apr 2004 01:01:43 -0000	1.6
--- controlpanel.php	10 Sep 2004 02:01:34 -0000	1.7
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: search.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/search.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** search.php	9 Apr 2004 01:01:43 -0000	1.4
--- search.php	10 Sep 2004 02:01:34 -0000	1.5
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/boost.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** boost.php	9 Sep 2004 20:11:09 -0000	1.35
--- boost.php	10 Sep 2004 02:01:34 -0000	1.36
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: manager.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/manager.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** manager.php	13 Aug 2004 21:32:37 -0000	1.11
--- manager.php	10 Sep 2004 02:01:34 -0000	1.12
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: layout.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/layout.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** layout.php	9 Apr 2004 01:01:43 -0000	1.5
--- layout.php	10 Sep 2004 02:01:34 -0000	1.6
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: menuman.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/menuman.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** menuman.php	9 Apr 2004 01:01:43 -0000	1.5
--- menuman.php	10 Sep 2004 02:01:34 -0000	1.6
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: help.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/help.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** help.php	9 Apr 2004 01:01:43 -0000	1.10
--- help.php	10 Sep 2004 02:01:34 -0000	1.11
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

[phpwsbb-commits] phpwsbb/boost install.php,1.20,1.21 uninstall.php,1.9,1.10 update.php,1.35,1.36

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10996/boost

Modified Files:
	install.php uninstall.php update.php 
Log Message:
Adding vim control line now that we have another cook in the kitchen

Index: uninstall.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/uninstall.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** uninstall.php	14 Jun 2004 21:19:54 -0000	1.9
--- uninstall.php	10 Sep 2004 02:01:33 -0000	1.10
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: install.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** install.php	9 Sep 2004 21:51:00 -0000	1.20
--- install.php	10 Sep 2004 02:01:33 -0000	1.21
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

Index: update.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** update.php	9 Sep 2004 21:51:00 -0000	1.35
--- update.php	10 Sep 2004 02:01:33 -0000	1.36
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

[phpwsbb-commits] phpwsbb/inc runtime.php,1.5,1.6

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10996/inc

Modified Files:
	runtime.php 
Log Message:
Adding vim control line now that we have another cook in the kitchen

Index: runtime.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/inc/runtime.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** runtime.php	9 Apr 2004 01:01:44 -0000	1.5
--- runtime.php	10 Sep 2004 02:01:34 -0000	1.6
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
  /**
   * phpwsBB

[phpwsbb-commits] phpwsbb/imglib ImgLibrary.php,1.1,1.2 ImgLibrary_view_gallery.tpl,1.1,1.2 ImgLibrary_view_row.tpl,1.1,1.2

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/imglib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10827

Modified Files:
	ImgLibrary.php ImgLibrary_view_gallery.tpl 
	ImgLibrary_view_row.tpl 
Log Message:
dos2unix'ed to remove CRLF

Index: ImgLibrary.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/imglib/ImgLibrary.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImgLibrary.php	13 Aug 2004 21:32:38 -0000	1.1
--- ImgLibrary.php	10 Sep 2004 02:00:45 -0000	1.2
***************
*** 1,754 ****
! <?php
! 
! // Must require classes being used in this class
! require_once(PHPWS_SOURCE_DIR.'core/Form.php');
! require_once(PHPWS_SOURCE_DIR.'core/File.php');
! require_once(PHPWS_SOURCE_DIR.'core/Pager.php');
! require_once(PHPWS_SOURCE_DIR.'core/WizardBag.php');
! require_once(PHPWS_SOURCE_DIR.'core/Template.php');
! require_once(PHPWS_SOURCE_DIR.'core/Error.php');
! 
[...1481 lines suppressed...]
!     }
!     if(!is_dir($the_path)) 
!       return false;
!     else 
!       /* If the settings file & general gallery are successfully created.. */
!       if ($this->_created = $this->update_settings('.General Images')) {
!         /* Copy any extraneous files that may be in the base directory to the general gallery */
!         if ($filelist = PHPWS_File::readDirectory($this->_library_path,false,true)) {
!           foreach($filelist as $f) { 
!             if ($f != 'config.php' 
!                 && PHPWS_File::fileCopy($this->_library_path.$f, $this->_library_path.$this->_created.'/', $f, true, true))
!               @unlink($this->_library_path.$f);
!           }
!         }
!         return true;
!       }
!   }// END FUNC post_class_vars()
! }//END CLASS: PHPWS_IMGLib
  ?>
\ No newline at end of file

Index: ImgLibrary_view_gallery.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/imglib/ImgLibrary_view_gallery.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImgLibrary_view_gallery.tpl	13 Aug 2004 21:32:38 -0000	1.1
--- ImgLibrary_view_gallery.tpl	10 Sep 2004 02:00:45 -0000	1.2
***************
*** 1,54 ****
! {GALL_CHOOSE_DLG} 
! <br />
! {GALL_EXIT_LNK}
! <br />
! <div align="center" class="bg_medium">
!   <b>{IMAGE_SELECT_LBL}</b>
! </div>
! <hr />
! <form name="IMGLib_choose_dlg" action="index.php" method="post" enctype="multipart/form-data">
!   {IMAGE_SELECT_LST}
!   <div style="clear:both"><br />
!     <hr />
!     <span class="smalltext" style="float:right" align="center">
!       {PAGE_BACKWARD_LINK} {SECTION_LINKS} {PAGE_FORWARD_LINK}<br />
!       {SECTION_INFO}<br />
!       {LIMIT_LINKS_LABEL}: {LIMIT_LINKS}<br /><br />
!     </span>
!     {IMAGE_SELECT_DLG}
!     <div class="smalltext" style="clear:both"><hr /></div>
!   </div>
! </form>
! <br />
! <br />
! {GALL_EXIT_LNK}
! <!-- BEGIN IMAGES -->
! <div align="center" class="bg_medium">
!   <b>{IMAGE_MGMT_TITLE}</b>
! </div>
! <br />
! {IMAGE_UPLOAD_LBL}
! <br />
! {IMAGE_UPLOAD_DLG}
! <br />
! <br />
! {GALL_EXIT_LNK}
! <!-- END IMAGES -->
! <!-- BEGIN GALLERY -->
! <div align="center" class="bg_medium">
!   <b>{GALL_MGMT_TITLE}</b>
! </div>
! <br />
! {GALL_CREATE_LBL}
! <br />
! {GALL_CREATE_DLG}
! <br /><br />
! {GALL_RENAME_DLG}
! <br /><br />
! {GALL_DELETE_LBL}
! <br />
! {GALL_DELETE_DLG}
! <br />
! <br />
! {GALL_EXIT_LNK}
! <!-- END GALLERY -->
--- 1,54 ----
! {GALL_CHOOSE_DLG} 
! <br />
! {GALL_EXIT_LNK}
! <br />
! <div align="center" class="bg_medium">
!   <b>{IMAGE_SELECT_LBL}</b>
! </div>
! <hr />
! <form name="IMGLib_choose_dlg" action="index.php" method="post" enctype="multipart/form-data">
!   {IMAGE_SELECT_LST}
!   <div style="clear:both"><br />
!     <hr />
!     <span class="smalltext" style="float:right" align="center">
!       {PAGE_BACKWARD_LINK} {SECTION_LINKS} {PAGE_FORWARD_LINK}<br />
!       {SECTION_INFO}<br />
!       {LIMIT_LINKS_LABEL}: {LIMIT_LINKS}<br /><br />
!     </span>
!     {IMAGE_SELECT_DLG}
!     <div class="smalltext" style="clear:both"><hr /></div>
!   </div>
! </form>
! <br />
! <br />
! {GALL_EXIT_LNK}
! <!-- BEGIN IMAGES -->
! <div align="center" class="bg_medium">
!   <b>{IMAGE_MGMT_TITLE}</b>
! </div>
! <br />
! {IMAGE_UPLOAD_LBL}
! <br />
! {IMAGE_UPLOAD_DLG}
! <br />
! <br />
! {GALL_EXIT_LNK}
! <!-- END IMAGES -->
! <!-- BEGIN GALLERY -->
! <div align="center" class="bg_medium">
!   <b>{GALL_MGMT_TITLE}</b>
! </div>
! <br />
! {GALL_CREATE_LBL}
! <br />
! {GALL_CREATE_DLG}
! <br /><br />
! {GALL_RENAME_DLG}
! <br /><br />
! {GALL_DELETE_LBL}
! <br />
! {GALL_DELETE_DLG}
! <br />
! <br />
! {GALL_EXIT_LNK}
! <!-- END GALLERY -->

Index: ImgLibrary_view_row.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/imglib/ImgLibrary_view_row.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImgLibrary_view_row.tpl	13 Aug 2004 21:32:38 -0000	1.1
--- ImgLibrary_view_row.tpl	10 Sep 2004 02:00:45 -0000	1.2
***************
*** 1,6 ****
! <div{BG} style="float:left; height:{HEIGHT}px; width:{WIDTH}px; " align="center">
!   <br />
!   {IMAGE}
!   <br />
!   {IMAGE_NAME}
  </div>
\ No newline at end of file
--- 1,6 ----
! <div{BG} style="float:left; height:{HEIGHT}px; width:{WIDTH}px; " align="center">
!   <br />
!   {IMAGE}
!   <br />
!   {IMAGE_NAME}
  </div>
\ No newline at end of file

[phpwsbb-commits] phpwsbb/class Message.php,1.57,1.58

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8681/class

Modified Files:
	Message.php 
Log Message:
Need to catch all possible version checks

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** Message.php	13 Aug 2004 21:32:37 -0000	1.57
--- Message.php	10 Sep 2004 01:51:03 -0000	1.58
***************
*** 136,140 ****
                  if ($GLOBALS["core"]->moduleExists("notes")) {
                      $notesinfo = PHPWS_Boost::getVersionInfo("notes");
!                     if ($notesinfo["version"] >= "1.6.0")
                          $tags["NOTE"] = "<a href=\"index.php?module=notes&amp;NOTE_op=new_note&amp;NOTE_toUser=" . $this->getOwner() . "\"><img src=\"./images/phpwsbb/new_note.png\" border=\"0\" alt=\"" . $_SESSION["translate"]->it("Send note to poster") . "\" title=\"" . $_SESSION["translate"]->it("Send note to poster") . "\" />&nbsp;" . $_SESSION["translate"]->it("Note to [var1]",$this->getOwner()) . "</a>";
                  }
--- 136,140 ----
                  if ($GLOBALS["core"]->moduleExists("notes")) {
                      $notesinfo = PHPWS_Boost::getVersionInfo("notes");
!                     if (version_compare($notesinfo["version"], "1.6.0") >= 0)
                          $tags["NOTE"] = "<a href=\"index.php?module=notes&amp;NOTE_op=new_note&amp;NOTE_toUser=" . $this->getOwner() . "\"><img src=\"./images/phpwsbb/new_note.png\" border=\"0\" alt=\"" . $_SESSION["translate"]->it("Send note to poster") . "\" title=\"" . $_SESSION["translate"]->it("Send note to poster") . "\" />&nbsp;" . $_SESSION["translate"]->it("Note to [var1]",$this->getOwner()) . "</a>";
                  }

[phpwsbb-commits] phpwsbb/boost install.php,1.19,1.20 update.php,1.34,1.35

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18184/boost

Modified Files:
	install.php update.php 
Log Message:
Changing to use version_compare()

Index: install.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** install.php	11 Aug 2004 02:10:24 -0000	1.19
--- install.php	9 Sep 2004 21:51:00 -0000	1.20
***************
*** 31,35 ****
  
  // Need to do core version check
! if($GLOBALS["core"]->version < "0.9.3-4") {
      $content .= "This module requires a phpWebSite core version of 0.9.3-4 or greater to install.<br />";
      $content .= "<br />You are currently using phpWebSite core version " . $GLOBALS["core"]->version . ".<br />";
--- 31,35 ----
  
  // Need to do core version check
! if(version_compare($GLOBALS["core"]->version, "0.9.3-4") < 0) {
      $content .= "This module requires a phpWebSite core version of 0.9.3-4 or greater to install.<br />";
      $content .= "<br />You are currently using phpWebSite core version " . $GLOBALS["core"]->version . ".<br />";

Index: update.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** update.php	13 Aug 2004 21:32:36 -0000	1.34
--- update.php	9 Sep 2004 21:51:00 -0000	1.35
***************
*** 29,33 ****
  
  // Need to do core version check
! if($GLOBALS["core"]->version < "0.9.3-4") {
      $content .= "This module requires a phpWebSite core version of 0.9.3-4 or greater to install.<br />";
      $content .= "<br />You are currently using phpWebSite core version " . $GLOBALS["core"]->version . ".<br />";
--- 29,33 ----
  
  // Need to do core version check
! if(version_compare($GLOBALS["core"]->version, "0.9.3-4") < 0) {
      $content .= "This module requires a phpWebSite core version of 0.9.3-4 or greater to install.<br />";
      $content .= "<br />You are currently using phpWebSite core version " . $GLOBALS["core"]->version . ".<br />";
***************
*** 52,56 ****
  $status = 1;
  
! if($currentVersion < "0.4.0") {
      if ($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/phpwsbb/boost/update040.sql", TRUE)) {
          $content .= "All phpwsBB tables successfully updated.<br />";
--- 52,56 ----
  $status = 1;
  
! if(version_compare($currentVersion, "0.4.0") < 0) {
      if ($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/phpwsbb/boost/update040.sql", TRUE)) {
          $content .= "All phpwsBB tables successfully updated.<br />";
***************
*** 61,65 ****
  }
  
! if($currentVersion < "0.5.0") {
      if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_settings ADD admin_email varchar(80), ADD email_text text, ADD monitor_posts smallint", TRUE)) {
          $content .= "phpwsBB settings table successfully modified.<br />";
--- 61,65 ----
  }
  
! if(version_compare($currentVersion, "0.5.0") < 0) {
      if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_settings ADD admin_email varchar(80), ADD email_text text, ADD monitor_posts smallint", TRUE)) {
          $content .= "phpwsBB settings table successfully modified.<br />";
***************
*** 74,78 ****
  }
  
! if($currentVersion < "0.5.2") {
      // Remove hard-coded labels in subjects
      $content .= "Updating labels in sticky and locked threads ...<br />";
--- 74,78 ----
  }
  
! if(version_compare($currentVersion, "0.5.2") < 0) {
      // Remove hard-coded labels in subjects
      $content .= "Updating labels in sticky and locked threads ...<br />";
***************
*** 99,103 ****
  }
  
! if($currentVersion < "0.5.3") {
      // Remove hard-coded labels in subjects
      $content .= "Updating labels in messages ...<br />";
--- 99,103 ----
  }
  
! if(version_compare($currentVersion, "0.5.3") < 0) {
      // Remove hard-coded labels in subjects
      $content .= "Updating labels in messages ...<br />";
***************
*** 124,128 ****
  }
  
! if($currentVersion < "0.6.0") {
      if ($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/phpwsbb/boost/update060.sql", TRUE)) {
          $content .= "All phpwsBB tables successfully updated.<br />";
--- 124,128 ----
  }
  
! if(version_compare($currentVersion, "0.6.0") < 0) {
      if ($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/phpwsbb/boost/update060.sql", TRUE)) {
          $content .= "All phpwsBB tables successfully updated.<br />";
***************
*** 164,168 ****
  }
  
! if($currentVersion < "0.7.0") {
      if($status = $GLOBALS["core"]->sqlCreateIndex("mod_phpwsbb_threads",array("fid")))
          if($status = $GLOBALS["core"]->sqlCreateIndex("mod_phpwsbb_messages",array("tid")))
--- 164,168 ----
  }
  
! if(version_compare($currentVersion, "0.7.0") < 0) {
      if($status = $GLOBALS["core"]->sqlCreateIndex("mod_phpwsbb_threads",array("fid")))
          if($status = $GLOBALS["core"]->sqlCreateIndex("mod_phpwsbb_messages",array("tid")))
***************
*** 171,175 ****
  }
  
! if($currentVersion < "0.8.0") {
      if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_threads ADD lastpost int NOT NULL default 0", TRUE)) {
          if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_forums ADD lastpost int NOT NULL default 0", TRUE)) {
--- 171,175 ----
  }
  
! if(version_compare($currentVersion, "0.8.0") < 0) {
      if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_threads ADD lastpost int NOT NULL default 0", TRUE)) {
          if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_forums ADD lastpost int NOT NULL default 0", TRUE)) {
***************
*** 209,213 ****
  }
  
! if($currentVersion < "0.9.0") {
      if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_settings ADD bboffline smallint NOT NULL default '0', ADD allow_user_monitors smallint NOT NULL default '1'", TRUE)) {
          $content .= "phpwsBB settings table successfully updated.<br />";
--- 209,213 ----
  }
  
! if(version_compare($currentVersion, "0.9.0") < 0) {
      if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_settings ADD bboffline smallint NOT NULL default '0', ADD allow_user_monitors smallint NOT NULL default '1'", TRUE)) {
          $content .= "phpwsBB settings table successfully updated.<br />";
***************
*** 225,229 ****
  }
  
! if($currentVersion < "0.9.1") {
      /* Create image directory */
      PHPWS_File::makeDir($GLOBALS["core"]->home_dir . "images/phpwsbb");
--- 225,229 ----
  }
  
! if(version_compare($currentVersion, "0.9.1") < 0) {
      /* Create image directory */
      PHPWS_File::makeDir($GLOBALS["core"]->home_dir . "images/phpwsbb");
***************
*** 244,248 ****
  }
  
! if($currentVersion < '0.10.0') {
      if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_messages ADD owner_id int NOT NULL default 0 AFTER owner', TRUE)
        && $status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_messages',array('owner_id'))) {
--- 244,248 ----
  }
  
! if(version_compare($currentVersion, "0.10.0") < 0) {
      if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_messages ADD owner_id int NOT NULL default 0 AFTER owner', TRUE)
        && $status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_messages',array('owner_id'))) {

[phpwsbb-commits] phpwsbb/docs COPYRIGHT,1.1,1.2

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28664/docs

Modified Files:
	COPYRIGHT 
Log Message:
Adding Eloi to COPYRIGHT for his uberpatch

Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/docs/COPYRIGHT,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** COPYRIGHT	8 Apr 2004 20:15:06 -0000	1.1
--- COPYRIGHT	9 Sep 2004 20:11:16 -0000	1.2
***************
*** 5,6 ****
--- 5,7 ----
  
  Don Seiler <do...@NO...>
+ Eloi George <el...@NO...>

[phpwsbb-commits] phpwsbb/conf boost.php,1.34,1.35

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28664/conf

Modified Files:
	boost.php 
Log Message:
Adding Eloi to COPYRIGHT for his uberpatch

Index: boost.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/boost.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** boost.php	11 Aug 2004 02:10:24 -0000	1.34
--- boost.php	9 Sep 2004 20:11:09 -0000	1.35
***************
*** 31,35 ****
  $admin_mod = 1;
  $active = "on";
! $version = "0.9.7";
  $admin_op = "&PHPWSBB_MAN_OP=list";
  $mod_class_files = array("Manager.php");
--- 31,35 ----
  $admin_mod = 1;
  $active = "on";
! $version = "0.10.0";
  $admin_op = "&PHPWSBB_MAN_OP=list";
  $mod_class_files = array("Manager.php");

[phpwsbb-commits] phpwsbb/templates/forums list.tpl,1.3,1.4 row.tpl,1.3,1.4

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/templates/forums
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17107/templates/forums

Modified Files:
	list.tpl row.tpl 
Log Message:
Patch #1002850, Eloi's changes.  Need to be tested and examined.

Index: row.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/forums/row.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** row.tpl	29 Mar 2004 04:40:53 -0000	1.3
--- row.tpl	13 Aug 2004 21:32:39 -0000	1.4
***************
*** 4,9 ****
  <!-- END SELECT -->
  <td class="smalltext">
! <a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=viewforum&amp;PHPWS_MAN_ITEMS[]={ID}">{LABEL}</a><br /><font size="-2">{DESCRIPTION}</font></td>
! <td align="center" class="smalltext">{THREADS}</td>
! <td align="center" class="smalltext">{LASTPOST}</td>
  </tr>
--- 4,12 ----
  <!-- END SELECT -->
  <td class="smalltext">
!   <a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=viewforum&amp;PHPWS_MAN_ITEMS={ID}">{LABEL}</a><br />
!   <font size="-2">{DESCRIPTION}</font>
! </td>
! <td class="smalltext">{THREADS}</td>
! <td class="smalltext">{POSTS}</td>
! <td class="smalltext">{LASTPOST}</td>
  </tr>

Index: list.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/forums/list.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** list.tpl	29 Mar 2004 04:40:53 -0000	1.3
--- list.tpl	13 Aug 2004 21:32:38 -0000	1.4
***************
*** 10,16 ****
  <td class="smalltext"><b>{SELECT_LABEL}</b></td>
  <!-- END SELECT_LABEL -->
! <td width="70%" class="smalltext"><b>{LABEL_LABEL}</b></td>
  <td align="center" valign="middle" class="smalltext"><b>{THREADS_LABEL}</b></td>
! <td width="25%" align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTPOST_LABEL}</b></td>
  </tr>
  {LIST_ITEMS}
--- 10,17 ----
  <td class="smalltext"><b>{SELECT_LABEL}</b></td>
  <!-- END SELECT_LABEL -->
! <td width="60%" class="smalltext"><b>{LABEL_LABEL}</b></td>
  <td align="center" valign="middle" class="smalltext"><b>{THREADS_LABEL}</b></td>
! <td align="center" valign="middle" class="smalltext"><b>{POSTS_LABEL}</b></td>
! <td width="30%" align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTPOST_LABEL}</b></td>
  </tr>
  {LIST_ITEMS}

[phpwsbb-commits] phpwsbb/conf manager.php,1.10,1.11 module_rights.txt,1.8,1.9

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17107/conf

Modified Files:
	manager.php module_rights.txt 
Log Message:
Patch #1002850, Eloi's changes.  Need to be tested and examined.

Index: manager.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/manager.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** manager.php	14 May 2004 01:26:58 -0000	1.10
--- manager.php	13 Aug 2004 21:32:37 -0000	1.11
***************
*** 40,43 ****
--- 40,48 ----
                          "threads"=>$_SESSION["translate"]->it("Topics"),
                          "lastpost"=>$_SESSION["translate"]->it("Last Post"),
+                         "posts"=>$_SESSION["translate"]->it("Posts"),
+                         "lastpost_topic_label"=>NULL,
+                         "lastpost_topic_id"=>NULL,
+                         "lastpost_post_id"=>NULL,
+                         "editor"=>NULL,
                          "id"=>NULL );
  
***************
*** 72,75 ****
--- 77,82 ----
                              "id"=>NULL,
                              "locked"=>NULL,
+                             "lastpost_post_id"=>NULL,
+                             "lastpost_post_owner"=>NULL,
                              "sticky"=>NULL );
  

Index: module_rights.txt
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/module_rights.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** module_rights.txt	2 Nov 2003 20:06:58 -0000	1.8
--- module_rights.txt	13 Aug 2004 21:32:37 -0000	1.9
***************
*** 14,15 ****
--- 14,17 ----
  delete_forums::Delete Forums
  hide_forums::Hide/Show Forums
+ edit_avatars::Edit Avatar Images
+ edit_avatar_galleries::Edit the Avatar Gallery

[phpwsbb-commits] phpwsbb/templates rank_tbl_row.tpl,NONE,1.1 view_forum_bottom.tpl,NONE,1.1 view_forum_top.tpl,NONE,1.1 view_thread_bottom.tpl,NONE,1.1 view_thread_top.tpl,NONE,1.1 edit_settings.tpl,1.6,1.7 edit_user_settings.tpl,1.3,1.4 view.tpl,1.12,1.13

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17107/templates

Modified Files:
	edit_settings.tpl edit_user_settings.tpl view.tpl 
Added Files:
	rank_tbl_row.tpl view_forum_bottom.tpl view_forum_top.tpl 
	view_thread_bottom.tpl view_thread_top.tpl 
Log Message:
Patch #1002850, Eloi's changes.  Need to be tested and examined.

--- NEW FILE: view_forum_top.tpl ---
<!-- BEGIN DESCRIPTION -->
{DESCRIPTION}<br /><br />
<!-- END DESCRIPTION -->
  <!-- BEGIN CATEGORY -->
  {CATEGORY_TEXT}:&#160;{CATEGORY}<br />
  <!-- END CATEGORY -->
<span class="smalltext">
  <!-- BEGIN NEW -->
  | {NEW}]
  <!-- END NEW -->
  <!-- BEGIN EDIT -->
  | {EDIT}]
  <!-- END EDIT -->
  <!-- BEGIN DELETE -->
  | {DELETE}]
  <!-- END DELETE -->
  <!-- BEGIN HIDE -->
  | {HIDE}]
  <!-- END HIDE -->
  <!-- BEGIN PROFILE -->
  | {MYPROFILE}]
  <!-- END PROFILE -->
  |
</span>

Index: view.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** view.tpl	17 May 2004 20:11:37 -0000	1.12
--- view.tpl	13 Aug 2004 21:32:38 -0000	1.13
***************
*** 1,48 ****
  <a name="{ID}"></a>
! <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 />
! <!-- BEGIN IPADDR -->
! <span class="smalltext">{IP_TEXT}: {IPADDR}
! </span><br />
! <!-- END IPADDR -->
! <!-- BEGIN BAN_IP -->
! <span class="smalltext">
! {BAN_IP}
! </span>
! <!-- END BAN_IP -->
! <!-- BEGIN BAN_USERNAME -->
! <span class="smalltext">
! | {BAN_USERNAME}
! </span>
! <!-- END BAN_USERNAME -->
! <hr size="1" width="100%" noshade="noshade" />
! {BODY}<br />
! <!-- BEGIN EDITED -->
! <br /><div class="smalltext"><i>{EDITED}</i></div>
! <!-- END EDITED -->
! <div class="smalltext" align="right">
! <!-- BEGIN NOTE -->
! | {NOTE}
! <!-- END NOTE -->
! <!-- BEGIN REPORT -->
! | {REPORT}
! <!-- END REPORT -->
! <!-- BEGIN EDIT -->
! | {EDIT}
! <!-- END EDIT -->
! <!-- BEGIN FORK -->
! | {FORK}
! <!-- END FORK -->
! <!-- BEGIN DELETE -->
! | {DELETE}
! <!-- END DELETE -->
! <!-- BEGIN HIDE -->
! | {HIDE}
! <!-- END HIDE -->
! |
! </div>
! </td></tr>
  </table>
--- 1,70 ----
  <a name="{ID}"></a>
! <table border="0" width="100%" cellspacing="1" cellpadding="4" style="clear:both">
!   <tr{BG}>
!     <td width="140" valign="top">
!     	<b>{POSTER}</b><br />
!       <span class="smalltext">
!         <!-- BEGIN RANK -->
!         {RANK}<br />
!         <!-- END RANK -->
!         <!-- BEGIN AVATAR -->
!         {AVATAR}<br />
!         <!-- END AVATAR -->
!         <br />
!         <!-- END BAN_USER -->
!         <!-- BEGIN POSTCOUNT -->
!         {POSTS}<br />
!         <!-- END POSTCOUNT -->
!         <!-- BEGIN LOCATION -->
!         {FROM}<br />
!         <!-- END LOCATION -->
!         <br />
!         <!-- BEGIN IPADDR -->
!         {IP_TEXT}: {IPADDR}<br />
!         <!-- END IPADDR -->
!         <!-- BEGIN BAN_USER -->
!         [{BAN_IP}]<br />
!         [{BAN_USERNAME}]<br />
!         <!-- END BAN_USER -->
!       </span>
!     </td>
!     <td valign="top">
!     	<b>{SUBJECT}</b><br />
!       <span class="smalltext">{CREATED}
!       </span>
!       <hr size="1" noshade />
!       {BODY}
!       <!-- BEGIN SIG -->
!       <div class="smalltext">
!       ------------------------------<br />
!       {SIGNATURE}
!       </div>
!       <!-- END SIG -->
!     </td>
!   </tr>
!   <tr{BG}>
!     <td>{NAV}</td>
!     <td class="smalltext">
!     | {QUOTE}
!     <!-- BEGIN NOTE -->
!     | {NOTE}
!     <!-- END NOTE -->
!     <!-- BEGIN REPORT -->
!     | {REPORT}
!     <!-- END REPORT -->
!     <!-- BEGIN EDIT -->
!     | {EDIT}
!     <!-- END EDIT -->
!     <!-- BEGIN FORK -->
!     | {FORK}
!     <!-- END FORK -->
!     <!-- BEGIN DELETE -->
!     | {DELETE}
!     <!-- END DELETE -->
!     <!-- BEGIN HIDE -->
!     | {HIDE}
!     <!-- END HIDE -->
!     |
! 	</td>
!   </tr>
  </table>

--- NEW FILE: view_thread_top.tpl ---
<br />
<!-- BEGIN REPLY -->
| {REPLY}
<!-- END REPLY -->
<!-- BEGIN MONITOR -->
| {MONITOR}
<!-- END MONITOR -->
<!-- BEGIN PROFILE -->
| {MYPROFILE}
<!-- END PROFILE -->
<!-- BEGIN LOCK -->
| {LOCK}
<!-- END LOCK -->
<!-- BEGIN DELETE -->
| {DELETE}
<!-- END DELETE -->
<!-- BEGIN HIDE -->
| {HIDE}
<!-- END HIDE -->
<!-- BEGIN STICKY -->
| {STICKY}
<!-- END STICKY -->
|
<!-- BEGIN THREAD_MOVE -->
{START_FORM}{THREAD_MOVE}&nbsp;{THREAD_FID}{END_FORM}
<!-- END THREAD_MOVE -->
<table border="0" width="100%" cellspacing="1" cellpadding="4">
  <tr class="bg_medium" align="center">
    <td width="140">
      <b>{AUTHOR}</b>
    </td>
    <td>
      <b>{MESSAGE}</b>
    </td>
  </tr>
</table>


--- NEW FILE: view_thread_bottom.tpl ---
<br />
<!-- BEGIN REPLY -->
| {REPLY}
<!-- END REPLY -->
<!-- BEGIN MONITOR -->
| {MONITOR}
<!-- END MONITOR -->
<!-- BEGIN PROFILE -->
| {MYPROFILE}
<!-- END PROFILE -->
<!-- BEGIN LOCK -->
| {LOCK}
<!-- END LOCK -->
<!-- BEGIN DELETE -->
| {DELETE}
<!-- END DELETE -->
<!-- BEGIN HIDE -->
| {HIDE}
<!-- END HIDE -->
<!-- BEGIN STICKY -->
| {STICKY}
<!-- END STICKY -->
|
<!-- BEGIN THREAD_MOVE -->
{START_FORM}{THREAD_MOVE}&nbsp;{THREAD_FID}{END_FORM}
<!-- END THREAD_MOVE -->

--- NEW FILE: rank_tbl_row.tpl ---
<tr class="smalltext">
  <td>{RANKROW_RANK_TITLE}</td>
  <td align="center">{RANKROW_RANK_MIN}</td>
  <td align="center">{RANKROW_RANK_SPECIAL}</td>
</tr>

Index: edit_settings.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/edit_settings.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** edit_settings.tpl	18 Mar 2004 04:28:08 -0000	1.6
--- edit_settings.tpl	13 Aug 2004 21:32:38 -0000	1.7
***************
*** 2,11 ****
  {SETTINGS_ALLOW_ANON_POSTS} {ANONPOSTS_TEXT}<br />
  {SETTINGS_ALLOW_ANON_VIEW} {ANONVIEW_TEXT}<br />
- <br />
  {ADMIN_EMAIL_TEXT}: {SETTINGS_ADMIN_EMAIL}&#160;{ADMIN_EMAIL_HELP}<br />
  {SETTINGS_MONITOR_POSTS} {MONITOR_POSTS_TEXT}&#160;{MONITOR_POSTS_HELP}<br />
  {SETTINGS_ALLOW_USER_MONITORS} {ALLOW_USER_MONITORS_TEXT}<br />
  {EMAIL_TEXT_TEXT}:&#160;{EMAIL_TEXT_HELP}<br />{SETTINGS_EMAIL_TEXT}<br />
- <br />
  {SETTINGS_SHOWFORUMSBLOCK} {SHOWFORUMSBLOCK_TEXT}<br />
  {FORUMSBLOCKTITLE_TEXT}: {SETTINGS_FORUMSBLOCKTITLE}<br />
--- 2,9 ----
***************
*** 13,16 ****
--- 11,40 ----
  {LATESTTHREADSBLOCKTITLE_TEXT}: {SETTINGS_LATESTTHREADSBLOCKTITLE}<br />
  {SETTINGS_MAXLATESTTHREADS} {MAXLATESTTHREADS_TEXT}<br />
+ {SETTINGS_USE_AVATARS} {USE_AVATARS_TEXT}<br />
+ {SETTINGS_USE_OFFSITE_AVATARS} {USE_OFFSITE_AVATARS_TEXT}<br />
+ {SETTINGS_USE_SIGNATURES} {USE_SIGNATURES_TEXT}<br />
+ <br />
+ <h3>{RANK_TABLE_TEXT}</h3>
+ {RANK_TABLE_HELP}<br />
+ <table width="100%" cellspacing="1" cellpadding="4">
+   <tr class="bg_medium">
+     <td width="60%" class="smalltext"><b>{RANK_TITLE_LABEL}</b></td>
+     <td align="center" valign="middle" class="smalltext"><b>{RANK_MIN_LABEL}</b></td>
+     <td align="center" valign="middle" class="smalltext"><b>{RANK_SPECIAL_LABEL}</b></td>
+   </tr>
+   <tr>
+     <td width="60%" class="smalltext" colspan="3"><b>{RANK_MEMBER_TITLE}</b></td>
+   </tr>
+   {RANK_MEMBER_ROWS}
+   <tr>
+     <td width="60%" class="smalltext" colspan="3"><b>{RANK_SPECIAL_TITLE}</b></td>
+   </tr>
+   {RANK_SPECIAL_ROWS}
+   <tr>
+     <td width="60%" class="smalltext" colspan="3"><b>{RANK_NEW_TITLE}</b></td>
+   </tr>
+   {RANK_NEW_ROW}
+ </table>
+ <br />
  <br />
  {SETTINGS_BBOFFLINE} {BBOFFLINE_TEXT}&#160;{BBOFFLINE_HELP}<br />

--- NEW FILE: view_forum_bottom.tpl ---
<span class="smalltext">
  <!-- BEGIN NEW -->
  | {NEW}]
  <!-- END NEW -->
  <!-- BEGIN EDIT -->
  | {EDIT}]
  <!-- END EDIT -->
  <!-- BEGIN DELETE -->
  | {DELETE}]
  <!-- END DELETE -->
  <!-- BEGIN HIDE -->
  | {HIDE}]
  <!-- END HIDE -->
  <!-- BEGIN PROFILE -->
  | {MYPROFILE}]
  <!-- END PROFILE -->
  |
</span>

Index: edit_user_settings.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/edit_user_settings.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** edit_user_settings.tpl	29 Mar 2004 04:06:47 -0000	1.3
--- edit_user_settings.tpl	13 Aug 2004 21:32:38 -0000	1.4
***************
*** 1,2 ****
--- 1,3 ----
+ {EXIT_LINK}<br />
  {START_FORM}
  {SETTINGS_MONITORDEFAULT} {MONITORDEFAULT_TEXT}<br />
***************
*** 7,10 ****
  {REMOVEALLMONITORS}&#160;{REMOVEALLMONITORS_HELP}<br />
  <br />
! {SETTINGS_SAVE}
  {END_FORM}
--- 8,44 ----
  {REMOVEALLMONITORS}&#160;{REMOVEALLMONITORS_HELP}<br />
  <br />
! {LOCATION_LABEL}<br />
! {SETTINGS_LOCATION}<br />
! <br />
! {SIGNATURE_LABEL}<br />
! {SIGNATURE_HELP}<br />
! {SETTINGS_SIGNATURE}<br />
! <br />
! <!-- BEGIN AVC -->
! <div align="center" class="bg_medium">
!   <b>{AVATAR_TITLE}</b><br />
! </div>
! <!-- BEGIN CURRENT -->
! <center>
! <b>{CURRENT_AVATAR_LABEL}</b><br />
! {CURRENT_AVATAR_IMG}<br />
! {CURRENT_AVATAR_TEXT}<br />
! {REMOVE_AVATAR_LABEL} {SETTINGS_DELETE_IMAGE}<br />
! <br />
! </center>
! <!-- END CURRENT -->
! {SELECT_AVATAR_LABEL}<br />
! {SELECT_AVATAR_HELP}<br />
! {IMGLIB_OP}<br />
! <br />
! <div align="center" class="bg_medium">
!   <b>{IMAGE_MGMT_TITLE}</b>
! </div>
! <b>{REMOTE_AVATAR_LABEL}</b><br />
! {REMOTE_AVATAR_HELP}<br />
! {SETTINGS_AVATAR_FILE}<br />
! <!-- END AVC -->
! <br />
! <center>{SETTINGS_SAVE}</center>
  {END_FORM}
+ {EXIT_LINK}

[phpwsbb-commits] phpwsbb/boost install.sql,1.14,1.15 uninstall.sql,1.4,1.5 update.php,1.33,1.34

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17107/boost

Modified Files:
	install.sql uninstall.sql update.php 
Log Message:
Patch #1002850, Eloi's changes.  Need to be tested and examined.

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.sql,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** install.sql	18 Mar 2004 04:28:07 -0000	1.14
--- install.sql	13 Aug 2004 21:32:36 -0000	1.15
***************
*** 16,19 ****
--- 16,23 ----
      sortorder   int NOT NULL default '0',
      lastpost    int NOT NULL default '0',
+     posts     int NOT NULL default '0',
+     lastpost_topic_label  text NOT NULL,
+     lastpost_topic_id     int NOT NULL default '0',
+     lastpost_post_id      int NOT NULL default '0',
      PRIMARY KEY (id)
  );
***************
*** 35,38 ****
--- 39,43 ----
      replies     int NOT NULL default '0',
      lastpost    int NOT NULL default '0',
+     lastpost_post_id      int NOT NULL default '0',
      PRIMARY KEY (id)
  );
***************
*** 42,45 ****
--- 47,51 ----
      id          int NOT NULL default '0',
      owner       varchar(20) default '',
+     owner_id    int NOT NULL default '0',
      editor      varchar(20) default '',
      ip          text,
***************
*** 57,60 ****
--- 63,67 ----
  );
  CREATE INDEX phpwsbb_messages_tid_idx ON mod_phpwsbb_messages (tid);
+ CREATE INDEX phpwsbb_messages_owner_id_idx ON mod_phpwsbb_messages (owner_id);
  
  CREATE TABLE mod_phpwsbb_monitors (
***************
*** 83,87 ****
      latestthreadsblocktitle varchar(80) NULL,
      maxlatestthreads        int NOT NULL default '0',
!     bboffline               smallint    NOT NULL default '0'
  );
- INSERT INTO mod_phpwsbb_settings VALUES (1, 1, NULL, 'The thread [name] has been updated.  Go to [url] to view it.', 0, 1, 1, 'Forums', 1, 'Latest Forum Posts', 5, 0);
--- 90,124 ----
      latestthreadsblocktitle varchar(80) NULL,
      maxlatestthreads        int NOT NULL default '0',
!     bboffline               smallint    NOT NULL default '0',
!     use_avatars             smallint    NOT NULL default '1',
!     use_offsite_avatars     smallint    NOT NULL default '1',
!     max_avatar_height       int         NOT NULL default '90',
!     max_avatar_width        int         NOT NULL default '90',
!     max_avatar_size         int         NOT NULL default '6',
!     use_signatures          smallint    NOT NULL default '1'
! );
! INSERT INTO mod_phpwsbb_settings VALUES (1, 1, NULL, 'The thread [name] has been updated.  Go to [url] to view it.', 0, 1, 1, 'Forums', 1, 'Latest Forum Posts', 5, 0, 1, 1, 90, 90, 6, 1);
! 
! CREATE TABLE mod_phpwsbb_user_ranks (
!     rank_id                 int         DEFAULT '0' NOT NULL, 
!     rank_title              varchar(50) NOT NULL, 
!     rank_min                smallint    DEFAULT '0' NOT NULL, 
!     rank_special            smallint    DEFAULT '0', 
!     rank_image              varchar(255), 
!     rank_image_caption      varchar(255),
!     PRIMARY KEY (rank_id)
! );
! INSERT INTO `mod_phpwsbb_user_ranks` VALUES (0, 'Site Admin', 0, 1, NULL, NULL);
! INSERT INTO `mod_phpwsbb_user_ranks` VALUES (1, 'Member', 0, 0, NULL, NULL);
! 
! CREATE TABLE mod_phpwsbb_user_info (
!     user_id           int NOT NULL,
!     posts             int NOT NULL default `0`,
!     location          varchar(50) NOT NULL,
!     avatar_dir        varchar(50) NOT NULL,
!     avatar_file       varchar(100) NOT NULL,
!     signature         varchar(255) NOT NULL,
!     suspendmonitors   smallint NOT NULL default '0',
!     monitordefault    smallint NOT NULL default '1',
!     PRIMARY KEY (user_id)
  );

Index: uninstall.sql
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/uninstall.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** uninstall.sql	2 Nov 2003 04:54:53 -0000	1.4
--- uninstall.sql	13 Aug 2004 21:32:36 -0000	1.5
***************
*** 7,8 ****
--- 7,10 ----
  DROP TABLE mod_phpwsbb_monitors;
  DROP TABLE mod_phpwsbb_banned;
+ DROP TABLE mod_phpwsbb_user_ranks;
+ DROP TABLE mod_phpwsbb_user_info;

Index: update.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** update.php	11 Aug 2004 02:20:06 -0000	1.33
--- update.php	13 Aug 2004 21:32:36 -0000	1.34
***************
*** 244,246 ****
--- 244,312 ----
  }
  
+ if($currentVersion < '0.10.0') {
+     if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_messages ADD owner_id int NOT NULL default 0 AFTER owner', TRUE)
+       && $status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_messages',array('owner_id'))) {
+         /* Make a list of names and message ids of all message contributors */
+         $msg_list = $name_list = array();
+         $result = $GLOBALS['core']->query('SELECT id,owner from mod_phpwsbb_messages WHERE owner IS NOT NULL', true);
+         while ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC)) {
+             if (!$row['owner']) continue;
+             $msg_list[$row['owner']][] = $row['id'];
+             $name_list[$row['owner']] = $row['owner'];
+         }
+         unset($result);
+         /* Make a list of all user ids for the users in the last list */
+         $result = $GLOBALS['core']->query('SELECT username,user_id from mod_users WHERE username IN ("' . implode('","', $name_list) .'")', true);
+         while ($result && $row = $result->fetchrow(DB_FETCHMODE_ASSOC))
+             $name_tbl[$row['username']] = $row['user_id'];
+         unset($result);
+         /* Update user id information for all messages submitted by each user */
+         if (count($msg_list) && count($name_list)) {
+             foreach ($msg_list AS $key=>$value) {
+                 if (!isset($name_tbl[$key])) $name_tbl[$key] = 0;
+                 $GLOBALS['core']->query('UPDATE mod_phpwsbb_messages SET owner_id=' . $name_tbl[$key].' WHERE id IN ('.implode(',', $value).')', true);
+             }
+         }
+         $content .= 'Successfully modified the phpwsBB messages table.<br />';
+     } else 
+         $content .= 'There was a problem modifying the phpwsBB messages table.<br />';
+ 
+     if($status = $GLOBALS['core']->query("CREATE TABLE mod_phpwsbb_user_ranks (rank_id int DEFAULT '0' NOT NULL, rank_title varchar(50) NOT NULL, rank_min smallint DEFAULT '0' NOT NULL, rank_special smallint DEFAULT '0', rank_image varchar(255), rank_image_caption varchar(255), PRIMARY KEY (rank_id))", TRUE)
+       && $status = $GLOBALS['core']->query("INSERT INTO `mod_phpwsbb_user_ranks` VALUES (0, 'Site Admin', 0, 1, NULL, NULL)", TRUE) 
+       && $status = $GLOBALS['core']->query("INSERT INTO `mod_phpwsbb_user_ranks` VALUES (1, 'Member', 0, 0, NULL, NULL)", TRUE)) 
+         $content .= 'Successfully created the phpwsBB User Ranking table.<br />';
+     else 
+         $content .= 'There was a problem creating the phpwsBB User Ranking table.<br />';
+ 
+ //  if($status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_threads',array('fid')))
+ //    $content .= 'Successfully added indexes.<br />';
+ 
+     if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_threads ADD lastpost_post_id int NOT NULL default "0"', TRUE)) {
+         if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_forums ADD posts int NOT NULL default "0", ADD lastpost_topic_label text NOT NULL, ADD lastpost_topic_id int NOT NULL default "0", ADD lastpost_post_id int NOT NULL default "0"', TRUE)) {
+             $sql = 'SELECT id FROM mod_phpwsbb_threads';
+             $result = $GLOBALS['core']->getCol($sql,TRUE);
+             if($result) {
+                 foreach($result as $rowid) {
+                     $thread = new PHPWSBB_Thread($rowid);
+                     $thread->updateThread();
+                 }
+             }
+             $content .= 'Successfully modified the phpwsBB threads table.<br />';
+         } else 
+             $content .= 'There was a problem modifying the phpwsBB forums table.<br />';
+     } else 
+         $content .= 'There was a problem modifying the phpwsBB threads table.<br />';
+ 
+     if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_settings ADD use_avatars smallint NOT NULL default "1", ADD use_offsite_avatars smallint NOT NULL default "1", ADD max_avatar_height int NOT NULL default "90", ADD max_avatar_width int NOT NULL default "90", ADD max_avatar_size int NOT NULL default "6", ADD use_signatures smallint NOT NULL default "1"', TRUE)) 
+         $content .= 'phpwsBB settings table successfully modified.<br />';
+     else 
+         $content .= 'There was a problem modifying the phpwsBB settings table.<br />';
+ 
+     if($status = $GLOBALS['core']->query('CREATE TABLE mod_phpwsbb_user_info (user_id int NOT NULL, posts int NOT NULL default "0", location varchar(50) NOT NULL, avatar_dir varchar(50) NOT NULL, avatar_file varchar(100) NOT NULL, signature varchar(255),suspendmonitors smallint NOT NULL default "0", monitordefault smallint NOT NULL default "1", PRIMARY KEY (user_id))', TRUE)) 
+         // User post counts will be created as users' messages are viewed
+         $content .= 'Successfully created the phpwsBB User Information table.<br />';
+     else 
+         $content .= 'There was a problem creating the phpwsBB User Information table.<br />';
+ }
+         
  ?>

[phpwsbb-commits] phpwsbb/templates/threads list.tpl,1.3,1.4

[Don S. <ri...@us...>]

Update of /cvsroot/phpwsbb/phpwsbb/templates/threads
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17107/templates/threads

Modified Files:
	list.tpl 
Log Message:
Patch #1002850, Eloi's changes.  Need to be tested and examined.

Index: list.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/threads/list.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** list.tpl	29 Mar 2004 04:40:54 -0000	1.3
--- list.tpl	13 Aug 2004 21:32:39 -0000	1.4
***************
*** 10,30 ****
  <td class="smalltext"><b>{SELECT_LABEL}</b></td>
  <!-- END SELECT_LABEL -->
! <td width="70%" 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 width="25%" align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTPOST_LABEL}</b></td>
  </tr>
  {LIST_ITEMS}
  </table>
  <!-- BEGIN ACTION_STUFF -->
! <br />
! <table border="0" width="100%">
  <tr>
! <td width="33%">{NAV_INFO}</td>
! <td width="33%" align="center">{NAV_BACKWARD}&#160;{NAV_SECTIONS}&#160;{NAV_FORWARD}<br />
! {NAV_LIMITS}</td>
! <td width="33%" align="right">{ACTION_SELECT} {ACTION_BUTTON}</td>
  </tr>
  </table>
--- 10,27 ----
  <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>{REPLIES_LABEL}</b></td>
! <td align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTPOST_LABEL}</b></td>
  </tr>
  {LIST_ITEMS}
  </table>
  <!-- BEGIN ACTION_STUFF -->
! <table border="0" width="100%" style="background-color: transparent">
  <tr>
!   <td width="33%">{NAV_INFO}</td>
!   <td width="33%" align="center">
!     {NAV_BACKWARD}&#160;{NAV_SECTIONS}&#160;{NAV_FORWARD}<br />
!     {NAV_LIMITS}</td>
!   <td width="33%" align="right">{ACTION_SELECT} {ACTION_BUTTON}</td>
  </tr>
  </table>