phpwsbb-commits — phpwsBB CVS Commits Notifications

[phpwsbb-commits] phpwsbb/boost install.sql,1.19,1.20 update.php,1.41,1.42

[Eloi G. <ada...@us...>]

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

Modified Files:
	install.sql update.php 
Log Message:
Fixed Bug Report [1033715] "Inserting new member rank SQL error"

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.sql,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** install.sql	17 Sep 2004 15:56:35 -0000	1.19
--- install.sql	26 Sep 2004 05:11:54 -0000	1.20
***************
*** 20,24 ****
      lastpost_topic_id     int NOT NULL default '0',
      lastpost_post_id      int NOT NULL default '0',
-     moderators  varchar(40) NOT NULL default '',
      PRIMARY KEY (id)
  );
--- 20,23 ----
***************
*** 110,115 ****
      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 ('Site Admin', 0, 1, NULL, NULL);
! INSERT INTO mod_phpwsbb_user_ranks VALUES ('Member', 0, 0, NULL, NULL);
  
  CREATE TABLE mod_phpwsbb_user_info (

Index: update.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** update.php	21 Sep 2004 03:12:04 -0000	1.41
--- update.php	26 Sep 2004 05:11:54 -0000	1.42
***************
*** 283,288 ****
  
      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 
--- 283,288 ----
  
      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']->sqlInsert(array('rank_title'=>'Site Admin','rank_min'=>'0','rank_special'=>'1','rank_image'=>NULL,'rank_image_caption'=>NULL), 'mod_phpwsbb_user_ranks')
!       && $status = $GLOBALS['core']->sqlInsert(array('rank_title'=>'Member','rank_min'=>'0','rank_special'=>'0','rank_image'=>NULL,'rank_image_caption'=>NULL), 'mod_phpwsbb_user_ranks')
          $content .= 'Successfully created the phpwsBB User Ranking table.<br />';
      else 
***************
*** 319,322 ****
          $content .= 'There was a problem creating the phpwsBB User Information table.<br />';
  }
!         
  ?>
--- 319,322 ----
          $content .= 'There was a problem creating the phpwsBB User Information table.<br />';
  }
! 
  ?>

[phpwsbb-commits] phpwsbb/class Thread.php,1.61,1.62

[Eloi G. <ada...@us...>]

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

Modified Files:
	Thread.php 
Log Message:
Fixed Bug Report [1033711] "HTML in reply email".

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** Thread.php	21 Sep 2004 03:12:05 -0000	1.61
--- Thread.php	25 Sep 2004 17:49:09 -0000	1.62
***************
*** 342,346 ****
              $message = $_SESSION['PHPWSBB_Manager']->_email_text;
              // Replace [name] and [url] in $message
!             $message = str_replace('[name]', '"' . $this->getLabel() . '"', $message);
              // Got rid of the brackets so that the link isn't broken in email messages
              $message = str_replace('[url]', 'http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId(), $message);
--- 342,346 ----
              $message = $_SESSION['PHPWSBB_Manager']->_email_text;
              // Replace [name] and [url] in $message
!             $message = str_replace('[name]', '"' . strip_tags($this->getLabel()) . '"', $message);
              // Got rid of the brackets so that the link isn't broken in email messages
              $message = str_replace('[url]', 'http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId(), $message);

[phpwsbb-commits] phpwsbb/class Message.php,1.66,1.67

[Eloi G. <ada...@us...>]

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

Modified Files:
	Message.php 
Log Message:
Fixed Bug Report [1033699] "Guest reply minor issues"

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** Message.php	19 Sep 2004 06:37:01 -0000	1.66
--- Message.php	25 Sep 2004 04:46:03 -0000	1.67
***************
*** 344,348 ****
              $tags['MESSAGE_BODY'] = PHPWS_WizardBag::js_insert('wysiwyg', 'PHPWSBB_Message_edit', 'Message_body') . $tags['MESSAGE_BODY'];
  
!         $content = PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit.tpl');
          if ($thread) {
              $content .= $thread->_view(TRUE);
--- 344,348 ----
              $tags['MESSAGE_BODY'] = PHPWS_WizardBag::js_insert('wysiwyg', 'PHPWSBB_Message_edit', 'Message_body') . $tags['MESSAGE_BODY'];
  
!         $content = '<a name="bb-top" />'.PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit.tpl');
          if ($thread) {
              $content .= $thread->_view(TRUE);

[phpwsbb-commits] phpwsbb/templates view_forum_bottom.tpl,1.2,1.3 view_forum_top.tpl,1.1,1.2 view_thread_bottom.tpl,1.1,1.2 view_thread_top.tpl,1.2,1.3

[Eloi G. <ada...@us...>]

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

Modified Files:
	view_forum_bottom.tpl view_forum_top.tpl 
	view_thread_bottom.tpl view_thread_top.tpl 
Log Message:
Fixed Bug Report [1033699] "Guest reply minor issues"

Index: view_thread_bottom.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_thread_bottom.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** view_thread_bottom.tpl	13 Aug 2004 21:32:38 -0000	1.1
--- view_thread_bottom.tpl	25 Sep 2004 04:46:03 -0000	1.2
***************
*** 1,25 ****
  <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}
--- 1,27 ----
  <br />
! <!-- BEGIN ACTIONS -->
!   <!-- 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 -->
!   |
! <!-- END ACTIONS -->
  <!-- BEGIN THREAD_MOVE -->
  {START_FORM}{THREAD_MOVE}&nbsp;{THREAD_FID}{END_FORM}

Index: view_forum_top.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_forum_top.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** view_forum_top.tpl	13 Aug 2004 21:32:38 -0000	1.1
--- view_forum_top.tpl	25 Sep 2004 04:46:03 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
    {CATEGORY_TEXT}:&#160;{CATEGORY}<br />
    <!-- END CATEGORY -->
+ <!-- BEGIN ACTIONS -->
  <span class="smalltext">
    <!-- BEGIN NEW -->
***************
*** 23,24 ****
--- 24,26 ----
    |
  </span>
+ <!-- END ACTIONS -->

Index: view_forum_bottom.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_forum_bottom.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** view_forum_bottom.tpl	19 Sep 2004 06:37:01 -0000	1.2
--- view_forum_bottom.tpl	25 Sep 2004 04:46:03 -0000	1.3
***************
*** 1,2 ****
--- 1,3 ----
+ <!-- BEGIN ACTIONS -->
  <span class="smalltext">
    <!-- BEGIN NEW -->
***************
*** 17,20 ****
--- 18,22 ----
    |
  </span>
+ <!-- END ACTIONS -->
  
  <!-- BEGIN MOD_LIST -->

Index: view_thread_top.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_thread_top.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** view_thread_top.tpl	19 Sep 2004 18:44:32 -0000	1.2
--- view_thread_top.tpl	25 Sep 2004 04:46:03 -0000	1.3
***************
*** 1,25 ****
  <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}
--- 1,27 ----
  <br />
! <!-- BEGIN ACTIONS -->
!   <!-- 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 -->
!   |
! <!-- END ACTIONS -->
  <!-- BEGIN THREAD_MOVE -->
  {START_FORM}{THREAD_MOVE}&nbsp;{THREAD_FID}{END_FORM}

[phpwsbb-commits] phpwsbb/class Manager.php,1.50,1.51

[Eloi G. <ada...@us...>]

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

Modified Files:
	Manager.php 
Log Message:
Fixed code that generated some "undefined variable" notices

Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Manager.php	23 Sep 2004 07:33:27 -0000	1.50
--- Manager.php	23 Sep 2004 19:02:27 -0000	1.51
***************
*** 1386,1390 ****
        // 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'])
--- 1386,1390 ----
        // Determine user's rank
        if($result['posts']&& $this->_user_ranks) {
!           $isSpecialuser = (isset($result['deity']) && $result['deity']) || (isset($result['varValue']) && stristr($result['varValue'], 'lock_threads'));
            foreach ($this->_user_ranks as $rank) 
                if(($rank['rank_min']<=$result['posts'])

[phpwsbb-commits] phpwsbb/class Forum.php,1.30,1.31

[Eloi G. <ada...@us...>]

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

Modified Files:
	Forum.php 
Log Message:
Fixed Bug Report [1033126] "Create new forum error".

Index: Forum.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Forum.php	19 Sep 2004 06:37:00 -0000	1.30
--- Forum.php	23 Sep 2004 17:44:31 -0000	1.31
***************
*** 320,327 ****
          }
  
!         if(isset($_POST['phpwsBB_moderator']) && is_array($_POST['phpwsBB_moderator'])) {
              $this->_moderators = implode(',', $_POST['phpwsBB_moderator']);
!         }
! 
  
          /* Hacks to get around some of Eloi's DDL */
--- 320,327 ----
          }
  
!         if(isset($_POST['phpwsBB_moderator']) && is_array($_POST['phpwsBB_moderator'])) 
              $this->_moderators = implode(',', $_POST['phpwsBB_moderator']);
!         else
!             $this->_moderators = '';
  
          /* Hacks to get around some of Eloi's DDL */

[phpwsbb-commits] phpwsbb/class Manager.php,1.49,1.50

[Eloi G. <ada...@us...>]

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

Modified Files:
	Manager.php 
Log Message:
Insert query was breaking because of null values.  Specified default values for monitordefault & suspendmonitors.

Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Manager.php	21 Sep 2004 03:13:54 -0000	1.49
--- Manager.php	23 Sep 2004 07:33:27 -0000	1.50
***************
*** 1340,1347 ****
            // 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');
            }
  
--- 1340,1351 ----
            // 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');
+           } 
+           else {
+               $result['monitordefault'] = '1';
+               $result['suspendmonitors'] = '0';
            }
  

[phpwsbb-commits] phpwsbb README,1.3,1.4

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

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

Modified Files:
	README 
Log Message:
Adding note about imglib

Index: README
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** README	6 Apr 2004 17:57:51 -0000	1.3
--- README	21 Sep 2004 14:34:20 -0000	1.4
***************
*** 16,21 ****
  INSTALLATION
  ============
! See docs/INSTALL for installation instructions, as well as instructions
! on seeking support for phpwsBB.
  
  LICENSE
--- 16,23 ----
  INSTALLATION
  ============
! See docs/INSTALL for installation instructions, as well as instructions on
! seeking support for phpwsBB.  If you are installing this on phpwebsite <
! 0.9.3-5, you'll need to install the ImgLib classes, see the README in the
! imglib dir.
  
  LICENSE

[phpwsbb-commits] phpwsbb/imglib Image_Library.txt,NONE,1.1

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

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

Added Files:
	Image_Library.txt 
Log Message:
Forgot to add this

--- NEW FILE: Image_Library.txt ---

PHPWS_IMGLib allows you to easily create & manage a library of images for your module and allow the user to select a desired image. 


FILE LOCATIONS
==============
An image library is located inside the /images/<module name>/library directory.  All library settings will be stored in "config.php" at this location.  No databases are used in this class.

All images are stored in sub-directories which make up the various galleries.  The directories are automatically named, but "config.php" contains the actual directory names that are associated with each gallery.


CREATING A LIBRARY
==================
Library creation could not be simpler.  Create a new instance of PHPWS_IMGLib with all required parameters.  If it cannot find a library in place, it will create a blank one with a gallery named "_General".

USEAGE & CALLING CONVENTIONS
============================
This class is stand-alone and non-persistent.  You must construct an object within your script to get it to work. 

require_once PHPWS_SOURCE_DIR . 'core/IMGLibrary.php';
$library = new PHPWS_IMGLib($can_manage_images, $can_manage_galleries, $return_data
              , $current_gallery, $current_image, $module, $base_dir, $block, $image_type
              , $max_image_size, $max_image_height, $max_image_width)

CAUTION:  This class uses a REALLY long parameter list!  Make sure you don't put anything in the wrong order.

-----------------
Parameter definitions are as follows:

$can_manage_images
Denotes that the user is authorized to add or delete images.

$can_manage_galleries
Denotes that the user authorized to add, rename or delete galleries.

$return_data
Data to send on exit from the gallery.
This can be used to store what the user was doing before entering the gallery.  If the user clicks the "Exit the Gallery" link, this data can then be used to restore the previous page or state. 

$current_gallery
Currently selected gallery.  Setting this to NULL will take you to the first one on the list.
This value is also retrieved from $_POST['IMGLib_current_gallery'] if it is set.  The string consists of "<base_dir>/<name of the current gallery directory>/".  There must be a "/" at the end.

$current_image
Currently selected image. Setting this to NULL means that no images are selected yet.
This value is also retrieved from $_POST['IMGLib_current_image'] if it is set. 

$module
Name of module this image library belongs to.  

$base_dir  
The Image Library base directory's name.  Defaults to "library".  This only affects the filepath to the galleries, so changing this allows you to have more than 1 library per module.  Theoretically.  I haven't tried it out myself. <grin> 

$block
Content_Var to use for displaying data.

$image_type 
What to call the image in the displayed text.  ex:"avatar", "mugshot", "image"

$max_image_size
Maximum size of uploaded images. In kilobytes.

$max_image_height
Maximum height of uploaded images in pixels.

$max_image_width
Maximum width of uploaded images in pixels.
-----------------

Once PHPWS_IMGLib has been called by a user, all operations are handled via the POST variable "IMGLib_op".  If this variable is set, call ->action().  The class will do the rest.  It will "remember" the $return_data ,$current_image, $current_gallery, and $module variables by sending them back to itself in POST variables.  The values that it reminds itself about will override whatever values are given in the parameter list.

if (isset($_REQUEST['IMGLib_op'])) {
  require_once PHPWS_SOURCE_DIR . 'core/IMGLibrary.php';
  $library = new PHPWS_IMGLib($can_manage_images, $can_manage_galleries, $return_data
        , $current_gallery, $current_image, $module, $base_dir, $block, $image_type
        , $max_image_size, $max_image_height, $max_image_width)
  $library->action($_REQUEST['IMGLib_op']);
}

TIP: If you're entering the image library from a form, you can choose to set any (or all) of these POST variables beforehand.


CATCHING THE SELECTED IMAGE
===========================
The User's image selection can be detected by:
  if($_REQUEST['IMGLib_op']=='select_image')

The variable $_POST['IMGLib_selected_image'] will contain the filename of the selected image.

The variable $_POST['IMGLib_selected_gallery'] will contain the /images/module/ subdirectory of the selected image in the form "<base_dir>/<name of the current gallery directory>/".


LEAVING THE IMAGE LIBRARY
=========================
The User's desire to leave can be detected by:
  if($_REQUEST['IMGLib_op']=='exit')

The variable $_POST['IMGLib_return_data'] will contain any data you have stored in order to restore whatever page the user was on before entering the library.  You don't *have* to use this variable -- it's just provided in case you want to stay away from storing data in Sessions.


EVENT HANDLERS
==============
For most events, like creating or renaming a gallery, no extra code is required in your module.  However, whenever you move or delete something, you may need to update your module's data to reflect what has been done.  PHPWS_IMGLib has a variable named "_done" that reports the successful completion of of major operations.

There is another variable called "_created" that reports when a new image library was just created.  It wouldn't contain the boolean "true", but rather the name of the default gallery that was just created.

After the action() has been called, include any handlers you need like so:
  $library->action($_REQUEST['IMGLib_op']);
  if ($_REQUEST['IMGLib_op']=='move_image' && $library->_done) {
    <module code>
  }
  if ($library->_created) {
    <module code>
  }


GALLERY MANAGEMENT
==================
All options for managing galleries are located to the bottom of the image selection screen.  Here you can add & rename galleries or delete the one that you are currently viewing.


IMAGE MANAGEMENT
================
Each image displayed is accompanied by it's name, a selection button, and a "Delete" button.  The currenty selected image will also display an indicator next to it.  

An image upload dialog is also provided at the bottom of the screen. 

The images' display names are created by stripping the extension off and converting all non-alphanumerical characters into spaces.


CHANGING CONFIGURATION SETTINGS
===============================
There are 2 types of configuration settings for your image library -- Variable & Permanent.

Variable settings include all parameters used in creating a new instance of PHPWS_IMGLib.  Except for 6 that are POSTed back to itself, your module has complete and immediate control over what values these carry.  

The variables that PHPWS_IMGLib POSTs back to itself are:
'module','IMGLib_can_select_images','IMGLib_return_data','IMGLib_current_image','IMGLib_current_gallery', and 'IMGLib_selected_view'.

Permanent settings are stored in /images/<module name>/library/config.php.  The only thing that is stored here are the gallery display & directory names.  Although I suggest you make all changes to the gallery structure through the provided dialogs, you could make them here as well.

[phpwsbb-commits] phpwsbb/class Manager.php,1.48,1.49

[Eloi G. <ada...@us...>]

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

Modified Files:
	Manager.php 
Log Message:
_load_user_ranks() now loads on an as-needed basis.

Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** Manager.php	19 Sep 2004 06:37:00 -0000	1.48
--- Manager.php	21 Sep 2004 03:13:54 -0000	1.49
***************
*** 251,256 ****
          $this->_max_avatar_width    = $result[0]['max_avatar_width'];
          $this->_max_avatar_size     = $result[0]['max_avatar_size'];
-         // Load user ranking system 
-         $this->_load_user_ranks();
          // Default page
          $this->last_viewed = array('PHPWSBB_MAN_OP'=>'list');
--- 251,254 ----
***************
*** 901,904 ****
--- 899,904 ----
          $tags['RANK_SPECIAL_ROWS'] = $tags['RANK_MEMBER_ROWS'] = '';
          $opts['find'] = array('RANKROW_RANK_ID', 'RANKROW_RANK_TITLE', 'RANKROW_RANK_MIN', 'RANKROW_RANK_SPECIAL');
+         // Load user ranking system
+         $this->_load_user_ranks();
          foreach ($this->_user_ranks as $rank) {
              $tbl = new EZform('PHPWSBB_Settings_edit');
***************
*** 1377,1380 ****
--- 1377,1383 ----
            $result['SIGNATURE'] = PHPWS_Text::parseOutput($result['signature']);
  
+       // Load user ranking system
+       if(empty($this->_user_ranks))
+           $this->_load_user_ranks();
        // Determine user's rank
        if($result['posts']&& $this->_user_ranks) {

[phpwsbb-commits] phpwsbb/class Thread.php,1.60,1.61

[Eloi G. <ada...@us...>]

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

Modified Files:
	Thread.php 
Log Message:
Disabled phpwsBB from triggering monitor emails while updating

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** Thread.php	19 Sep 2004 06:37:01 -0000	1.60
--- Thread.php	21 Sep 2004 03:12:05 -0000	1.61
***************
*** 324,327 ****
--- 324,331 ----
              echo '<h3>session user not set!</h3>';
  
+         // This switch allows mass updates to occur without sending a mass email
+         if(isset($_REQUEST['run_silent']))
+             return;
+ 
          $user = $_SESSION['PHPWSBB_Manager']->_load_user_settings($_SESSION['OBJ_user']->user_id);
          if ($_SESSION['PHPWSBB_Manager']->_allow_user_monitors && $new && !$user['suspendmonitors']) {

[phpwsbb-commits] phpwsbb/boost update.php,1.40,1.41

[Eloi G. <ada...@us...>]

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

Modified Files:
	update.php 
Log Message:
Disabled phpwsBB from triggering monitor emails while updating

Index: update.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** update.php	17 Sep 2004 15:56:36 -0000	1.40
--- update.php	21 Sep 2004 03:12:04 -0000	1.41
***************
*** 51,54 ****
--- 51,57 ----
  $status = 1;
  
+ // Don't trigger any monitors
+ $_REQUEST['run_silent'] = 1;
+ 
  // This might not exist during update
  if (!isset($_SESSION['PHPWSBB_Manager']))
***************
*** 286,291 ****
          $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)) {
--- 289,294 ----
          $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)) {

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

[Eloi G. <ada...@us...>]

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

Modified Files:
	list.tpl row.tpl 
Log Message:
Got rid of deprecated "align" & "center" tags and made other changes to bring module output closer to WAI & Section 508 accessibility standards

Index: row.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/threads/row.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** row.tpl	15 Sep 2004 20:22:18 -0000	1.4
--- row.tpl	19 Sep 2004 18:44:33 -0000	1.5
***************
*** 1,12 ****
  <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 align="center" class="smalltext">{REPLIES}</td>
! <td align="center" class="smalltext">{LASTPOST}</td>
  </tr>
--- 1,12 ----
  <tr{ROW_CLASS}>
  <!-- BEGIN SELECT -->
! <td class="smalltext" style="text-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" style="text-align:center">{REPLIES}</td>
! <td class="smalltext" style="text-align:center">{LASTPOST}</td>
  </tr>

Index: list.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/threads/list.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** list.tpl	13 Aug 2004 21:32:39 -0000	1.4
--- list.tpl	19 Sep 2004 18:44:32 -0000	1.5
***************
*** 7,16 ****
  <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>{REPLIES_LABEL}</b></td>
! <td align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTPOST_LABEL}</b></td>
  </tr>
  {LIST_ITEMS}
--- 7,16 ----
  <table border="0" width="100%" cellspacing="1" cellpadding="4">
  <tr class="bg_medium">
!     <!-- BEGIN SELECT_LABEL -->
!     <th class="smalltext" scope="col"><b>{SELECT_LABEL}</b></th>
!     <!-- END SELECT_LABEL -->
!     <th width="100%" class="smalltext" scope="col"><b>{LABEL_LABEL}</b></th>
!     <th valign="middle" class="smalltext" style="text-align:center" scope="col"><b>{REPLIES_LABEL}</b></th>
!     <th valign="middle" nowrap="nowrap" class="smalltext" style="text-align:center" scope="col"><b>{LASTPOST_LABEL}</b></th>
  </tr>
  {LIST_ITEMS}
***************
*** 20,27 ****
  <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>
--- 20,28 ----
  <tr>
    <td width="33%">{NAV_INFO}</td>
!   <td width="33%" style="text-align:center">
      {NAV_BACKWARD}&#160;{NAV_SECTIONS}&#160;{NAV_FORWARD}<br />
!     {NAV_LIMITS}
!   </td>
!   <td width="33%" style="text-align:right">{ACTION_SELECT} {ACTION_BUTTON}</td>
  </tr>
  </table>

[phpwsbb-commits] phpwsbb/templates edit_settings.tpl,1.7,1.8 edit_user_settings.tpl,1.4,1.5 editforum.tpl,1.4,1.5 menu.tpl,1.2,1.3 view_thread_top.tpl,1.1,1.2

[Eloi G. <ada...@us...>]

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

Modified Files:
	edit_settings.tpl edit_user_settings.tpl editforum.tpl 
	menu.tpl view_thread_top.tpl 
Log Message:
Got rid of deprecated "align" & "center" tags and made other changes to bring module output closer to WAI & Section 508 accessibility standards

Index: edit_settings.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/edit_settings.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** edit_settings.tpl	13 Aug 2004 21:32:38 -0000	1.7
--- edit_settings.tpl	19 Sep 2004 18:44:29 -0000	1.8
***************
*** 1,17 ****
  {START_FORM}
! {SETTINGS_ALLOW_ANON_POSTS} {ANONPOSTS_TEXT}<br />
! {SETTINGS_ALLOW_ANON_VIEW} {ANONVIEW_TEXT}<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 />
! {SETTINGS_SHOWFORUMSBLOCK} {SHOWFORUMSBLOCK_TEXT}<br />
! {FORUMSBLOCKTITLE_TEXT}: {SETTINGS_FORUMSBLOCKTITLE}<br />
! {SETTINGS_SHOWLATESTTHREADSBLOCK} {SHOWLATESTTHREADSBLOCK_TEXT}<br />
! {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>
--- 1,18 ----
  {START_FORM}
! <label>{SETTINGS_ALLOW_ANON_POSTS} {ANONPOSTS_TEXT}</label><br />
! <label>{SETTINGS_ALLOW_ANON_VIEW} {ANONVIEW_TEXT}</label><br />
! <label>{ADMIN_EMAIL_TEXT}: {SETTINGS_ADMIN_EMAIL}</label>&#160;{ADMIN_EMAIL_HELP}<br />
! <label>{SETTINGS_MONITOR_POSTS} {MONITOR_POSTS_TEXT}</label>&#160;{MONITOR_POSTS_HELP}<br />
! <label>{SETTINGS_ALLOW_USER_MONITORS} {ALLOW_USER_MONITORS_TEXT}</label><br />
! <label FOR="SETTINGS_email_text">{EMAIL_TEXT_TEXT}</label>:&#160;
! {EMAIL_TEXT_HELP}<br />{SETTINGS_EMAIL_TEXT}<br />
! <label>{SETTINGS_SHOWFORUMSBLOCK} {SHOWFORUMSBLOCK_TEXT}</label><br />
! <label>{FORUMSBLOCKTITLE_TEXT}: {SETTINGS_FORUMSBLOCKTITLE}</label><br />
! <label>{SETTINGS_SHOWLATESTTHREADSBLOCK} {SHOWLATESTTHREADSBLOCK_TEXT}</label><br />
! <label>{LATESTTHREADSBLOCKTITLE_TEXT}: {SETTINGS_LATESTTHREADSBLOCKTITLE}</label><br />
! <label>{SETTINGS_MAXLATESTTHREADS} {MAXLATESTTHREADS_TEXT}</label><br />
! <label>{SETTINGS_USE_AVATARS} {USE_AVATARS_TEXT}</label><br />
! <label>{SETTINGS_USE_OFFSITE_AVATARS} {USE_OFFSITE_AVATARS_TEXT}</label><br />
! <label>{SETTINGS_USE_SIGNATURES} {USE_SIGNATURES_TEXT}</label><br />
  <br />
  <h3>{RANK_TABLE_TEXT}</h3>
***************
*** 19,25 ****
  <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>
--- 20,26 ----
  <table width="100%" cellspacing="1" cellpadding="4">
    <tr class="bg_medium">
!     <th width="60%" class="smalltext" scope="col"><b>{RANK_TITLE_LABEL}</b></th>
!     <th valign="middle" class="smalltext" style="text-align:center" scope="col"><b>{RANK_MIN_LABEL}</b></th>
!     <th valign="middle" class="smalltext" style="text-align:center" scope="col"><b>{RANK_SPECIAL_LABEL}</b></th>
    </tr>
    <tr>
***************
*** 38,42 ****
  <br />
  <br />
! {SETTINGS_BBOFFLINE} {BBOFFLINE_TEXT}&#160;{BBOFFLINE_HELP}<br />
  {SETTINGS_SAVE}
  {END_FORM}
--- 39,43 ----
  <br />
  <br />
! <label>{SETTINGS_BBOFFLINE} {BBOFFLINE_TEXT}</label>&#160;{BBOFFLINE_HELP}<br />
  {SETTINGS_SAVE}
  {END_FORM}

Index: menu.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/menu.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menu.tpl	21 Jun 2004 21:00:31 -0000	1.2
--- menu.tpl	19 Sep 2004 18:44:32 -0000	1.3
***************
*** 15,22 ****
  <tr>
  <!-- BEGIN ADD_FORUM -->
! <td width="50%" align="center" class="bg_light">{ADD_FORUM}</td>
  <!-- END ADD_FORUM -->
  <!-- BEGIN SETTINGS -->
! <td width="50%" align="center" class="bg_light">{SETTINGS}</td>
  <!-- END SETTINGS -->
  </tr>
--- 15,22 ----
  <tr>
  <!-- BEGIN ADD_FORUM -->
! <td width="50%" class="bg_light" style="text-align:center">{ADD_FORUM}</td>
  <!-- END ADD_FORUM -->
  <!-- BEGIN SETTINGS -->
! <td width="50%" class="bg_light" style="text-align:center">{SETTINGS}</td>
  <!-- END SETTINGS -->
  </tr>

Index: editforum.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/editforum.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** editforum.tpl	19 Sep 2004 06:37:01 -0000	1.4
--- editforum.tpl	19 Sep 2004 18:44:32 -0000	1.5
***************
*** 3,21 ****
  
  <!-- BEGIN LABEL -->
  {LABEL_TEXT}:<br />
! {FORUM_LABEL}<br /><br />
  <!-- END LABEL -->
  
  <!-- BEGIN DESCRIPTION -->
  {DESCRIPTION_TEXT}:<br />
! {FORUM_DESCRIPTION}<br /><br />
  <!-- END DESCRIPTION -->
  
  <!-- BEGIN SORTORDER -->
! {SORTORDER_TEXT}:&#160;{FORUM_SORTORDER}&#160; {SORTORDER_HELP}<br /><br />
  <!-- END SORTORDER -->
  
  <!-- BEGIN CATEGORIES -->
! {CATEGORIES_TEXT}:&#160;{CATEGORIES}<br /><br />
  <!-- END CATEGORIES -->
  
--- 3,35 ----
  
  <!-- BEGIN LABEL -->
+ <label>
  {LABEL_TEXT}:<br />
! {FORUM_LABEL}
! </label>
! <br /><br />
  <!-- END LABEL -->
  
  <!-- BEGIN DESCRIPTION -->
+ <label>
  {DESCRIPTION_TEXT}:<br />
! {FORUM_DESCRIPTION}
! </label>
! <br /><br />
  <!-- END DESCRIPTION -->
  
  <!-- BEGIN SORTORDER -->
! <label>
! {SORTORDER_TEXT}:&#160;{FORUM_SORTORDER}
! </label>&#160; {SORTORDER_HELP}
! <br />
! <br />
  <!-- END SORTORDER -->
  
  <!-- BEGIN CATEGORIES -->
! <label>
! {CATEGORIES_TEXT}:&#160;{CATEGORIES}
! </label>
! <br />
! <br />
  <!-- END CATEGORIES -->
  

Index: edit_user_settings.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/edit_user_settings.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** edit_user_settings.tpl	13 Aug 2004 21:32:38 -0000	1.4
--- edit_user_settings.tpl	19 Sep 2004 18:44:32 -0000	1.5
***************
*** 1,30 ****
  {EXIT_LINK}<br />
  {START_FORM}
! {SETTINGS_MONITORDEFAULT} {MONITORDEFAULT_TEXT}<br />
  <!-- BEGIN MONITORDEFAULT_WARNING -->
  <i>({MONITORDEFAULT_WARNING})</i><br />
  <!-- END MONITORDEFAULT_WARNING -->
! {SETTINGS_SUSPENDMONITORS} {SUSPENDMONITORS_TEXT}&#160;{SUSPENDMONITORS_HELP}<br />
  {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 />
--- 1,32 ----
  {EXIT_LINK}<br />
  {START_FORM}
! <label>{SETTINGS_MONITORDEFAULT} {MONITORDEFAULT_TEXT}</label><br />
  <!-- BEGIN MONITORDEFAULT_WARNING -->
  <i>({MONITORDEFAULT_WARNING})</i><br />
  <!-- END MONITORDEFAULT_WARNING -->
! <label>{SETTINGS_SUSPENDMONITORS} {SUSPENDMONITORS_TEXT}</label>&#160;{SUSPENDMONITORS_HELP}<br />
  {REMOVEALLMONITORS}&#160;{REMOVEALLMONITORS_HELP}<br />
  <br />
+ <label>
  {LOCATION_LABEL}<br />
  {SETTINGS_LOCATION}<br />
+ </label>
  <br />
! <label FOR="SETTINGS_signature">{SIGNATURE_LABEL}</label><br />
  {SIGNATURE_HELP}<br />
  {SETTINGS_SIGNATURE}<br />
  <br />
  <!-- BEGIN AVC -->
! <div class="bg_medium" style="text-align:center">
    <b>{AVATAR_TITLE}</b><br />
  </div>
  <!-- BEGIN CURRENT -->
! <div style="text-align:center">
  <b>{CURRENT_AVATAR_LABEL}</b><br />
  {CURRENT_AVATAR_IMG}<br />
  {CURRENT_AVATAR_TEXT}<br />
! <label>{REMOVE_AVATAR_LABEL} {SETTINGS_DELETE_IMAGE}</label><br />
! </div>
  <br />
  <!-- END CURRENT -->
  {SELECT_AVATAR_LABEL}<br />
***************
*** 32,44 ****
  {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}
--- 34,48 ----
  {IMGLIB_OP}<br />
  <br />
! <div class="bg_medium" style="text-align:center">
    <b>{IMAGE_MGMT_TITLE}</b>
  </div>
! <b><label FOR="SETTINGS_avatar_file">{REMOTE_AVATAR_LABEL}</label></b><br />
  {REMOTE_AVATAR_HELP}<br />
  {SETTINGS_AVATAR_FILE}<br />
  <!-- END AVC -->
  <br />
! <div style="text-align:center">
! {SETTINGS_SAVE}
! </div>
  {END_FORM}
  {EXIT_LINK}

Index: view_thread_top.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_thread_top.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** view_thread_top.tpl	13 Aug 2004 21:32:38 -0000	1.1
--- view_thread_top.tpl	19 Sep 2004 18:44:32 -0000	1.2
***************
*** 26,30 ****
  <!-- END THREAD_MOVE -->
  <table border="0" width="100%" cellspacing="1" cellpadding="4">
!   <tr class="bg_medium" align="center">
      <td width="140">
        <b>{AUTHOR}</b>
--- 26,30 ----
  <!-- END THREAD_MOVE -->
  <table border="0" width="100%" cellspacing="1" cellpadding="4">
!   <tr class="bg_medium" style="text-align:center">
      <td width="140">
        <b>{AUTHOR}</b>

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

[Eloi G. <ada...@us...>]

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

Modified Files:
	list.tpl row.tpl 
Log Message:
Got rid of deprecated "align" & "center" tags and made other changes to bring module output closer to WAI & Section 508 accessibility standards

Index: row.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/forums/row.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** row.tpl	13 Aug 2004 21:32:39 -0000	1.4
--- row.tpl	19 Sep 2004 18:44:32 -0000	1.5
***************
*** 1,5 ****
  <tr{ROW_CLASS}>
  <!-- BEGIN SELECT -->
! <td class="smalltext" align="center">{SELECT}</td>
  <!-- END SELECT -->
  <td class="smalltext">
--- 1,5 ----
  <tr{ROW_CLASS}>
  <!-- BEGIN SELECT -->
! <td class="smalltext" style="text-align:center">{SELECT}</td>
  <!-- END SELECT -->
  <td class="smalltext">

Index: list.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/forums/list.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** list.tpl	13 Aug 2004 21:32:38 -0000	1.4
--- list.tpl	19 Sep 2004 18:44:32 -0000	1.5
***************
*** 7,28 ****
  <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="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}
  </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>
--- 7,29 ----
  <table border="0" width="100%" cellspacing="1" cellpadding="4">
  <tr class="bg_medium">
!   <!-- BEGIN SELECT_LABEL -->
!   <th class="smalltext" scope="col"><b>{SELECT_LABEL}</b></th>
!   <!-- END SELECT_LABEL -->
!   <th width="60%" class="smalltext" scope="col"><b>{LABEL_LABEL}</b></th>
!   <th valign="middle" class="smalltext" style="text-align:center" scope="col"><b>{THREADS_LABEL}</b></th>
!   <th valign="middle" class="smalltext" style="text-align:center" scope="col"><b>{POSTS_LABEL}</b></th>
!   <th width="30%" valign="middle" nowrap="nowrap" class="smalltext" style="text-align:center" scope="col"><b>{LASTPOST_LABEL}</b></th>
  </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%" style="text-align:center">
!     {NAV_BACKWARD}&#160;{NAV_SECTIONS}&#160;{NAV_FORWARD}<br />
!     {NAV_LIMITS}
!   </td>
!   <td width="33%" style="text-align:right">{ACTION_SELECT} {ACTION_BUTTON}</td>
  </tr>
  </table>

[phpwsbb-commits] phpwsbb/class Forum.php,1.29,1.30 Manager.php,1.47,1.48 Message.php,1.65,1.66 Thread.php,1.59,1.60

[Eloi G. <ada...@us...>]

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

Modified Files:
	Forum.php Manager.php Message.php Thread.php 
Log Message:
Finished forum-specific moderator feature.

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** Thread.php	19 Sep 2004 05:14:22 -0000	1.59
--- Thread.php	19 Sep 2004 06:37:01 -0000	1.60
***************
*** 144,148 ****
  
              $sql = 'SELECT id FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_phpwsbb_messages WHERE tid=' . $this->getId();
!             if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator)
                  $sql .= ' AND hidden=0';
              $sql .= ' ORDER BY created';
--- 144,148 ----
  
              $sql = 'SELECT id FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_phpwsbb_messages WHERE tid=' . $this->getId();
!             if (!($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator))
                  $sql .= ' AND hidden=0';
              $sql .= ' ORDER BY created';
***************
*** 166,170 ****
  
      function _view($ro = FALSE) {
!         if ($this->isHidden() && !$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator) {
              $content = '<div class="errortext">' . $_SESSION['translate']->it('There is nothing here to see.') . '</div>';
              return $content;
--- 166,170 ----
  
      function _view($ro = FALSE) {
!         if ($this->isHidden() && !($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator)) {
              $content = '<div class="errortext">' . $_SESSION['translate']->it('There is nothing here to see.') . '</div>';
              return $content;
***************
*** 358,362 ****
  
      function _delete() {
!         if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads') && $this->isModerator) {
              $message = $_SESSION['translate']->it('Access to delete this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_delete()', $message, 'exit', 1);
--- 358,362 ----
  
      function _delete() {
!         if (!($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads') && $this->isModerator)) {
              $message = $_SESSION['translate']->it('Access to delete this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_delete()', $message, 'exit', 1);
***************
*** 410,414 ****
  
      function _lock($unlock = FALSE) {
!         if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'lock_threads') && $this->isModerator) {
              $message = $_SESSION['translate']->it('Access to lock this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_lock()', $message, 'exit', 1);
--- 410,414 ----
  
      function _lock($unlock = FALSE) {
!         if (!($_SESSION['OBJ_user']->allow_access('phpwsbb', 'lock_threads') && $this->isModerator)) {
              $message = $_SESSION['translate']->it('Access to lock this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_lock()', $message, 'exit', 1);
***************
*** 452,456 ****
  
      function _stick($unstick = FALSE) {
!         if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'sticky_threads') && $this->isModerator) {
              $message = $_SESSION['translate']->it('Access to stick this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_stock()', $message, 'exit', 1);
--- 452,456 ----
  
      function _stick($unstick = FALSE) {
!         if (!($_SESSION['OBJ_user']->allow_access('phpwsbb', 'sticky_threads') && $this->isModerator)) {
              $message = $_SESSION['translate']->it('Access to stick this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_stock()', $message, 'exit', 1);

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Message.php	19 Sep 2004 03:51:01 -0000	1.65
--- Message.php	19 Sep 2004 06:37:01 -0000	1.66
***************
*** 236,240 ****
       */
      function _edit() {
!         if (!empty($this->_id) && !($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && $this->isModerator) && ($_SESSION['OBJ_user']->username != $this->getOwner())) {
              $message = $_SESSION['translate']->it('Access to edit message [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Message::_edit()', $message, 'exit', 1);
--- 236,240 ----
       */
      function _edit() {
!         if (!empty($this->_id) && !$_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && !$this->isModerator && ($_SESSION['OBJ_user']->username != $this->getOwner())) {
              $message = $_SESSION['translate']->it('Access to edit message [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Message::_edit()', $message, 'exit', 1);
***************
*** 359,363 ****
       */
      function _save() {
!         if (!empty($this->_id) && !($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && $this->isModerator) && ($_SESSION['OBJ_user']->username != $this->getOwner())) {
              $message = $_SESSION['translate']->it('Access to save message [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_accessDenied()', $message, 'exit', 1);
--- 359,363 ----
       */
      function _save() {
!         if (!empty($this->_id) && !$_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && !$this->isModerator && ($_SESSION['OBJ_user']->username != $this->getOwner())) {
              $message = $_SESSION['translate']->it('Access to save message [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_accessDenied()', $message, 'exit', 1);
***************
*** 536,540 ****
       */
      function _delete() {
!         if (!($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_messages') && $this->isModerator) && ($_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 PHPWS_Error('phpwsbb', 'PHPWSBB_Message::_delete()', $message, 'exit', 1);
--- 536,540 ----
       */
      function _delete() {
!         if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_messages') && !$this->isModerator && ($_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 PHPWS_Error('phpwsbb', 'PHPWSBB_Message::_delete()', $message, 'exit', 1);

Index: Forum.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Forum.php	17 Sep 2004 15:59:59 -0000	1.29
--- Forum.php	19 Sep 2004 06:37:00 -0000	1.30
***************
*** 137,142 ****
          }
  
- //        $tmp = $GLOBALS['core']->getCol('SELECT username FROM mod_users WHERE user_id IN ('.$this->_moderators.')', TRUE);
- //        $this->moderator_names = implode(',', $moderator_names);
          /* To perform a moderation action, user must either be a moderator of this forum or be able to edit forums (supermoderator) */
          $this->isModerator = $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_forums')
--- 137,140 ----
***************
*** 176,179 ****
--- 174,184 ----
          if($_SESSION['OBJ_user']->user_id) 
              $tags['MYPROFILE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=usersettings">' . $_SESSION['translate']->it('My Forum Settings') . '</a>';
+         if(!empty($this->_moderators)) {
+             if($tmp = $GLOBALS['core']->getCol('SELECT username FROM mod_users WHERE user_id IN ('.$this->_moderators.')', TRUE))
+                 $tags['MODERATORS'] = implode(', ', $tmp);
+             else
+                 $tags['MODERATORS'] = $_SESSION['translate']->it('None'); 
+             $tags['MODERATORS_LABEL'] = $_SESSION['translate']->it('Forum Moderators');
+         }
  
          if(!$ro) {
***************
*** 224,228 ****
          $form->add('Forum_description', 'textarea', $this->_description);
          $form->setRows('Forum_description',10);
!         $form->setCols('Forum_description',70);
          $form->setTab('Forum_description', $tabs);
          $tabs++;
--- 229,233 ----
          $form->add('Forum_description', 'textarea', $this->_description);
          $form->setRows('Forum_description',10);
!         $form->setWidth('Forum_description',95);
          $form->setTab('Forum_description', $tabs);
          $tabs++;
***************
*** 257,260 ****
--- 262,287 ----
          $tags['SORTORDER_HELP'] = CLS_help::show_link('phpwsbb', 'sortorder');
  
+         /* Moderator List */
+         // Display list of automatic moderators (those that can edit forums)
+ 	      $super_mods = $GLOBALS['core']->getCol('SELECT u.username FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_users AS u LEFT JOIN ' . $GLOBALS['core']->tbl_prefix . 'mod_user_uservar AS v ON ( v.user_id = u.user_id) WHERE u.deity OR (u.admin_switch AND v.varName="MOD_phpwsbb" AND v.varValue LIKE "%edit_forums%") ORDER BY u.username ASC'); 
+ 	      if($super_mods) {
+ 	          $tags['S_MODERATORS_LABEL'] = $_SESSION['translate']->it('These users have moderation capabilities even if they\'re not selected');
+ 	          $tags['S_MODERATORS'] = implode(', ', $super_mods);
+         }
+         // Create list of eligible moderators (those that can edit messages)
+ 	      $eligible_mods = $GLOBALS['core']->query('SELECT u.username,u.user_id FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_users AS u LEFT JOIN ' . $GLOBALS['core']->tbl_prefix . 'mod_user_uservar AS v ON ( v.user_id = u.user_id) WHERE u.deity OR (u.admin_switch AND v.varName="MOD_phpwsbb" AND (v.varValue LIKE "%edit_forums%" OR v.varValue LIKE "%edit_messages%")) ORDER BY u.username ASC');
+ 	      if($eligible_mods) {
+ 	          $tags['MODERATORS_LABEL'] = $_SESSION['translate']->it('Choose moderators for this forum');
+ 	          $tags['MODERATORS'] = '';
+             // Create a checkbox for every user on the list 
+             $mod_arr = explode(',', $this->_moderators);
+         		while ($row = $eligible_mods->fetchrow(DB_FETCHMODE_ASSOC)) {
+ 	              if(in_array($row['user_id'], $mod_arr))
+   	                $checked = 'checked="checked" ';
+ 	              else
+   	                $checked = '';
+ 	              $tags['MODERATORS'] .= '<label><input name="phpwsBB_moderator[]" value="'.$row['user_id'].'" '.$checked.'type="checkbox"> '.$row['username'].'</label><br />';
+         		}
+         }
  
          if($_SESSION['OBJ_user']->js_on)
***************
*** 293,296 ****
--- 320,328 ----
          }
  
+         if(isset($_POST['phpwsBB_moderator']) && is_array($_POST['phpwsBB_moderator'])) {
+             $this->_moderators = implode(',', $_POST['phpwsBB_moderator']);
+         }
+ 
+ 
          /* Hacks to get around some of Eloi's DDL */
          if (empty($this->_posts))
***************
*** 321,325 ****
                  $_SESSION['OBJ_fatcat']->saveSelect($this->getLabel(), 'index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS=' . $this->getId(), $this->getId());
  
!             $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['PHPWSBB_Manager']->_menu($this) . $_SESSION['translate']->it('Your forum was successfully saved.') . '<br />\n';
              $GLOBALS['CNT_phpwsbb']['content'] .= '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=list">' . $_SESSION['translate']->it('Back to Forums') . '</a>';
  
--- 353,357 ----
                  $_SESSION['OBJ_fatcat']->saveSelect($this->getLabel(), 'index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS=' . $this->getId(), $this->getId());
  
!             $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['PHPWSBB_Manager']->_menu($this) . $_SESSION['translate']->it('Your forum was successfully saved.') . "<br />\n";
              $GLOBALS['CNT_phpwsbb']['content'] .= '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=list">' . $_SESSION['translate']->it('Back to Forums') . '</a>';
  

Index: Manager.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Manager.php	17 Sep 2004 15:53:33 -0000	1.47
--- Manager.php	19 Sep 2004 06:37:00 -0000	1.48
***************
*** 591,595 ****
      */
      function _getUserSettings($id=null) {
!         if(!$_SESSION['OBJ_user']->username || !($id && $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_users'))) {
              $message = $_SESSION['translate']->it('Access to edit settings was denied.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_getSettings()', $message, 'exit', 1);
--- 591,595 ----
      */
      function _getUserSettings($id=null) {
!         if(!$_SESSION['OBJ_user']->username && !($id && $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_users'))) {
              $message = $_SESSION['translate']->it('Access to edit settings was denied.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_getSettings()', $message, 'exit', 1);
***************
*** 899,903 ****
  
          // Create form table to manage user ranking information
!         $tags['RANK_TBL_ROWS'] = '';
          $opts['find'] = array('RANKROW_RANK_ID', 'RANKROW_RANK_TITLE', 'RANKROW_RANK_MIN', 'RANKROW_RANK_SPECIAL');
          foreach ($this->_user_ranks as $rank) {
--- 899,903 ----
  
          // Create form table to manage user ranking information
!         $tags['RANK_SPECIAL_ROWS'] = $tags['RANK_MEMBER_ROWS'] = '';
          $opts['find'] = array('RANKROW_RANK_ID', 'RANKROW_RANK_TITLE', 'RANKROW_RANK_MIN', 'RANKROW_RANK_SPECIAL');
          foreach ($this->_user_ranks as $rank) {
***************
*** 1330,1334 ****
        } elseif(is_array($id) && !empty($id['user_id'])) {
            $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)) {
            // If no record was found, create one
            $result = array();
--- 1330,1334 ----
        } elseif(is_array($id) && !empty($id['user_id'])) {
            $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 ) LEFT JOIN ' . $GLOBALS['core']->tbl_prefix . 'mod_user_uservar AS v ON ( v.user_id = u.user_id AND v.varName="MOD_phpwsbb") WHERE i.user_id = '.$id)) {
            // If no record was found, create one
            $result = array();

[phpwsbb-commits] phpwsbb/templates editforum.tpl,1.3,1.4 view_forum_bottom.tpl,1.1,1.2

[Eloi G. <ada...@us...>]

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

Modified Files:
	editforum.tpl view_forum_bottom.tpl 
Log Message:
Finished forum-specific moderator feature.

Index: editforum.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/editforum.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** editforum.tpl	17 Dec 2003 21:07:59 -0000	1.3
--- editforum.tpl	19 Sep 2004 06:37:01 -0000	1.4
***************
*** 20,23 ****
--- 20,30 ----
  <!-- END CATEGORIES -->
  
+ {S_MODERATORS_LABEL}: {S_MODERATORS}
+ <br />
+ <br />
+ {MODERATORS_LABEL}<br />
+ {MODERATORS}
+ <br />
+ <br />
  
  {FORUM_SAVE}

Index: view_forum_bottom.tpl
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_forum_bottom.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** view_forum_bottom.tpl	13 Aug 2004 21:32:38 -0000	1.1
--- view_forum_bottom.tpl	19 Sep 2004 06:37:01 -0000	1.2
***************
*** 17,18 ****
--- 17,25 ----
    |
  </span>
+ 
+ <!-- BEGIN MOD_LIST -->
+ <br />
+ <div class="smalltext">
+ {MODERATORS_LABEL}: {MODERATORS}
+ </div>
+ <!-- END MOD_LIST -->

[phpwsbb-commits] phpwsbb/conf manager.php,1.13,1.14

[Eloi G. <ada...@us...>]

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

Modified Files:
	manager.php 
Log Message:
Got rid of unneded list element

Index: manager.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/conf/manager.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** manager.php	13 Sep 2004 21:41:55 -0000	1.13
--- manager.php	19 Sep 2004 05:32:41 -0000	1.14
***************
*** 79,83 ****
                              'locked'=>NULL,
                              'lastpost_post_id'=>NULL,
-                             'lastpost_post_owner'=>NULL,
                              'sticky'=>NULL );
  
--- 79,82 ----

[phpwsbb-commits] phpwsbb/class Thread.php,1.58,1.59

[Eloi G. <ada...@us...>]

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

Modified Files:
	Thread.php 
Log Message:
Cleaned up some "undefined variable" errors

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** Thread.php	17 Sep 2004 15:59:59 -0000	1.58
--- Thread.php	19 Sep 2004 05:14:22 -0000	1.59
***************
*** 253,256 ****
--- 253,257 ----
  
          // Need to cycle through all messages and view
+         $content = '';
          foreach($this->messages as $mid) {
              $message = new PHPWSBB_Message($mid, $this->isModerator);

[phpwsbb-commits] phpwsbb/class Message.php,1.64,1.65

[Eloi G. <ada...@us...>]

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

Modified Files:
	Message.php 
Log Message:
Cleaned up some "undefined variable" errors

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** Message.php	17 Sep 2004 15:59:59 -0000	1.64
--- Message.php	19 Sep 2004 03:51:01 -0000	1.65
***************
*** 121,125 ****
          $tags['BG']         = $bg;
          $tags['QUOTE']      = '<img src="./images/phpwsbb/reply_message.png" border="0" alt="' . $_SESSION['translate']->it('Quote this message') . '" title="' . $_SESSION['translate']->it('Quote this message') . '" />&nbsp;' 
!             .PHPWS_Text::moduleLink($_SESSION['translate']->it('Quote'), 'phpwsbb', array('PHPWSBB_MAN_OP'=>reply, 'PHPWS_MAN_ITEMS'=>$this->_tid, 'reply_to'=>$this->getId()));
          $tags['NAV']        = '<a href="#bb-top" class="nav">'.$_SESSION["translate"]->it('Back to top').'</a>';
          $tags['ID']         = $this->getId();
--- 121,125 ----
          $tags['BG']         = $bg;
          $tags['QUOTE']      = '<img src="./images/phpwsbb/reply_message.png" border="0" alt="' . $_SESSION['translate']->it('Quote this message') . '" title="' . $_SESSION['translate']->it('Quote this message') . '" />&nbsp;' 
!             .PHPWS_Text::moduleLink($_SESSION['translate']->it('Quote'), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'reply', 'PHPWS_MAN_ITEMS'=>$this->_tid, 'reply_to'=>$this->getId()));
          $tags['NAV']        = '<a href="#bb-top" class="nav">'.$_SESSION["translate"]->it('Back to top').'</a>';
          $tags['ID']         = $this->getId();
***************
*** 308,312 ****
              if (is_null($poster))   
                  $poster = $result['guestname'] . ' (' . $_SESSION['translate']->it('GUEST') . ')';
!             $this->_body = '&#013;[quote="'.$poster.'"]'.trim($result['body']).'&#013;[/quote]&#013;&#013;';
          }
          $form->add('Message_body', 'textarea', $this->_body);
--- 308,312 ----
              if (is_null($poster))   
                  $poster = $result['guestname'] . ' (' . $_SESSION['translate']->it('GUEST') . ')';
!             $this->_body = '[quote="'.$poster.'"]'.trim($result['body'])."\n[/quote]\n\n";
          }
          $form->add('Message_body', 'textarea', $this->_body);

[phpwsbb-commits] phpwsbb/docs ChangeLog,1.114,1.115

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

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

Modified Files:
	ChangeLog 
Log Message:
RFE #1029852: Using unordered list for blocks

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/docs/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** ChangeLog	13 Sep 2004 21:41:56 -0000	1.114
--- ChangeLog	17 Sep 2004 17:15:05 -0000	1.115
***************
*** 2,5 ****
--- 2,8 ----
  # $Id$
  
+     17 Sep 2004; Don Seiler <do...@NO...>
+     RFE #1029852: Using unordered list in blocks
+ 
      13 Sep 2004; Don Seiler <do...@NO...>
      PATCH #1002850: Patch from Eloi that changes everything.

[phpwsbb-commits] phpwsbb/class Runtime.php,1.12,1.13

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

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

Modified Files:
	Runtime.php 
Log Message:
RFE #1029852: Using unordered list for blocks

Index: Runtime.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Runtime.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Runtime.php	13 Sep 2004 21:41:55 -0000	1.12
--- Runtime.php	17 Sep 2004 17:15:05 -0000	1.13
***************
*** 55,62 ****
              $result = $GLOBALS['core']->sqlSelect('mod_phpwsbb_forums', 'hidden', 0, 'sortorder');
              if($result) {
                  foreach($result as $row) {
                      $forum = new PHPWSBB_Forum($row);
!                     $block .= PHPWS_Text::moduleLink($forum->getLabel(), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())).'<br />';
                  }
              }
      
--- 55,65 ----
              $result = $GLOBALS['core']->sqlSelect('mod_phpwsbb_forums', 'hidden', 0, 'sortorder');
              if($result) {
+                 $block .= '<ul>';
                  foreach($result as $row) {
                      $forum = new PHPWSBB_Forum($row);
!                     //$block .= PHPWS_Text::moduleLink($forum->getLabel(), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())).'<br />';
!                     $block .= '<li>' . PHPWS_Text::moduleLink($forum->getLabel(), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$forum->getId())) . '</li>';
                  }
+                 $block .= '</ul>';
              }
      
***************
*** 94,97 ****
--- 97,101 ----
              $result = $GLOBALS['core']->sqlSelect('mod_phpwsbb_threads', 'hidden', 0, 'lastpost DESC');
              if($result) {
+                 $block .= '<ul>';
                  foreach($result as $row) {
                      if($c > $maxlatestthreads)
***************
*** 102,108 ****
                      else
                          $lbl = $thread->getLabel();
!                     $block .= PHPWS_Text::moduleLink($lbl, 'phpwsbb', array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$thread->getId())).'<br />';
                      $c++;
                  }
              }
      
--- 106,114 ----
                      else
                          $lbl = $thread->getLabel();
!                     //$block .= PHPWS_Text::moduleLink($lbl, 'phpwsbb', array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$thread->getId())).'<br />';
!                     $block .= '<li>' . PHPWS_Text::moduleLink($lbl, 'phpwsbb', array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$thread->getId())) . '</li>';
                      $c++;
                  }
+                 $block .= '</ul>';
              }
      

[phpwsbb-commits] phpwsbb/class Forum.php,1.28,1.29 Message.php,1.63,1.64 Thread.php,1.57,1.58

[Eloi G. <ada...@us...>]

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

Modified Files:
	Forum.php Message.php Thread.php 
Log Message:
Enabled forum-specific moderators.  Not finished.  Deities and SuperModerators ("edit_forums"==true) are activated, but I still need to code an interface for selecting regular moderators.

Index: Thread.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** Thread.php	15 Sep 2004 20:22:17 -0000	1.57
--- Thread.php	17 Sep 2004 15:59:59 -0000	1.58
***************
*** 114,120 ****
      var $forumlabel = FALSE;
  
      function PHPWSBB_Thread($THREAD_ID = NULL) {
          /* These variable are excluded when calling commit() */
!         $exclude = array('messages', 'monitored', 'forumlabel');
          $this->addExclude($exclude);
  
--- 114,129 ----
      var $forumlabel = FALSE;
  
+ 
+     /**
+      * Forum Moderator flag
+      *
+      * @var      bool
+      * @access   private
+      */
+     var $isModerator = FALSE;
+ 
      function PHPWSBB_Thread($THREAD_ID = NULL) {
          /* These variable are excluded when calling commit() */
!         $exclude = array('messages', 'monitored', 'forumlabel', 'isModerator');
          $this->addExclude($exclude);
  
***************
*** 123,145 ****
  
          /* Populate this object if ID exists */
!         if (is_numeric($THREAD_ID)) {
!             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();
!                 if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads'))
!                     $sql .= ' AND hidden=0';
!                 $sql .= ' ORDER BY created';
!                 $this->messages = $GLOBALS['core']->getCol($sql);
!     
!                 // Monitor stuff
!                 if ($_SESSION['PHPWSBB_Manager']->_allow_user_monitors) {
!                     if (!empty($_SESSION['OBJ_user']->user_id)) {
!                         $data = array();
!                         $data['thread_id'] = $this->getId();
!                         $data['user_id'] = $_SESSION['OBJ_user']->user_id;
!                         if ($test_sql = $GLOBALS['core']->sqlSelect('mod_phpwsbb_monitors',$data))
!                             $this->monitored = TRUE;
!                     }
                  }
              }
--- 132,160 ----
  
          /* Populate this object if ID exists */
!         if (isset($THREAD_ID) && is_numeric($THREAD_ID)) {
!             $this->setId($THREAD_ID);
!             $this->init();
! 
!             if (isset($this->_fid)) {
!                 $f = new PHPWSBB_Forum($this->_fid);
!                 $this->forumlabel = $f->getLabel();
!                 $this->isModerator = $f->isModerator;
!                 $f = NULL;
!             }
! 
!             $sql = 'SELECT id FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_phpwsbb_messages WHERE tid=' . $this->getId();
!             if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator)
!                 $sql .= ' AND hidden=0';
!             $sql .= ' ORDER BY created';
!             $this->messages = $GLOBALS['core']->getCol($sql);
! 
!             // Monitor stuff
!             if ($_SESSION['PHPWSBB_Manager']->_allow_user_monitors) {
!                 if (!empty($_SESSION['OBJ_user']->user_id)) {
!                     $data = array();
!                     $data['thread_id'] = $this->getId();
!                     $data['user_id'] = $_SESSION['OBJ_user']->user_id;
!                     if ($test_sql = $GLOBALS['core']->sqlSelect('mod_phpwsbb_monitors',$data))
!                         $this->monitored = TRUE;
                  }
              }
***************
*** 147,162 ****
              $this->init($THREAD_ID);
          }
- 
-         if (isset($this->_fid)) {
-             $f = new PHPWSBB_Forum($this->_fid);
-             $this->forumlabel = $f->getLabel();
-             $f = NULL;
-         }
- 
      }// END FUNC PHPWSBB_Thread
  
  
      function _view($ro = FALSE) {
!         if ($this->isHidden() && !$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads')) {
              $content = '<div class="errortext">' . $_SESSION['translate']->it('There is nothing here to see.') . '</div>';
              return $content;
--- 162,170 ----
              $this->init($THREAD_ID);
          }
      }// END FUNC PHPWSBB_Thread
  
  
      function _view($ro = FALSE) {
!         if ($this->isHidden() && !$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator) {
              $content = '<div class="errortext">' . $_SESSION['translate']->it('There is nothing here to see.') . '</div>';
              return $content;
***************
*** 165,169 ****
          if (count($this->messages) == 0) {
              $content = '<div class="errortext">' . $_SESSION['translate']->it('This topic has no messages.') . '</div>';
!             if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads'))
                  $content .= '<br /><a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=delete&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '">' . $_SESSION['translate']->it('Delete Topic') . '</a>';
              return $content;
--- 173,177 ----
          if (count($this->messages) == 0) {
              $content = '<div class="errortext">' . $_SESSION['translate']->it('This topic has no messages.') . '</div>';
!             if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads') && $this->isModerator)
                  $content .= '<br /><a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=delete&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '">' . $_SESSION['translate']->it('Delete Topic') . '</a>';
              return $content;
***************
*** 188,192 ****
          if (!$ro) {
              $tags['REPLY']      = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=reply&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/reply_message.png" border="0" alt="' . $_SESSION['translate']->it('Reply') . '" title="' . $_SESSION['translate']->it('Reply') . '" />&nbsp;' . $_SESSION['translate']->it('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() . '"><img src="./images/phpwsbb/unlocked.png" border="0" alt="' . $_SESSION['translate']->it('Unlock Topic') . '" title="' . $_SESSION['translate']->it('Unlock Topic') . '" />&nbsp;' . $_SESSION['translate']->it('Unlock Topic') . '</a>';
--- 196,200 ----
          if (!$ro) {
              $tags['REPLY']      = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=reply&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/reply_message.png" border="0" alt="' . $_SESSION['translate']->it('Reply') . '" title="' . $_SESSION['translate']->it('Reply') . '" />&nbsp;' . $_SESSION['translate']->it('Reply') . '</a>';
!             if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'lock_threads') && $this->isModerator) {
                  if ($this->_locked)
                      $tags['LOCK']   = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=unlock&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/unlocked.png" border="0" alt="' . $_SESSION['translate']->it('Unlock Topic') . '" title="' . $_SESSION['translate']->it('Unlock Topic') . '" />&nbsp;' . $_SESSION['translate']->it('Unlock Topic') . '</a>';
***************
*** 195,199 ****
              }
  
!             if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'move_threads')) {
                  // Need drop-down of forums
                  $forums = array();
--- 203,207 ----
              }
  
!             if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'move_threads') && $this->isModerator) {
                  // Need drop-down of forums
                  $forums = array();
***************
*** 218,225 ****
              }
  
!             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() . '"><img src="./images/phpwsbb/delete.png" border="0" alt="' . $_SESSION['translate']->it('Delete Topic') . '" title="' . $_SESSION['translate']->it('Delete Topic') . '" />&nbsp;' . $_SESSION['translate']->it('Delete Topic') . '</a>';
  
!             if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads')) {
                  if ($this->isHidden())
                      $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=showthread&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Show Topic') . '" title="' . $_SESSION['translate']->it('Show Topic') . '" />&nbsp;' . $_SESSION['translate']->it('Show Topic') . '</a>';
--- 226,233 ----
              }
  
!             if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads') && $this->isModerator)
                  $tags['DELETE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=delete&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/delete.png" border="0" alt="' . $_SESSION['translate']->it('Delete Topic') . '" title="' . $_SESSION['translate']->it('Delete Topic') . '" />&nbsp;' . $_SESSION['translate']->it('Delete Topic') . '</a>';
  
!             if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator) {
                  if ($this->isHidden())
                      $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=showthread&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Show Topic') . '" title="' . $_SESSION['translate']->it('Show Topic') . '" />&nbsp;' . $_SESSION['translate']->it('Show Topic') . '</a>';
***************
*** 228,232 ****
              }
  
!             if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'sticky_threads')) {
                  if ($this->_sticky)
                      $tags['STICKY']   = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=unstick&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/sticky.png" border="0" alt="' . $_SESSION['translate']->it('Unstick Topic') . '" title="' . $_SESSION['translate']->it('Unstick Topic') . '" />&nbsp;' . $_SESSION['translate']->it('Unstick Topic') . '</a>';
--- 236,240 ----
              }
  
!             if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'sticky_threads') && $this->isModerator) {
                  if ($this->_sticky)
                      $tags['STICKY']   = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=unstick&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/sticky.png" border="0" alt="' . $_SESSION['translate']->it('Unstick Topic') . '" title="' . $_SESSION['translate']->it('Unstick Topic') . '" />&nbsp;' . $_SESSION['translate']->it('Unstick Topic') . '</a>';
***************
*** 246,250 ****
          // Need to cycle through all messages and view
          foreach($this->messages as $mid) {
!             $message = new PHPWSBB_Message($mid);
            	PHPWS_WizardBag::toggle($bg, ' class="bg_light"');
              $content .= $message->_view($bg);
--- 254,258 ----
          // Need to cycle through all messages and view
          foreach($this->messages as $mid) {
!             $message = new PHPWSBB_Message($mid, $this->isModerator);
            	PHPWS_WizardBag::toggle($bg, ' class="bg_light"');
              $content .= $message->_view($bg);
***************
*** 349,353 ****
  
      function _delete() {
!         if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads')) {
              $message = $_SESSION['translate']->it('Access to delete this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_delete()', $message, 'exit', 1);
--- 357,361 ----
  
      function _delete() {
!         if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_threads') && $this->isModerator) {
              $message = $_SESSION['translate']->it('Access to delete this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_delete()', $message, 'exit', 1);
***************
*** 401,405 ****
  
      function _lock($unlock = FALSE) {
!         if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'lock_threads')) {
              $message = $_SESSION['translate']->it('Access to lock this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_lock()', $message, 'exit', 1);
--- 409,413 ----
  
      function _lock($unlock = FALSE) {
!         if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'lock_threads') && $this->isModerator) {
              $message = $_SESSION['translate']->it('Access to lock this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_lock()', $message, 'exit', 1);
***************
*** 443,447 ****
  
      function _stick($unstick = FALSE) {
!         if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'sticky_threads')) {
              $message = $_SESSION['translate']->it('Access to stick this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_stock()', $message, 'exit', 1);
--- 451,455 ----
  
      function _stick($unstick = FALSE) {
!         if (!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'sticky_threads') && $this->isModerator) {
              $message = $_SESSION['translate']->it('Access to stick this topic was denied due to lack of proper permissions.');
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Thread::_stock()', $message, 'exit', 1);

Index: Message.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** Message.php	14 Sep 2004 04:13:46 -0000	1.63
--- Message.php	17 Sep 2004 15:59:59 -0000	1.64
***************
*** 79,82 ****
--- 79,90 ----
      var $_body = NULL;
  
+     /**
+      * Forum Moderator flag
+      *
+      * @var      bool
+      * @access   private
+      */
+     var $isModerator = FALSE;
+ 
  
      /**
***************
*** 85,92 ****
       * @param int $MESSAGE_ID optional
       */
!     function PHPWSBB_Message($MESSAGE_ID = NULL) {
          /* These variable are excluded when calling commit() */
!         //$exclude = array('children');
!         //$this->addExclude($exclude);
  
          /* Set database table */
--- 93,100 ----
       * @param int $MESSAGE_ID optional
       */
!     function PHPWSBB_Message($MESSAGE_ID = NULL, $isModerator=FALSE) {
          /* These variable are excluded when calling commit() */
!         $exclude = array('isModerator');
!         $this->addExclude($exclude);
  
          /* Set database table */
***************
*** 98,101 ****
--- 106,110 ----
              $this->init();
          }
+         $this->isModerator = $isModerator;
  
      }// END FUNC PHPWSBB_Message
***************
*** 151,158 ****
                      $contact = new CONTACTS_Contact($results[0]);
                      $poster = '<a href="index.php?module=phpwscontacts&amp;CONTACTS_MAN_OP=view&amp;PHPWS_MAN_ITEMS[]=' . $contact->getId() . '">' . $contact->getListFirstName() . ' ' . $contact->getListLastName() . '</a>';
- /*eloi:RFE-CONTACTS:  This generates an extra query for every message shown -- not 
- good if you have a popular site on a shared server.  phpwscontacts should allow 
- contacts to be linked to by username or userid, not an unknown identifier that 
- has to be queried for beforehand. */
                  }
              }
--- 160,163 ----
***************
*** 166,176 ****
              $tags['EDITED'] = $_SESSION['translate']->it('Edited by [var1] on [var2]', $this->getEditor(), $this->getUpdated());
  
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') || ($this->getOwner() && ($_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() . '"><img src="./images/phpwsbb/edit.png" border="0" alt="' . $_SESSION['translate']->it('Edit') . '" title="' . $_SESSION['translate']->it('Edit') . '" />&nbsp;' . $_SESSION['translate']->it('Edit') . '</a>';
  
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_messages') || ($this->getOwner() && ($_SESSION['OBJ_user']->username == $this->getOwner())))
              $tags['DELETE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=deletemessage&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/delete.png" border="0" alt="' . $_SESSION['translate']->it('Delete') . '" title="' . $_SESSION['translate']->it('Delete') . '" />&nbsp;' . $_SESSION['translate']->it('Delete') . '</a>';
  
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_messages')) {
              if ($this->isHidden())
                  $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=showmessage&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Show Message') . '" title="' . $_SESSION['translate']->it("Show Message") . '" />&nbsp;' . $_SESSION['translate']->it('Show Message') . '</a>';
--- 171,181 ----
              $tags['EDITED'] = $_SESSION['translate']->it('Edited by [var1] on [var2]', $this->getEditor(), $this->getUpdated());
  
!         if (($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && $this->isModerator) || ($this->getOwner() && ($_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() . '"><img src="./images/phpwsbb/edit.png" border="0" alt="' . $_SESSION['translate']->it('Edit') . '" title="' . $_SESSION['translate']->it('Edit') . '" />&nbsp;' . $_SESSION['translate']->it('Edit') . '</a>';
  
!         if (($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_messages') && $this->isModerator) || ($this->getOwner() && ($_SESSION['OBJ_user']->username == $this->getOwner())))
              $tags['DELETE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=deletemessage&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/delete.png" border="0" alt="' . $_SESSION['translate']->it('Delete') . '" title="' . $_SESSION['translate']->it('Delete') . '" />&nbsp;' . $_SESSION['translate']->it('Delete') . '</a>';
  
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_messages') && $this->isModerator) {
              if ($this->isHidden())
                  $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=showmessage&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Show Message') . '" title="' . $_SESSION['translate']->it("Show Message") . '" />&nbsp;' . $_SESSION['translate']->it('Show Message') . '</a>';
***************
*** 180,192 ****
  
  
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'fork_messages'))
              $tags['FORK'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=fork&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/fork.png" border="0" alt="' . $_SESSION['translate']->it('Fork') . '" title="' . $_SESSION['translate']->it('Fork') . '" />&nbsp;' . $_SESSION['translate']->it('Fork') . '</a>';
  
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'view_ips')) {
              $tags['IP_TEXT'] = $_SESSION['translate']->it('IP Address');
              $tags['IPADDR'] = $this->getIp();
          }
  
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'ban')) {
              $match = array('ip'=>$this->getIp(),'username'=>$this->getOwner());
              $results = $GLOBALS['core']->sqlSelect('mod_phpwsbb_banned',$match,NULL,NULL,NULL,'or');
--- 185,200 ----
  
  
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'fork_messages') && $this->isModerator)
              $tags['FORK'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=fork&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/fork.png" border="0" alt="' . $_SESSION['translate']->it('Fork') . '" title="' . $_SESSION['translate']->it('Fork') . '" />&nbsp;' . $_SESSION['translate']->it('Fork') . '</a>';
  
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'view_ips') && $this->isModerator) {
              $tags['IP_TEXT'] = $_SESSION['translate']->it('IP Address');
              $tags['IPADDR'] = $this->getIp();
          }
  
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_users')) 
!             $tags['EDIT_USER'] = ' <a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=usersettings&amp;user=' . $this->_owner_id . '">' . $_SESSION['translate']->it('Edit [var1]', $this->getOwner()) . '</a>';
! 
!         if ($_SESSION['OBJ_user']->allow_access('phpwsbb', 'ban') && $this->isModerator) {
              $match = array('ip'=>$this->getIp(),'username'=>$this->getOwner());
              $results = $GLOBALS['core']->sqlSelect('mod_phpwsbb_banned',$match,NULL,NULL,NULL,'or');
***************
*** 202,218 ****
  
                  if ($ib)
!                     $tags['BAN_IP'] = ' <a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=unbanip&amp;PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ok.png" border="0" alt="' . $_SESSION['translate']->it('Unban IP') . '" title="' . $_SESSION['translate']->it('Unban IP') . '" />&nbsp;' . $_SESSION['translate']->it('Allow [var1] (Banned)', $this->getIp()) . '</a>';
                  else
!                     $tags['BAN_IP'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=banip&amp;PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban IP') . '" title="' . $_SESSION['translate']->it('Ban IP') . '" />&nbsp;' . $_SESSION['translate']->it('Ban [var1]', $this->getIp()) . '</a>';
  
                  if ($this->getOwner())
                      if ($ub)
!                         $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=unbanusername&amp;PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ok.png" border="0" alt="' . $_SESSION['translate']->it('Unban Poster') . '" title="' . $_SESSION['translate']->it('Unban Poster') . '" />&nbsp;' . $_SESSION['translate']->it('Allow [var1] (Banned)', $this->getOwner()) . '</a>';
                      else
!                         $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=banusername&amp;PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban Poster') . '" title="' . $_SESSION['translate']->it('Ban Poster') . '" />&nbsp;' . $_SESSION['translate']->it('Ban [var1]', $this->getOwner()) . '</a>';
              } else {
!                 $tags['BAN_IP'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=banip&amp;PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban IP') . '" title="' . $_SESSION['translate']->it('Ban IP') . '" />&nbsp;' . $_SESSION['translate']->it('Ban [var1]', $this->getIp()) . '</a>';
                  if ($this->getOwner())
!                     $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=banusername&amp;PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban Poster') . '" title="' . $_SESSION['translate']->it('Ban Poster') . '" />&nbsp;' . $_SESSION['translate']->it('Ban [var1]', $this->getOwner()) . '</a>';
              }
          }
--- 210,227 ----
  
                  if ($ib)
!                     $tags['BAN_IP'] = ' <a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=unbanip&amp;PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ok.png" border="0" alt="' . $_SESSION['translate']->it('Unban this IP') . '" title="' . $_SESSION['translate']->it('Unban this IP') . '" />&nbsp;' . $_SESSION['translate']->it('Unban this IP') . '</a>';
                  else
!                     $tags['BAN_IP'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=banip&amp;PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban this IP') . '" title="' . $_SESSION['translate']->it('Ban this IP') . '" />&nbsp;' . $_SESSION['translate']->it('Ban this IP') . '</a>';
  
                  if ($this->getOwner())
                      if ($ub)
!                         $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=unbanusername&amp;PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ok.png" border="0" alt="' . $_SESSION['translate']->it('Unban this Poster') . '" title="' . $_SESSION['translate']->it('Unban this Poster') . '" />&nbsp;' . $_SESSION['translate']->it('Allow [var1] (Banned)', $this->getOwner()) . '</a>';
                      else
!                         $opt .= '<option value="banusername"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban this Poster') . '" title="' . $_SESSION['translate']->it('Ban this Poster') . '" />&nbsp;' . $_SESSION['translate']->it('Ban [var1]', $this->getOwner()).'</option>';
!                         $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=banusername&amp;PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban this Poster') . '" title="' . $_SESSION['translate']->it('Ban this Poster') . '" />&nbsp;' . $_SESSION['translate']->it('Ban [var1]', $this->getOwner()) . '</a>';
              } else {
!                 $tags['BAN_IP'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=banip&amp;PHPWS_MAN_ITEMS[]=' . $this->getIp() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban this IP') . '" title="' . $_SESSION['translate']->it('Ban this IP') . '" />&nbsp;' . $_SESSION['translate']->it('Ban this IP') . '</a>';
                  if ($this->getOwner())
!                     $tags['BAN_USERNAME'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=banusername&amp;PHPWS_MAN_ITEMS[]=' . $this->getOwner() . '"><img src="./images/phpwsbb/ban.png" border="0" alt="' . $_SESSION['translate']->it('Ban this Poster') . '" title="' . $_SESSION['translate']->it('Ban this Poster') . '" />&nbsp;' . $_SESSION['translate']->it('Ban [var1]', $this->getOwner()) . '</a>';
              }
          }
***************
*** 227,231 ****
       */
      function _edit() {
!         if (!empty($this->_id) && !$_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && ($_SESSION['OBJ_user']->username != $this->getOwner())) {
              $message = $_SESSION['translate']->it('Access to edit message [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Message::_edit()', $message, 'exit', 1);
--- 236,240 ----
       */
      function _edit() {
!         if (!empty($this->_id) && !($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && $this->isModerator) && ($_SESSION['OBJ_user']->username != $this->getOwner())) {
              $message = $_SESSION['translate']->it('Access to edit message [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Message::_edit()', $message, 'exit', 1);
***************
*** 295,303 ****
          // If this is a reply to a specific message, quote it
          if (isset($_REQUEST['reply_to']) && is_numeric($_REQUEST['reply_to'])) {
!           $result = $GLOBALS['core']->quickFetch('SELECT owner,guestname,body FROM mod_phpwsbb_messages WHERE id='.$_REQUEST['reply_to'], true);
!           $poster = $result['owner'];
!           if (is_null($poster))   
!               $poster = $result['guestname'] . ' (' . $_SESSION['translate']->it('GUEST') . ')';
!           $this->_body = '&#013;[quote="'.$poster.'"]'.trim($result['body']).'&#013;[/quote]&#013;&#013;';
          }
          $form->add('Message_body', 'textarea', $this->_body);
--- 304,312 ----
          // If this is a reply to a specific message, quote it
          if (isset($_REQUEST['reply_to']) && is_numeric($_REQUEST['reply_to'])) {
!             $result = $GLOBALS['core']->quickFetch('SELECT owner,guestname,body FROM mod_phpwsbb_messages WHERE id='.$_REQUEST['reply_to'], true);
!             $poster = $result['owner'];
!             if (is_null($poster))   
!                 $poster = $result['guestname'] . ' (' . $_SESSION['translate']->it('GUEST') . ')';
!             $this->_body = '&#013;[quote="'.$poster.'"]'.trim($result['body']).'&#013;[/quote]&#013;&#013;';
          }
          $form->add('Message_body', 'textarea', $this->_body);
***************
*** 350,354 ****
       */
      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 [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_accessDenied()', $message, 'exit', 1);
--- 359,363 ----
       */
      function _save() {
!         if (!empty($this->_id) && !($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && $this->isModerator) && ($_SESSION['OBJ_user']->username != $this->getOwner())) {
              $message = $_SESSION['translate']->it('Access to save message [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_accessDenied()', $message, 'exit', 1);
***************
*** 481,485 ****
       */
      function _fork() {
!         if (!empty($this->_id) && !$_SESSION['OBJ_user']->allow_access('phpwsbb', 'fork_messages')) {
              $message = $_SESSION['translate']->it('Access to fork message [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_accessDenied()', $message, 'exit', 1);
--- 490,494 ----
       */
      function _fork() {
!         if (!empty($this->_id) && !($_SESSION['OBJ_user']->allow_access('phpwsbb', 'fork_messages') && $this->isModerator)) {
              $message = $_SESSION['translate']->it('Access to fork message [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_accessDenied()', $message, 'exit', 1);
***************
*** 527,531 ****
       */
      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 PHPWS_Error('phpwsbb', 'PHPWSBB_Message::_delete()', $message, 'exit', 1);
--- 536,540 ----
       */
      function _delete() {
!         if (!($_SESSION['OBJ_user']->allow_access('phpwsbb', 'delete_messages') && $this->isModerator) && ($_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 PHPWS_Error('phpwsbb', 'PHPWSBB_Message::_delete()', $message, 'exit', 1);

Index: Forum.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Forum.php	13 Sep 2004 21:41:55 -0000	1.28
--- Forum.php	17 Sep 2004 15:59:59 -0000	1.29
***************
*** 103,110 ****
      var $_lastpost_post_id;
  
      function PHPWSBB_Forum($FORUM_ID = NULL) {
          /* These variable are excluded when calling commit() */
!         //$exclude = array('threads');
!         //$this->addExclude($exclude);
  
          /* Set database table */
--- 103,126 ----
      var $_lastpost_post_id;
  
+     /**
+     * IDs of this forum's moderators (separated by commas)
+     *
+     * @var      string
+     * @access   private
+     */
+     var $_moderators;
+ 
+     /**
+      * Forum Moderator flag
+      *
+      * @var      bool
+      * @access   public
+      */
+     var $isModerator = FALSE;
+ 
      function PHPWSBB_Forum($FORUM_ID = NULL) {
          /* These variable are excluded when calling commit() */
!         $exclude = array('isModerator');
!         $this->addExclude($exclude);
  
          /* Set database table */
***************
*** 120,123 ****
--- 136,145 ----
              $this->init($FORUM_ID);
          }
+ 
+ //        $tmp = $GLOBALS['core']->getCol('SELECT username FROM mod_users WHERE user_id IN ('.$this->_moderators.')', TRUE);
+ //        $this->moderator_names = implode(',', $moderator_names);
+         /* To perform a moderation action, user must either be a moderator of this forum or be able to edit forums (supermoderator) */
+         $this->isModerator = $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_forums')
+             || ($_SESSION['OBJ_user']->user_id && !empty($this->_moderators) && in_array($_SESSION['OBJ_user']->user_id, explode(',', $this->_moderators)));
      }// END FUNC PHPWSBB_Forum
  
***************
*** 164,168 ****
                  $tags['DELETE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=deleteforum&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/delete.png" border="0" alt="' . $_SESSION['translate']->it('Delete Forum') . '" title="' . $_SESSION['translate']->it('Delete Forum') . '" />&nbsp;' . $_SESSION['translate']->it('Delete Forum') . '</a>';
  
!             if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads')) {
                  if($this->isHidden())
                      $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=showforum&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Show Forum') . '" title="' . $_SESSION['translate']->it('Show Forum') . '" />&nbsp;' . $_SESSION['translate']->it('Show Forum') . '</a>';
--- 186,190 ----
                  $tags['DELETE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=deleteforum&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/delete.png" border="0" alt="' . $_SESSION['translate']->it('Delete Forum') . '" title="' . $_SESSION['translate']->it('Delete Forum') . '" />&nbsp;' . $_SESSION['translate']->it('Delete Forum') . '</a>';
  
!             if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads') && $this->isModerator) {
                  if($this->isHidden())
                      $tags['HIDE'] = '<a href="./index.php?module=phpwsbb&amp;PHPWSBB_MAN_OP=showforum&amp;PHPWS_MAN_ITEMS[]=' . $this->getId() . '"><img src="./images/phpwsbb/hideshow.png" border="0" alt="' . $_SESSION['translate']->it('Show Forum') . '" title="' . $_SESSION['translate']->it('Show Forum') . '" />&nbsp;' . $_SESSION['translate']->it('Show Forum') . '</a>';
***************
*** 247,251 ****
  
      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 [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_accessDenied()', $message, 'exit', 1);
--- 269,273 ----
  
      function _save() {
!         if(!empty($this->_id) && !($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_messages') && $this->isModerator) && ($_SESSION['OBJ_user']->username != $this->getOwner())) {
              $message = $_SESSION['translate']->it('Access to save message [var1] was denied due to lack of proper permissions.', $this->_id);
              $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_accessDenied()', $message, 'exit', 1);
***************
*** 445,448 ****
      }// END FUNC getLastPost
  
- 
  }// END CLASS PHPWSBB_Forum
--- 467,469 ----

[phpwsbb-commits] phpwsbb/boost install.sql,1.18,1.19 update.php,1.39,1.40

[Eloi G. <ada...@us...>]

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

Modified Files:
	install.sql update.php 
Log Message:
Added field to track forum-specific moderators

Index: install.sql
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.sql,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** install.sql	13 Sep 2004 19:48:23 -0000	1.18
--- install.sql	17 Sep 2004 15:56:35 -0000	1.19
***************
*** 20,23 ****
--- 20,24 ----
      lastpost_topic_id     int NOT NULL default '0',
      lastpost_post_id      int NOT NULL default '0',
+     moderators  varchar(40) NOT NULL default '',
      PRIMARY KEY (id)
  );

Index: update.php
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** update.php	13 Sep 2004 21:41:54 -0000	1.39
--- update.php	17 Sep 2004 15:56:36 -0000	1.40
***************
*** 290,294 ****
  
      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);
--- 290,294 ----
  
      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", ADD moderators varchar(40) NOT NULL default ""', TRUE)) {
              $sql = 'SELECT id FROM mod_phpwsbb_threads';
              $result = $GLOBALS['core']->getCol($sql,TRUE);

[phpwsbb-commits] phpwsbb/lang phpwsbb.en.lng,1.18,1.19

[Eloi G. <ada...@us...>]

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

Modified Files:
	phpwsbb.en.lng 
Log Message:
Allowed admins to edit other user's settings through an option on the message display.

Index: phpwsbb.en.lng
===================================================================
RCS file: /cvsroot/phpwsbb/phpwsbb/lang/phpwsbb.en.lng,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** phpwsbb.en.lng	15 Sep 2004 18:50:29 -0000	1.18
--- phpwsbb.en.lng	17 Sep 2004 15:53:34 -0000	1.19
***************
*** 1,4 ****
  en:|:phpwsbb
- a:|:A Remote Avatar is currently selected:|:A Remote Avatar is currently selected
  a:|:Access to ban IP addresses was denied due to lack of proper permissions.:|:Access to ban IP addresses was denied due to lack of proper permissions.
  a:|:Access to ban usernames was denied due to lack of proper permissions.:|:Access to ban usernames was denied due to lack of proper permissions.
--- 1,3 ----
***************
*** 11,28 ****
  a:|:Access to update topics was denied due to lack of proper permissions.:|:Access to update topics was denied due to lack of proper permissions.
  a:|:Access was denied due to lack of proper permissions.:|:Access was denied due to lack of proper permissions.
- a:|:Add a new rank by entering its information here.:|:Add a new rank by entering its information here.
  a:|:Add Forum:|:Add Forum
  a:|:Add/Edit Forum:|:Add/Edit Forum
- a:|:All user post counts have been reset.:|:All user post counts have been reset.
  a:|:Allow Anonymous Posts:|:Allow Anonymous Posts
  a:|:Allow Anonymous Viewing of Posts:|:Allow Anonymous Viewing of Posts
  a:|:Allow User Monitors:|:Allow User Monitors
- a:|:Allow user-created Signatures to be displayed in messages:|:Allow user-created Signatures to be displayed in messages
- a:|:Allow user-selected Avatar URLs to be displayed in messages:|:Allow user-selected Avatar URLs to be displayed in messages
- a:|:Allow user-selected Avatars to be displayed in messages:|:Allow user-selected Avatars to be displayed in messages
  a:|:Anchor (href) tags are not allowed in the message subject.:|:Anchor (href) tags are not allowed in the message subject.
  a:|:Anonymous Posting Denied:|:Anonymous Posting Denied
- a:|:Anonymous posting to this bulletin board has been disabled.  You must log-in to post to this bulletin board.:|:Anonymous posting to this bulletin board has been disabled.  You must log-in to post to this bulletin board.
  a:|:Anonymous Viewing Denied:|:Anonymous Viewing Denied
  a:|:Anonymous viewing of this bulletin board has been disabled.  You must log-in to view this bulletin board.:|:Anonymous viewing of this bulletin board has been disabled.  You must log-in to view this bulletin board.
  a:|:Are you sure you want to clear ALL of your monitors?:|:Are you sure you want to clear ALL of your monitors?
--- 10,22 ----
  a:|:Access to update topics was denied due to lack of proper permissions.:|:Access to update topics was denied due to lack of proper permissions.
  a:|:Access was denied due to lack of proper permissions.:|:Access was denied due to lack of proper permissions.
  a:|:Add Forum:|:Add Forum
  a:|:Add/Edit Forum:|:Add/Edit Forum
  a:|:Allow Anonymous Posts:|:Allow Anonymous Posts
  a:|:Allow Anonymous Viewing of Posts:|:Allow Anonymous Viewing of Posts
  a:|:Allow User Monitors:|:Allow User Monitors
  a:|:Anchor (href) tags are not allowed in the message subject.:|:Anchor (href) tags are not allowed in the message subject.
  a:|:Anonymous Posting Denied:|:Anonymous Posting Denied
  a:|:Anonymous Viewing Denied:|:Anonymous Viewing Denied
+ a:|:Anonymous posting to this bulletin board has been disabled.  You must log-in to post to this bulletin board.:|:Anonymous posting to this bulletin board has been disabled.  You must log-in to post to this bulletin board.
  a:|:Anonymous viewing of this bulletin board has been disabled.  You must log-in to view this bulletin board.:|:Anonymous viewing of this bulletin board has been disabled.  You must log-in to view this bulletin board.
  a:|:Are you sure you want to clear ALL of your monitors?:|:Are you sure you want to clear ALL of your monitors?
***************
*** 30,75 ****
  a:|:Are you sure you want to delete this message?:|:Are you sure you want to delete this message?
  a:|:Are you sure you want to delete this topic?:|:Are you sure you want to delete this topic?
- a:|:AUTHOR:|:AUTHOR
  a:|:Automatically monitor threads you post to?:|:Automatically monitor threads you post to?
- a:|:Avatar Control Panel:|:Avatar Control Panel
- a:|:Back to Forum:|:Back to Forum
  a:|:Back to Forums:|:Back to Forums
  a:|:Back to the topic.:|:Back to the topic.
- a:|:Back to top:|:Back to top
  a:|:Body:|:Body
! a:|:Bulletin Board Admin Email:|:Bulletin Board Admin Email
  a:|:Bulletin Board Admin:|:Bulletin Board Admin
  a:|:Bulletin Board Forums:|:Bulletin Board Forums
  a:|:Bulletin Board Offline:|:Bulletin Board Offline
- a:|:Bulletin Board:|:Bulletin Board
  a:|:Category:|:Category
- a:|:Choose an avatar from one of our galleries that will represent you on the online forums:|:Choose an avatar from one of our galleries that will represent you on the online forums
  a:|:Clear Monitor Confirmation:|:Clear Monitor Confirmation
  a:|:Complete!:|:Complete!
! a:|:Current Avatar:|:Current Avatar
! a:|:Delete Forum Confirmation:|:Delete Forum Confirmation
  a:|:Delete Forum:|:Delete Forum
  a:|:Delete Message Confirmation:|:Delete Message Confirmation
- a:|:Delete Topic Confirmation:|:Delete Topic Confirmation
  a:|:Delete Topic:|:Delete Topic
! a:|:Delete:|:Delete
  a:|:Description:|:Description
  a:|:Edit Forum:|:Edit Forum
  a:|:Edit Message:|:Edit Message
- a:|:Edit:|:Edit
  a:|:Email Notification Text:|:Email Notification Text
- a:|:Enter a URL to an online avatar image.  The image must be no greater than [var1] pixels high by [var2] pixels wide, and its filesize can be no greater than [var3]Kb.:|:Enter a URL to an online avatar image.  The image must be no greater than [var1] pixels high by [var2] pixels wide, and its filesize can be no greater than [var3]Kb.
  a:|:Error Saving Settings:|:Error Saving Settings
  a:|:Fork:|:Fork
- a:|:Forum Topics:|:Forum Topics
  a:|:Forum:|:Forum
! a:|:Forums Block Title:|:Forums Block Title
  a:|:Forums:|:Forums
! a:|:From:|:From
! a:|:Gallery Avatar "[var1]" is currently selected:|:Gallery Avatar "[var1]" is currently selected
! a:|:Guest Email:|:Guest Email
! a:|:Guest Name:|:Guest Name
  a:|:GUEST:|:GUEST
  a:|:Guest:|:Guest
  a:|:HIDDEN:|:HIDDEN
  a:|:Hide Forum:|:Hide Forum
--- 24,60 ----
  a:|:Are you sure you want to delete this message?:|:Are you sure you want to delete this message?
  a:|:Are you sure you want to delete this topic?:|:Are you sure you want to delete this topic?
  a:|:Automatically monitor threads you post to?:|:Automatically monitor threads you post to?
  a:|:Back to Forums:|:Back to Forums
  a:|:Back to the topic.:|:Back to the topic.
  a:|:Body:|:Body
! a:|:Bulletin Board:|:Bulletin Board
  a:|:Bulletin Board Admin:|:Bulletin Board Admin
+ a:|:Bulletin Board Admin Email:|:Bulletin Board Admin Email
  a:|:Bulletin Board Forums:|:Bulletin Board Forums
  a:|:Bulletin Board Offline:|:Bulletin Board Offline
  a:|:Category:|:Category
  a:|:Clear Monitor Confirmation:|:Clear Monitor Confirmation
  a:|:Complete!:|:Complete!
! a:|:Delete:|:Delete
  a:|:Delete Forum:|:Delete Forum
+ a:|:Delete Forum Confirmation:|:Delete Forum Confirmation
  a:|:Delete Message Confirmation:|:Delete Message Confirmation
  a:|:Delete Topic:|:Delete Topic
! a:|:Delete Topic Confirmation:|:Delete Topic Confirmation
  a:|:Description:|:Description
+ a:|:Edit:|:Edit
  a:|:Edit Forum:|:Edit Forum
  a:|:Edit Message:|:Edit Message
  a:|:Email Notification Text:|:Email Notification Text
  a:|:Error Saving Settings:|:Error Saving Settings
  a:|:Fork:|:Fork
  a:|:Forum:|:Forum
! a:|:Forum Topics:|:Forum Topics
  a:|:Forums:|:Forums
! a:|:Forums Block Title:|:Forums Block Title
  a:|:GUEST:|:GUEST
  a:|:Guest:|:Guest
+ a:|:Guest Email:|:Guest Email
+ a:|:Guest Name:|:Guest Name
  a:|:HIDDEN:|:HIDDEN
  a:|:Hide Forum:|:Hide Forum
***************
*** 77,127 ****
  a:|:Hide Topic:|:Hide Topic
  a:|:IP Address:|:IP Address
  a:|:Last Post:|:Last Post
  a:|:Latest Threads Block Title:|:Latest Threads Block Title
- a:|:Link to off-site Avatar:|:Link to off-site Avatar
  a:|:Lock Topic:|:Lock Topic
- a:|:LOCKED:|:LOCKED
  a:|:Maximum Number of Threads to Show in Latest Threads Block:|:Maximum Number of Threads to Show in Latest Threads Block
- a:|:Member Ranks:|:Member Ranks
  a:|:Message:|:Message
! a:|:Minimum Posts:|:Minimum Posts
  a:|:Monitor Posts:|:Monitor Posts
  a:|:Monitor successfully removed.:|:Monitor successfully removed.
- a:|:Monitor:|:Monitor
  a:|:Monitoring has been disabled by the administrator.:|:Monitoring has been disabled by the administrator.
  a:|:Move to Forum:|:Move to Forum
- a:|:My Forum Settings:|:My Forum Settings
  a:|:Name:|:Name
  a:|:New Message:|:New Message
  a:|:New Topic:|:New Topic
  a:|:No forum was deleted from the database.:|:No forum was deleted from the database.
  a:|:No message was deleted from the database.:|:No message was deleted from the database.
  a:|:No monitors were cleared.:|:No monitors were cleared.
  a:|:No topic was deleted from the database.:|:No topic was deleted from the database.
- a:|:No:|:No
- a:|:phpwsBB Settings:|:phpwsBB Settings
- a:|:phpwsBB User Settings:|:phpwsBB User Settings
- a:|:Pick a Local Avatar:|:Pick a Local Avatar
  a:|:Post Reply:|:Post Reply
- a:|:Posted on:|:Posted on:
  a:|:Poster:|:Poster
- a:|:Posts:|:Posts
- a:|:Quote this message:|:Quote this message
- a:|:Quote:|:Quote
- a:|:Rank Name:|:Rank Name
  a:|:Reason:|:Reason
  a:|:Remove all monitors:|:Remove all monitors
- a:|:Remove Avatar:|:Remove Avatar
  a:|:Replies:|:Replies
  a:|:Reply to Message:|:Reply to Message
- a:|:Report Message:|:Report Message
  a:|:Report:|:Report
! a:|:said:|:said
  a:|:Save:|:Save
- a:|:Settings Saved:|:Settings Saved
  a:|:Settings:|:Settings
  a:|:Show Forum:|:Show Forum
  a:|:Show Forums Block:|:Show Forums Block
- a:|:Show Gallery:|:Show Gallery
  a:|:Show Latest Threads Block:|:Show Latest Threads Block
  a:|:Show Message:|:Show Message
--- 62,98 ----
  a:|:Hide Topic:|:Hide Topic
  a:|:IP Address:|:IP Address
+ a:|:LOCKED:|:LOCKED
  a:|:Last Post:|:Last Post
  a:|:Latest Threads Block Title:|:Latest Threads Block Title
  a:|:Lock Topic:|:Lock Topic
  a:|:Maximum Number of Threads to Show in Latest Threads Block:|:Maximum Number of Threads to Show in Latest Threads Block
  a:|:Message:|:Message
! a:|:Monitor:|:Monitor
  a:|:Monitor Posts:|:Monitor Posts
  a:|:Monitor successfully removed.:|:Monitor successfully removed.
  a:|:Monitoring has been disabled by the administrator.:|:Monitoring has been disabled by the administrator.
  a:|:Move to Forum:|:Move to Forum
  a:|:Name:|:Name
  a:|:New Message:|:New Message
  a:|:New Topic:|:New Topic
+ a:|:No:|:No
  a:|:No forum was deleted from the database.:|:No forum was deleted from the database.
  a:|:No message was deleted from the database.:|:No message was deleted from the database.
  a:|:No monitors were cleared.:|:No monitors were cleared.
  a:|:No topic was deleted from the database.:|:No topic was deleted from the database.
  a:|:Post Reply:|:Post Reply
  a:|:Poster:|:Poster
  a:|:Reason:|:Reason
  a:|:Remove all monitors:|:Remove all monitors
  a:|:Replies:|:Replies
  a:|:Reply to Message:|:Reply to Message
  a:|:Report:|:Report
! a:|:Report Message:|:Report Message
! a:|:STICKY:|:STICKY
  a:|:Save:|:Save
  a:|:Settings:|:Settings
+ a:|:Settings Saved:|:Settings Saved
  a:|:Show Forum:|:Show Forum
  a:|:Show Forums Block:|:Show Forums Block
  a:|:Show Latest Threads Block:|:Show Latest Threads Block
  a:|:Show Message:|:Show Message
***************
*** 129,136 ****
  a:|:Sorry, the bulletin board is currently down for maintenance.:|:Sorry, the bulletin board is currently down for maintenance.
  a:|:Sort Order:|:Sort Order
- a:|:Special Rank?:|:Special Rank?
- a:|:Special Ranks:|:Special Ranks
  a:|:Stick Topic:|:Stick Topic
- a:|:STICKY:|:STICKY
  a:|:Stop Monitor:|:Stop Monitor
  a:|:Subject:|:Subject
--- 100,104 ----
***************
*** 147,152 ****
  a:|:There was a problem removing the monitor entry.  Please try again or contact the system administrator.:|:There was a problem removing the monitor entry.  Please try again or contact the system administrator.
  a:|:There was an error saving the settings.:|:There was an error saving the settings.
- a:|:This is a block of text that is automatically added to posts you make. There is a 255 character limit:|:This is a block of text that is automatically added to posts you make. There is a 255 character limit
- a:|:This is the current member ranking system.<br />Don\'t worry about the order - the Rank types will re-order themselves by posting level.<br />To delete a Rank, just leave the name blank.:|:This is the current member ranking system.<br />Don\'t worry about the order - the Rank types will re-order themselves by posting level.<br />To delete a Rank, just leave the name blank.
  a:|:This thread has been locked.:|:This thread has been locked.
  a:|:This topic has no messages.:|:This topic has no messages.
--- 115,118 ----
***************
*** 159,163 ****
  a:|:Unlock Topic:|:Unlock Topic
  a:|:Unstick Topic:|:Unstick Topic
- a:|:Updated on:|:Updated on:
  a:|:Updating All Topics:|:Updating All Topics
  a:|:View Topic:|:View Topic
--- 125,128 ----
***************
*** 168,174 ****
  a:|:You tried to move it to current forum.:|:You tried to move it to current forum.
  a:|:Your forum was successfully saved.:|:Your forum was successfully saved.
- a:|:Your Location:|:Your Location
  a:|:Your message was successfully saved.:|:Your message was successfully saved.
  a:|:Your monitors have been cleared.:|:Your monitors have been cleared.
  a:|:Your settings have been successfully saved.:|:Your settings have been successfully saved.
! a:|:Your Signature:|:Your Signature
--- 133,147 ----
  a:|:You tried to move it to current forum.:|:You tried to move it to current forum.
  a:|:Your forum was successfully saved.:|:Your forum was successfully saved.
  a:|:Your message was successfully saved.:|:Your message was successfully saved.
  a:|:Your monitors have been cleared.:|:Your monitors have been cleared.
  a:|:Your settings have been successfully saved.:|:Your settings have been successfully saved.
! a:|:phpwsBB Settings:|:phpwsBB Settings
! a:|:phpwsBB User Settings:|:phpwsBB User Settings
! a:|:phpwsBB User Settings for "[var1]":|:phpwsBB User Settings for "[var1]"
! a:|:Edit [var1]:|:Edit [var1]
! a:|:Unban this IP:|:Unban this IP
! a:|:Ban this IP:|:Ban this IP
! a:|:Unban this Poster:|:Unban this Poster
! a:|:Ban this Poster:|:Ban this Poster
! a:|:Allow [var1] (Banned):|:Allow [var1] (Banned)
! a:|:Ban [var1]:|:Ban [var1]