Menu
▾
▴
phpwsbb-commits — phpwsBB CVS Commits Notifications
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(48) |
Apr
(45) |
May
(11) |
Jun
(7) |
Jul
|
Aug
(11) |
Sep
(75) |
Oct
(38) |
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(17) |
Feb
|
Mar
(22) |
Apr
|
May
(1) |
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(5) |
Feb
(29) |
Mar
(22) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eloi G. <ada...@us...> - 2004-09-17 15:53:43
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24523/templates Modified Files: view.tpl Log Message: Allowed admins to edit other user's settings through an option on the message display. Index: view.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view.tpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** view.tpl 14 Sep 2004 04:23:08 -0000 1.14 --- view.tpl 17 Sep 2004 15:53:35 -0000 1.15 *************** *** 29,32 **** --- 29,35 ---- [{BAN_USERNAME}]<br /> <!-- END BAN_USER --> + <!-- BEGIN EDIT_SETTINGS --> + [{EDIT_USER}]<br /> + <!-- END EDIT_SETTINGS --> </span> </td> |
|
From: Eloi G. <ada...@us...> - 2004-09-17 15:53:43
|
Update of /cvsroot/phpwsbb/phpwsbb/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24523/conf Modified Files: module_rights.txt Log Message: Allowed admins to edit other user's settings through an option on the message display. Index: module_rights.txt =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/module_rights.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** module_rights.txt 13 Aug 2004 21:32:37 -0000 1.9 --- module_rights.txt 17 Sep 2004 15:53:34 -0000 1.10 *************** *** 16,17 **** --- 16,18 ---- edit_avatars::Edit Avatar Images edit_avatar_galleries::Edit the Avatar Gallery + edit_users::Edit other users' settings |
|
From: Eloi G. <ada...@us...> - 2004-09-17 15:53:42
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24523/class Modified Files: Manager.php Log Message: Allowed admins to edit other user's settings through an option on the message display. Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Manager.php 15 Sep 2004 20:53:34 -0000 1.46 --- Manager.php 17 Sep 2004 15:53:33 -0000 1.47 *************** *** 586,592 **** * * @author Don Seiler <do...@NO...> */ ! function _getUserSettings() { ! if(!$_SESSION['OBJ_user']->username) { $message = $_SESSION['translate']->it('Access to edit settings was denied.'); $error = new PHPWS_Error('phpwsbb', 'PHPWSBB_Manager::_getSettings()', $message, 'exit', 1); --- 586,595 ---- * * @author Don Seiler <do...@NO...> + * @module PHPWSBB + * @param int $id : User Id + * @return none */ ! 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); *************** *** 594,599 **** } ! // Load all information for this user ! $user = $this->_load_user_settings($_SESSION['OBJ_user']->user_id); $tabs = 1; $form = new EZform('PHPWSBB_Settings_edit'); --- 597,604 ---- } ! // Load all information for the user ! if (!$id) ! $id = $_SESSION['OBJ_user']->user_id; ! $user = $this->_load_user_settings($id); $tabs = 1; $form = new EZform('PHPWSBB_Settings_edit'); *************** *** 703,707 **** } ! $title = $_SESSION['translate']->it('phpwsBB User Settings'); $content = $this->_menu() . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit_user_settings.tpl'); --- 708,715 ---- } ! if ($id==$_SESSION['OBJ_user']->user_id) ! $title = $_SESSION['translate']->it('phpwsBB User Settings'); ! else ! $title = $_SESSION['translate']->it('phpwsBB User Settings for "[var1]"', $user['username']); $content = $this->_menu() . PHPWS_Template::processTemplate($tags, 'phpwsbb', 'edit_user_settings.tpl'); *************** *** 1200,1204 **** case 'usersettings': ! $this->_getUserSettings(); break; --- 1208,1215 ---- case 'usersettings': ! if (isset($_REQUEST['user'])) ! $this->_getUserSettings((int)$_REQUEST['user']); ! else ! $this->_getUserSettings(); break; |
|
From: Eloi G. <ada...@us...> - 2004-09-15 20:53:45
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4007/class Modified Files: Manager.php Log Message: Standardized code spacing Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Manager.php 15 Sep 2004 20:24:42 -0000 1.45 --- Manager.php 15 Sep 2004 20:53:34 -0000 1.46 *************** *** 622,661 **** if ($this->_use_avatars) { ! // If an avatar was selected from the gallery, place its information into the form. ! if (isset($_POST['IMGLib_selected_image'])) ! { ! $user['avatar_file'] = $_POST['IMGLib_selected_image']; ! $user['avatar_dir'] = $_POST['IMGLib_selected_gallery']; ! } ! // If a local avatar is selected, show it ! if (!empty($user['avatar_dir']) && !empty($user['avatar_file'])) ! { ! $user['AVATAR'] = '<img src="images/phpwsbb/'.$user['avatar_dir'].$user['avatar_file'].'" alt="" title="" border="0" />'; ! $form->add('IMGLib_current_image', 'hidden', $user['avatar_file']); ! $form->add('IMGLib_current_gallery', 'hidden', $user['avatar_dir']); ! } ! ! if ($this->_use_offsite_avatars) ! { ! // If a remote avatar is selected, show it ! if(empty($user['avatar_dir']) && !empty($user['avatar_file'])) ! $form->add('SETTINGS_avatar_file', 'text', $user['avatar_file']); ! // otherwise, display an empty textfield ! else ! $form->add('SETTINGS_avatar_file', 'text'); ! ! $form->setMaxSize('SETTINGS_avatar_file', 100); ! $form->setWidth('SETTINGS_avatar_file', 70); ! $form->add('SETTINGS_avatar_file_oldvalue', 'hidden', $user['avatar_file']); ! } ! // If any type of avatar was selected, prepare hidden image values ! if ($user['avatar_file']) ! { ! $form->add('SETTINGS_delete_image', 'checkbox'); ! $form->add('avatar_file', 'hidden', $user['avatar_file']); ! $form->add('avatar_dir', 'hidden', $user['avatar_dir']); ! } ! $form->add('IMGLib_return_data', 'hidden', 'edit'); ! $form->add('IMGLib_op', 'submit', $_SESSION['translate']->it('Show Gallery')); } --- 622,661 ---- if ($this->_use_avatars) { ! // If an avatar was selected from the gallery, place its information into the form. ! if (isset($_POST['IMGLib_selected_image'])) ! { ! $user['avatar_file'] = $_POST['IMGLib_selected_image']; ! $user['avatar_dir'] = $_POST['IMGLib_selected_gallery']; ! } ! // If a local avatar is selected, show it ! if (!empty($user['avatar_dir']) && !empty($user['avatar_file'])) ! { ! $user['AVATAR'] = '<img src="images/phpwsbb/'.$user['avatar_dir'].$user['avatar_file'].'" alt="" title="" border="0" />'; ! $form->add('IMGLib_current_image', 'hidden', $user['avatar_file']); ! $form->add('IMGLib_current_gallery', 'hidden', $user['avatar_dir']); ! } ! ! if ($this->_use_offsite_avatars) ! { ! // If a remote avatar is selected, show it ! if(empty($user['avatar_dir']) && !empty($user['avatar_file'])) ! $form->add('SETTINGS_avatar_file', 'text', $user['avatar_file']); ! // otherwise, display an empty textfield ! else ! $form->add('SETTINGS_avatar_file', 'text'); ! ! $form->setMaxSize('SETTINGS_avatar_file', 100); ! $form->setWidth('SETTINGS_avatar_file', 70); ! $form->add('SETTINGS_avatar_file_oldvalue', 'hidden', $user['avatar_file']); ! } ! // If any type of avatar was selected, prepare hidden image values ! if ($user['avatar_file']) ! { ! $form->add('SETTINGS_delete_image', 'checkbox'); ! $form->add('avatar_file', 'hidden', $user['avatar_file']); ! $form->add('avatar_dir', 'hidden', $user['avatar_dir']); ! } ! $form->add('IMGLib_return_data', 'hidden', 'edit'); ! $form->add('IMGLib_op', 'submit', $_SESSION['translate']->it('Show Gallery')); } *************** *** 682,704 **** if ($this->_use_avatars) { ! $tags['AVATAR_TITLE'] = $_SESSION['translate']->it('Avatar Control Panel'); ! if(!empty($user['avatar_file'])) { ! $tags['CURRENT_AVATAR_LABEL'] = $_SESSION['translate']->it('Current Avatar'); ! $tags['CURRENT_AVATAR_IMG'] = $user['AVATAR']; ! $tags['REMOVE_AVATAR_LABEL'] = $_SESSION['translate']->it('Remove Avatar'); ! if (!empty($user['avatar_dir'])) ! $tags['CURRENT_AVATAR_TEXT'] = $_SESSION['translate']->it('Gallery Avatar "[var1]" is currently selected', preg_replace("/[^a-zA-Z0-9]/", ' ', str_replace(strrchr($user['avatar_file'], '.'), '', $user['avatar_file']))); ! elseif (empty($user['avatar_dir'])) ! $tags['CURRENT_AVATAR_TEXT'] = $_SESSION['translate']->it('A Remote Avatar is currently selected'); ! } ! ! $tags['SELECT_AVATAR_LABEL'] = $_SESSION['translate']->it('Pick a Local Avatar'); ! $tags['SELECT_AVATAR_HELP'] = $_SESSION['translate']->it('Choose an avatar from one of our galleries that will represent you on the online forums'); ! ! if ($this->_use_offsite_avatars) ! { ! $tags['REMOTE_AVATAR_LABEL'] = $_SESSION['translate']->it('Link to off-site Avatar'); ! $tags['REMOTE_AVATAR_HELP'] = $_SESSION['translate']->it('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.', $this->_max_avatar_height, $this->_max_avatar_width, $this->_max_avatar_size); ! } } --- 682,704 ---- if ($this->_use_avatars) { ! $tags['AVATAR_TITLE'] = $_SESSION['translate']->it('Avatar Control Panel'); ! if(!empty($user['avatar_file'])) { ! $tags['CURRENT_AVATAR_LABEL'] = $_SESSION['translate']->it('Current Avatar'); ! $tags['CURRENT_AVATAR_IMG'] = $user['AVATAR']; ! $tags['REMOVE_AVATAR_LABEL'] = $_SESSION['translate']->it('Remove Avatar'); ! if (!empty($user['avatar_dir'])) ! $tags['CURRENT_AVATAR_TEXT'] = $_SESSION['translate']->it('Gallery Avatar "[var1]" is currently selected', preg_replace("/[^a-zA-Z0-9]/", ' ', str_replace(strrchr($user['avatar_file'], '.'), '', $user['avatar_file']))); ! elseif (empty($user['avatar_dir'])) ! $tags['CURRENT_AVATAR_TEXT'] = $_SESSION['translate']->it('A Remote Avatar is currently selected'); ! } ! ! $tags['SELECT_AVATAR_LABEL'] = $_SESSION['translate']->it('Pick a Local Avatar'); ! $tags['SELECT_AVATAR_HELP'] = $_SESSION['translate']->it('Choose an avatar from one of our galleries that will represent you on the online forums'); ! ! if ($this->_use_offsite_avatars) ! { ! $tags['REMOTE_AVATAR_LABEL'] = $_SESSION['translate']->it('Link to off-site Avatar'); ! $tags['REMOTE_AVATAR_HELP'] = $_SESSION['translate']->it('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.', $this->_max_avatar_height, $this->_max_avatar_width, $this->_max_avatar_size); ! } } *************** *** 730,756 **** $data['location'] = ''; if(isset($_POST['SETTINGS_location'])) ! $data['location'] = PHPWS_Text::parseInput($_POST['SETTINGS_location']); $data['signature'] = ''; if(isset($_POST['SETTINGS_signature'])) ! $data['signature'] = PHPWS_Text::parseInput($_POST['SETTINGS_signature']); if($this->_use_avatars) { ! // If desired, remove all image information ! if(isset($_POST['SETTINGS_delete_image'])) ! $data['avatar_file'] = $data['avatar_dir'] = ''; ! // otherwise, if a gallery directory was given, save the gallery avatar ! elseif (isset($_POST['avatar_dir'])) { ! $data['avatar_file'] = $_POST['avatar_file']; ! $data['avatar_dir'] = $_POST['avatar_dir']; ! } ! // otherwise, if an offsite avatar is specified, save just the image url ! elseif($this->_use_offsite_avatars && isset($_POST['SETTINGS_avatar_file'])) { ! $url = str_replace(array('http://',' ','<','>'), '', $_POST['SETTINGS_avatar_file']); ! if($url!=$_POST['SETTINGS_avatar_file_oldvalue']) { ! $data['avatar_file'] = $url; ! $data['avatar_dir'] = ''; } - } } --- 730,756 ---- $data['location'] = ''; if(isset($_POST['SETTINGS_location'])) ! $data['location'] = PHPWS_Text::parseInput($_POST['SETTINGS_location']); $data['signature'] = ''; if(isset($_POST['SETTINGS_signature'])) ! $data['signature'] = PHPWS_Text::parseInput($_POST['SETTINGS_signature']); if($this->_use_avatars) { ! // If desired, remove all image information ! if(isset($_POST['SETTINGS_delete_image'])) ! $data['avatar_file'] = $data['avatar_dir'] = ''; ! // otherwise, if a gallery directory was given, save the gallery avatar ! elseif (isset($_POST['avatar_dir'])) { ! $data['avatar_file'] = $_POST['avatar_file']; ! $data['avatar_dir'] = $_POST['avatar_dir']; ! } ! // otherwise, if an offsite avatar is specified, save just the image url ! elseif($this->_use_offsite_avatars && isset($_POST['SETTINGS_avatar_file'])) { ! $url = str_replace(array('http://',' ','<','>'), '', $_POST['SETTINGS_avatar_file']); ! if($url!=$_POST['SETTINGS_avatar_file_oldvalue']) { ! $data['avatar_file'] = $url; ! $data['avatar_dir'] = ''; ! } } } *************** *** 894,911 **** $opts['find'] = array('RANKROW_RANK_ID', 'RANKROW_RANK_TITLE', 'RANKROW_RANK_MIN', 'RANKROW_RANK_SPECIAL'); foreach ($this->_user_ranks as $rank) { ! $tbl = new EZform('PHPWSBB_Settings_edit'); ! $tbl->add('RANKROW_RANK_TITLE', 'text', $rank['rank_title']); ! $tbl->setWidth('RANKROW_RANK_TITLE', 100); ! $tbl->add('RANKROW_RANK_MIN', 'text', $rank['rank_min'].' '); ! $tbl->setSize('RANKROW_RANK_MIN', 5); ! $tbl->add('RANKROW_RANK_SPECIAL', 'checkbox'); ! $tbl->setMatch('RANKROW_RANK_SPECIAL', $rank['rank_special']); ! $row = PHPWS_Template::processTemplate($tbl->getTemplate(), 'phpwsbb', 'rank_tbl_row.tpl'); ! $p = 'PHPWSBB_RANK['.$rank['rank_id'].']['; ! $opts['replace'] = array($p.'rank_id]', $p.'rank_title]', $p.'rank_min]', $p.'rank_special]'); ! if($rank['rank_special']) ! $tags['RANK_SPECIAL_ROWS'] .= str_replace($opts['find'], $opts['replace'] , $row); ! else ! $tags['RANK_MEMBER_ROWS'] .= str_replace($opts['find'], $opts['replace'] , $row); } // Create input form for a new user rank. --- 894,911 ---- $opts['find'] = array('RANKROW_RANK_ID', 'RANKROW_RANK_TITLE', 'RANKROW_RANK_MIN', 'RANKROW_RANK_SPECIAL'); foreach ($this->_user_ranks as $rank) { ! $tbl = new EZform('PHPWSBB_Settings_edit'); ! $tbl->add('RANKROW_RANK_TITLE', 'text', $rank['rank_title']); ! $tbl->setWidth('RANKROW_RANK_TITLE', 100); ! $tbl->add('RANKROW_RANK_MIN', 'text', $rank['rank_min'].' '); ! $tbl->setSize('RANKROW_RANK_MIN', 5); ! $tbl->add('RANKROW_RANK_SPECIAL', 'checkbox'); ! $tbl->setMatch('RANKROW_RANK_SPECIAL', $rank['rank_special']); ! $row = PHPWS_Template::processTemplate($tbl->getTemplate(), 'phpwsbb', 'rank_tbl_row.tpl'); ! $p = 'PHPWSBB_RANK['.$rank['rank_id'].']['; ! $opts['replace'] = array($p.'rank_id]', $p.'rank_title]', $p.'rank_min]', $p.'rank_special]'); ! if($rank['rank_special']) ! $tags['RANK_SPECIAL_ROWS'] .= str_replace($opts['find'], $opts['replace'] , $row); ! else ! $tags['RANK_MEMBER_ROWS'] .= str_replace($opts['find'], $opts['replace'] , $row); } // Create input form for a new user rank. *************** *** 996,1029 **** // If changes to the user ranks were posted, save them now. if(isset($_POST['PHPWSBB_RANK'])) { ! $data = array(); ! foreach($_POST['PHPWSBB_RANK'] as $rank_id=>$rank) { ! if(!empty($rank['rank_title'])) { ! $data['rank_title'] = $rank['rank_title']; ! $data['rank_min'] = $rank['rank_min']; ! if(isset($rank['rank_special'])) ! $data['rank_special'] = 1; ! else ! $data['rank_special'] = 0; ! $GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_ranks', 'rank_id', $rank_id); ! } ! else { ! // Erase rank if title is empty ! $GLOBALS['core']->sqlDelete('mod_phpwsbb_user_ranks', 'rank_id', $rank_id); } - } } // If a new user rank is requested, create it. if(!empty($_POST['PHPWSBB_NEW_RANK_TITLE'])) { ! $data = array(); ! $data['rank_title'] = $_POST['PHPWSBB_NEW_RANK_TITLE']; ! if(!empty($_POST['PHPWSBB_NEW_RANK_MIN'])) ! $data['rank_min'] = $_POST['PHPWSBB_NEW_RANK_MIN']; ! else ! $data['rank_min'] = 0; ! if(!empty($_POST['PHPWSBB_NEW_RANK_SPECIAL'])) ! $data['rank_special'] = 1; ! else ! $data['rank_special'] = 0; ! $GLOBALS['core']->sqlInsert($data, 'mod_phpwsbb_user_ranks', 'rank_id'); } // Now, reload the rank data into this class --- 996,1029 ---- // If changes to the user ranks were posted, save them now. if(isset($_POST['PHPWSBB_RANK'])) { ! $data = array(); ! foreach($_POST['PHPWSBB_RANK'] as $rank_id=>$rank) { ! if(!empty($rank['rank_title'])) { ! $data['rank_title'] = $rank['rank_title']; ! $data['rank_min'] = $rank['rank_min']; ! if(isset($rank['rank_special'])) ! $data['rank_special'] = 1; ! else ! $data['rank_special'] = 0; ! $GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_ranks', 'rank_id', $rank_id); ! } ! else { ! // Erase rank if title is empty ! $GLOBALS['core']->sqlDelete('mod_phpwsbb_user_ranks', 'rank_id', $rank_id); ! } } } // If a new user rank is requested, create it. if(!empty($_POST['PHPWSBB_NEW_RANK_TITLE'])) { ! $data = array(); ! $data['rank_title'] = $_POST['PHPWSBB_NEW_RANK_TITLE']; ! if(!empty($_POST['PHPWSBB_NEW_RANK_MIN'])) ! $data['rank_min'] = $_POST['PHPWSBB_NEW_RANK_MIN']; ! else ! $data['rank_min'] = 0; ! if(!empty($_POST['PHPWSBB_NEW_RANK_SPECIAL'])) ! $data['rank_special'] = 1; ! else ! $data['rank_special'] = 0; ! $GLOBALS['core']->sqlInsert($data, 'mod_phpwsbb_user_ranks', 'rank_id'); } // Now, reload the rank data into this class |
|
From: Eloi G. <ada...@us...> - 2004-09-15 20:53:45
|
Update of /cvsroot/phpwsbb/phpwsbb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4007 Modified Files: index.php Log Message: Standardized code spacing Index: index.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/index.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** index.php 15 Sep 2004 19:29:40 -0000 1.12 --- index.php 15 Sep 2004 20:53:35 -0000 1.13 *************** *** 51,93 **** if (isset($_REQUEST['IMGLib_op']) && $_SESSION['OBJ_user']->user_id) { ! /* If this just got called from the profile editing screen, save all data entered so far */ ! if (isset($_REQUEST['PHPWSBB_MAN_OP'])) ! $_SESSION['PHPWSBB_Manager']->_saveUserSettings(); ! /* If an image was selected from the library... */ ! if ($_REQUEST['IMGLib_op']=='select_image') { ! $_POST['IMGLib_selected_image'] = pos($_POST['IMGLib_selected_image']); ! $_SESSION['PHPWSBB_Manager']->_getUserSettings(); ! return; ! } ! /* Handle gallery exit requests */ ! if ($_REQUEST['IMGLib_op']=='exit') { ! if ($_REQUEST['IMGLib_return_data']=='edit') ! $_SESSION['PHPWSBB_Manager']->_getUserSettings(); ! return; ! } ! /* Show the image galleries. linkBack, current_image, & current_gallery ! * are already set as POSTs from the calling form. ! */ ! require_once PHPWS_SOURCE_DIR . 'core/ImgLibrary.php'; ! $library = new PHPWS_IMGLib($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_avatars') ! , $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_avatar_galleries') ! , true, null, null, null, 'phpwsbb', 'library', 'CNT_phpwsbb', 'avatar' ! , $_SESSION['PHPWSBB_Manager']->_max_avatar_size*1024 ! , $_SESSION['PHPWSBB_Manager']->_max_avatar_height ! , $_SESSION['PHPWSBB_Manager']->_max_avatar_width); ! $library->action($_REQUEST['IMGLib_op']); ! /* If an image was moved between galleries... */ ! if ($_REQUEST['IMGLib_op']=='move_image' && $library->_done) { ! $sql = 'UPDATE mod_phpwsbb_user_info SET avatar_dir="' ! . $library->_base_dir.'/'.$_POST['IMGLib_selected_gallery'] ! . '/" WHERE avatar_dir="' ! . $library->_base_dir.'/'.$library->_current_view ! . '/" AND avatar_file IN ("' ! . implode('","', $_POST['IMGLib_selected_image']) ! . '")'; ! /* Change directory names in all relevant sections */ ! $GLOBALS['core']->query($sql, true); ! } } } ! ?> --- 51,93 ---- if (isset($_REQUEST['IMGLib_op']) && $_SESSION['OBJ_user']->user_id) { ! /* If this just got called from the profile editing screen, save all data entered so far */ ! if (isset($_REQUEST['PHPWSBB_MAN_OP'])) ! $_SESSION['PHPWSBB_Manager']->_saveUserSettings(); ! /* If an image was selected from the library... */ ! if ($_REQUEST['IMGLib_op']=='select_image') { ! $_POST['IMGLib_selected_image'] = pos($_POST['IMGLib_selected_image']); ! $_SESSION['PHPWSBB_Manager']->_getUserSettings(); ! return; ! } ! /* Handle gallery exit requests */ ! if ($_REQUEST['IMGLib_op']=='exit') { ! if ($_REQUEST['IMGLib_return_data']=='edit') ! $_SESSION['PHPWSBB_Manager']->_getUserSettings(); ! return; ! } ! /* Show the image galleries. linkBack, current_image, & current_gallery ! * are already set as POSTs from the calling form. ! */ ! require_once PHPWS_SOURCE_DIR . 'core/ImgLibrary.php'; ! $library = new PHPWS_IMGLib($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_avatars') ! , $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_avatar_galleries') ! , true, null, null, null, 'phpwsbb', 'library', 'CNT_phpwsbb', 'avatar' ! , $_SESSION['PHPWSBB_Manager']->_max_avatar_size*1024 ! , $_SESSION['PHPWSBB_Manager']->_max_avatar_height ! , $_SESSION['PHPWSBB_Manager']->_max_avatar_width); ! $library->action($_REQUEST['IMGLib_op']); ! /* If an image was moved between galleries... */ ! if ($_REQUEST['IMGLib_op']=='move_image' && $library->_done) { ! $sql = 'UPDATE mod_phpwsbb_user_info SET avatar_dir="' ! . $library->_base_dir.'/'.$_POST['IMGLib_selected_gallery'] ! . '/" WHERE avatar_dir="' ! . $library->_base_dir.'/'.$library->_current_view ! . '/" AND avatar_file IN ("' ! . implode('","', $_POST['IMGLib_selected_image']) ! . '")'; ! /* Change directory names in all relevant sections */ ! $GLOBALS['core']->query($sql, true); ! } } } ! ?> \ No newline at end of file |
|
From: Eloi G. <ada...@us...> - 2004-09-15 20:24:51
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29096/class Modified Files: Manager.php Log Message: Changed "last_viewed" variable to an array to better work with the modulelink function Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** Manager.php 15 Sep 2004 18:52:58 -0000 1.44 --- Manager.php 15 Sep 2004 20:24:42 -0000 1.45 *************** *** 187,191 **** * Stores the last page viewed for possible recall * ! * @var string * @access public */ --- 187,191 ---- * Stores the last page viewed for possible recall * ! * @var array * @access public */ *************** *** 253,256 **** --- 253,258 ---- // Load user ranking system $this->_load_user_ranks(); + // Default page + $this->last_viewed = array('PHPWSBB_MAN_OP'=>'list'); }// END FUNC PHPWSBB_Manager *************** *** 347,352 **** } ! if(isset($_REQUEST['PHPWS_MAN_ITEMS'][0])) $this->forum = new PHPWSBB_Forum($_REQUEST['PHPWS_MAN_ITEMS'][0]); $_REQUEST['PHPWSBB_FORUM_OP'] = 'view'; --- 349,357 ---- } ! if(isset($_REQUEST['PHPWS_MAN_ITEMS'][0])) { $this->forum = new PHPWSBB_Forum($_REQUEST['PHPWS_MAN_ITEMS'][0]); + // Save this URL in case the page needs to be restored + $this->last_viewed = array('PHPWSBB_MAN_OP'=>'viewforum', 'PHPWS_MAN_ITEMS'=>$_REQUEST['PHPWS_MAN_ITEMS'][0]); + } $_REQUEST['PHPWSBB_FORUM_OP'] = 'view'; *************** *** 671,675 **** $tags['REMOVEALLMONITORS_HELP'] = CLS_help::show_link('phpwsbb', 'remove_all_monitors'); ! $tags['EXIT_LINK'] = '<a href="'.$this->last_viewed.'">'.$_SESSION['translate']->it('Back to Forum').'</a>'; $tags['SIGNATURE_LABEL'] = $_SESSION['translate']->it('Your Signature'); $tags['SIGNATURE_HELP'] = $_SESSION['translate']->it('This is a block of text that is automatically added to posts you make. There is a 255 character limit'); --- 676,680 ---- $tags['REMOVEALLMONITORS_HELP'] = CLS_help::show_link('phpwsbb', 'remove_all_monitors'); ! $tags['EXIT_LINK'] = PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', $this->last_viewed); $tags['SIGNATURE_LABEL'] = $_SESSION['translate']->it('Your Signature'); $tags['SIGNATURE_HELP'] = $_SESSION['translate']->it('This is a block of text that is automatically added to posts you make. There is a 255 character limit'); *************** *** 758,762 **** $title = $_SESSION['translate']->it('Settings Saved'); $content = $this->_menu() . $_SESSION['translate']->it("Your settings have been successfully saved."); ! $content .= ' <a href="'.$this->last_viewed.'">' . $_SESSION['translate']->it('Back to Forums') . '</a>'; } else { $title = $_SESSION['translate']->it('Error Saving Settings'); --- 763,767 ---- $title = $_SESSION['translate']->it('Settings Saved'); $content = $this->_menu() . $_SESSION['translate']->it("Your settings have been successfully saved."); ! $content .= PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', $this->last_viewed); } else { $title = $_SESSION['translate']->it('Error Saving Settings'); *************** *** 1051,1055 **** $title = $_SESSION['translate']->it('Settings Saved'); $content = $this->_menu() . $_SESSION['translate']->it('Your settings have been successfully saved.'); ! $content .= PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'list')); } else { $title = $_SESSION['translate']->it('Error Saving Settings'); --- 1056,1060 ---- $title = $_SESSION['translate']->it('Settings Saved'); $content = $this->_menu() . $_SESSION['translate']->it('Your settings have been successfully saved.'); ! $content .= PHPWS_Text::moduleLink($_SESSION['translate']->it('Back to Forums'), 'phpwsbb', $this->last_viewed); } else { $title = $_SESSION['translate']->it('Error Saving Settings'); *************** *** 1132,1137 **** case 'viewforum': $this->_viewForum(); - // Save this URL in case the page needs to be restored - $this->last_viewed = PHPWS_WizardBag::whereami(TRUE);; break; --- 1137,1140 ---- *************** *** 1270,1274 **** case 'view': // already handled in [/core/Manager.php]->manageraction() /* Save this URL in case the page needs to be restored */ ! $this->last_viewed = PHPWS_WizardBag::whereami(TRUE); break; --- 1273,1277 ---- case 'view': // already handled in [/core/Manager.php]->manageraction() /* Save this URL in case the page needs to be restored */ ! $this->last_viewed = array('PHPWSBB_MAN_OP'=>'view', 'PHPWS_MAN_ITEMS'=>$_REQUEST['PHPWS_MAN_ITEMS'][0]); break; |
|
From: Eloi G. <ada...@us...> - 2004-09-15 20:22:27
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28397/class Modified Files: Thread.php Log Message: Code allows PHPWS_MAN_ITEMS to work without the brackets which breaks the link in e-mail messages, so now theyr'e out wherever users usually copy & paste links. Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** Thread.php 14 Sep 2004 04:13:46 -0000 1.56 --- Thread.php 15 Sep 2004 20:22:17 -0000 1.57 *************** *** 494,498 **** if ($GLOBALS['core']->sqlInsert($data, 'mod_phpwsbb_monitors', TRUE, FALSE, FALSE, FALSE)) { $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('You are now monitoring the topic "[var1]" and will be emailed when there is a new reply.', $this->getLabel()); ! $GLOBALS['CNT_phpwsbb']['content'] .= '<br /><a href="http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=' . $this->getId() . '">' . $_SESSION['translate']->it('Back to the topic.') . '</a>'; $this->monitored = TRUE; } else { --- 494,498 ---- if ($GLOBALS['core']->sqlInsert($data, 'mod_phpwsbb_monitors', TRUE, FALSE, FALSE, FALSE)) { $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('You are now monitoring the topic "[var1]" and will be emailed when there is a new reply.', $this->getLabel()); ! $GLOBALS['CNT_phpwsbb']['content'] .= '<br /><a href="http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId() . '">' . $_SESSION['translate']->it('Back to the topic.') . '</a>'; $this->monitored = TRUE; } else { *************** *** 514,518 **** if ($GLOBALS['core']->sqlDelete('mod_phpwsbb_monitors', $data)) { $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('Monitor successfully removed.'); ! $GLOBALS['CNT_phpwsbb']['content'] .= '<br /><a href="http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=' . $this->getId() . '">' . $_SESSION['translate']->it('Back to the topic.') . '</a>'; $this->monitored = FALSE; } else { --- 514,518 ---- if ($GLOBALS['core']->sqlDelete('mod_phpwsbb_monitors', $data)) { $GLOBALS['CNT_phpwsbb']['content'] .= $_SESSION['translate']->it('Monitor successfully removed.'); ! $GLOBALS['CNT_phpwsbb']['content'] .= '<br /><a href="http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId() . '">' . $_SESSION['translate']->it('Back to the topic.') . '</a>'; $this->monitored = FALSE; } else { |
|
From: Eloi G. <ada...@us...> - 2004-09-15 20:22:27
|
Update of /cvsroot/phpwsbb/phpwsbb/templates/threads In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28397/templates/threads Modified Files: row.tpl Log Message: Code allows PHPWS_MAN_ITEMS to work without the brackets which breaks the link in e-mail messages, so now theyr'e out wherever users usually copy & paste links. Index: row.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/threads/row.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** row.tpl 29 Mar 2004 04:40:54 -0000 1.3 --- row.tpl 15 Sep 2004 20:22:18 -0000 1.4 *************** *** 4,8 **** <!-- END SELECT --> <td class="smalltext"> ! <a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]={ID}">{LABEL}</a></td> <!-- <td class="smalltext">{OWNER}</td> --- 4,8 ---- <!-- END SELECT --> <td class="smalltext"> ! <a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS={ID}">{LABEL}</a></td> <!-- <td class="smalltext">{OWNER}</td> |
|
From: Eloi G. <ada...@us...> - 2004-09-15 19:29:50
|
Update of /cvsroot/phpwsbb/phpwsbb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16626 Modified Files: index.php Log Message: -Enabled use of the ImgLibrary Class -Code now allows PHPWS_MAN_ITEMS to work without the brackets, which breaks the link in e-mail messages. Index: index.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/index.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** index.php 13 Sep 2004 21:41:54 -0000 1.11 --- index.php 15 Sep 2004 19:29:40 -0000 1.12 *************** *** 33,36 **** --- 33,40 ---- $CNT_phpwsbb['content'] = $_SESSION['translate']->it('Sorry, the bulletin board is currently down for maintenance.'); } else { + /* This'll let the module work without those brackets */ + if(isset($_REQUEST['PHPWS_MAN_ITEMS']) && is_numeric($_REQUEST['PHPWS_MAN_ITEMS'])) + $_REQUEST['PHPWS_MAN_ITEMS']=array($_REQUEST['PHPWS_MAN_ITEMS']); + if (isset($_REQUEST['PHPWSBB_MAN_OP'])) { $_SESSION['PHPWSBB_Manager']->action(); *************** *** 45,48 **** --- 49,93 ---- if (isset($_REQUEST['PHPWSBB_MESSAGE_OP']) && isset($_SESSION['PHPWSBB_Manager']->message)) $_SESSION['PHPWSBB_Manager']->message->action(); + + if (isset($_REQUEST['IMGLib_op']) && $_SESSION['OBJ_user']->user_id) { + /* If this just got called from the profile editing screen, save all data entered so far */ + if (isset($_REQUEST['PHPWSBB_MAN_OP'])) + $_SESSION['PHPWSBB_Manager']->_saveUserSettings(); + /* If an image was selected from the library... */ + if ($_REQUEST['IMGLib_op']=='select_image') { + $_POST['IMGLib_selected_image'] = pos($_POST['IMGLib_selected_image']); + $_SESSION['PHPWSBB_Manager']->_getUserSettings(); + return; + } + /* Handle gallery exit requests */ + if ($_REQUEST['IMGLib_op']=='exit') { + if ($_REQUEST['IMGLib_return_data']=='edit') + $_SESSION['PHPWSBB_Manager']->_getUserSettings(); + return; + } + /* Show the image galleries. linkBack, current_image, & current_gallery + * are already set as POSTs from the calling form. + */ + require_once PHPWS_SOURCE_DIR . 'core/ImgLibrary.php'; + $library = new PHPWS_IMGLib($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_avatars') + , $_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_avatar_galleries') + , true, null, null, null, 'phpwsbb', 'library', 'CNT_phpwsbb', 'avatar' + , $_SESSION['PHPWSBB_Manager']->_max_avatar_size*1024 + , $_SESSION['PHPWSBB_Manager']->_max_avatar_height + , $_SESSION['PHPWSBB_Manager']->_max_avatar_width); + $library->action($_REQUEST['IMGLib_op']); + /* If an image was moved between galleries... */ + if ($_REQUEST['IMGLib_op']=='move_image' && $library->_done) { + $sql = 'UPDATE mod_phpwsbb_user_info SET avatar_dir="' + . $library->_base_dir.'/'.$_POST['IMGLib_selected_gallery'] + . '/" WHERE avatar_dir="' + . $library->_base_dir.'/'.$library->_current_view + . '/" AND avatar_file IN ("' + . implode('","', $_POST['IMGLib_selected_image']) + . '")'; + /* Change directory names in all relevant sections */ + $GLOBALS['core']->query($sql, true); + } + } } ?> |
|
From: Eloi G. <ada...@us...> - 2004-09-15 18:53:07
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9824/class Modified Files: Manager.php Log Message: Minor code formatting changes Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Manager.php 14 Sep 2004 04:10:42 -0000 1.43 --- Manager.php 15 Sep 2004 18:52:58 -0000 1.44 *************** *** 1312,1383 **** // If this is not a member, mark them as a guest if(!$id) { ! return array(); ! } elseif(is_array($id) && !empty($id['user_id'])) { ! // If user data was passed in, use it ! $result = $id; ! } elseif (!$result = $GLOBALS['core']->getRow('SELECT * FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_phpwsbb_user_info AS i LEFT JOIN ' . $GLOBALS['core']->tbl_prefix . 'mod_users AS u ON ( u.user_id = i.user_id ) WHERE i.user_id = '.$id)) { ! /* ! * Using 1 sql statement instead of loading user classes which ! * would use more memoryand generate an additional query per user. ! */ ! ! // If no record was found, create one ! $result = array(); ! // Develop correct user post counts ! $posts = $GLOBALS['core']->getRow('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1); ! $result['posts'] = $posts['COUNT(owner_id)']; ! // If the user has uservars set for this module... ! $monitordefault = $_SESSION['OBJ_user']->getUserVar('monitordefault', NULL, 'phpwsbb'); ! if ($monitordefault!==NULL) { ! // transfer the values to the table ! $result['monitordefault'] = $monitordefault; ! $result['suspendmonitors'] = $_SESSION['OBJ_user']->getUserVar('suspendmonitors', NULL, 'phpwsbb'); ! } ! $GLOBALS['core']->sqlInsert($result, 'mod_phpwsbb_user_info'); ! $result['location'] = $result['avatar'] = $result['signature'] = $result['monitordefault'] = $result['suspendmonitors'] = null; ! } ! // If user's post count is set to 0, recalculate it. ! if($result['posts']==0) { ! // Develop correct user post counts ! $result['posts'] = $data['posts'] = $GLOBALS['core']->getOne('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1); ! $GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_info', 'user_id', $id); ! } ! $result['POSTS'] = $_SESSION['translate']->it('Posts').': '.$result['posts']; ! $result['MONITORDEFAULT'] = $result['monitordefault']; ! $result['SUSPENDMONITORS'] = $result['suspendmonitors']; ! if (!empty($result['location'])) ! $result['FROM'] = $_SESSION['translate']->it('From').': '.PHPWS_Text::parseOutput($result['location']); ! $result['AVATAR'] = null; ! if (!empty($result['avatar_file']) && $this->_use_avatars) { ! // Gallery Avatar ! if (!empty($result['avatar_dir'])) ! $result['AVATAR'] = '<img src="images/phpwsbb/'.$result['avatar_dir'].$result['avatar_file'].'" alt="" title="" border="0" />'; ! // Offsite Avatar ! elseif ($this->_use_offsite_avatars && empty($result['avatar_dir'])) ! $result['AVATAR'] = '<img src="http://'.$result['avatar_file'].'" alt="" title="" border="0" />'; ! } ! if (!empty($result['signature']) && $this->_use_signatures) ! $result['SIGNATURE'] = PHPWS_Text::parseOutput($result['signature']); ! // Determine user's rank ! if($result['posts']&& $this->_user_ranks) { ! $isSpecialuser = $result['deity'] || stristr($result['varValue'], 'lock_threads'); ! foreach ($this->_user_ranks as $rank) ! if(($rank['rank_min']<=$result['posts']) ! && (($rank['rank_special'] && $isSpecialuser) ! || (!$rank['rank_special'] && !$isSpecialuser))) { ! $result['RANK'] = $rank['rank_title']; ! } ! } ! return $result; ! } } --- 1312,1378 ---- // If this is not a member, mark them as a guest if(!$id) { ! return array(); ! // If user data was passed in, use it ! } elseif(is_array($id) && !empty($id['user_id'])) { ! $result = $id; ! } 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(); ! // Develop correct user post counts ! $posts = $GLOBALS['core']->getRow('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1); ! $result['posts'] = $posts['COUNT(owner_id)']; ! // If the user has uservars set for this module... ! $monitordefault = $_SESSION['OBJ_user']->getUserVar('monitordefault', NULL, 'phpwsbb'); ! if ($monitordefault!==NULL) { ! // transfer the values to the table ! $result['monitordefault'] = $monitordefault; ! $result['suspendmonitors'] = $_SESSION['OBJ_user']->getUserVar('suspendmonitors', NULL, 'phpwsbb'); ! } ! $GLOBALS['core']->sqlInsert($result, 'mod_phpwsbb_user_info'); ! $result['location'] = $result['avatar'] = $result['signature'] = $result['monitordefault'] = $result['suspendmonitors'] = null; ! } ! // If user's post count is set to 0, recalculate it. ! if($result['posts']==0) { ! // Develop correct user post counts ! $result['posts'] = $data['posts'] = $GLOBALS['core']->getOne('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1); ! $GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_info', 'user_id', $id); ! } ! $result['POSTS'] = $_SESSION['translate']->it('Posts').': '.$result['posts']; ! $result['MONITORDEFAULT'] = $result['monitordefault']; ! $result['SUSPENDMONITORS'] = $result['suspendmonitors']; ! if (!empty($result['location'])) ! $result['FROM'] = $_SESSION['translate']->it('From').': '.PHPWS_Text::parseOutput($result['location']); ! $result['AVATAR'] = null; ! if (!empty($result['avatar_file']) && $this->_use_avatars) { ! // Gallery Avatar ! if (!empty($result['avatar_dir'])) ! $result['AVATAR'] = '<img src="images/phpwsbb/'.$result['avatar_dir'].$result['avatar_file'].'" alt="" title="" border="0" />'; ! // Offsite Avatar ! elseif ($this->_use_offsite_avatars && empty($result['avatar_dir'])) ! $result['AVATAR'] = '<img src="http://'.$result['avatar_file'].'" alt="" title="" border="0" />'; ! } ! if (!empty($result['signature']) && $this->_use_signatures) ! $result['SIGNATURE'] = PHPWS_Text::parseOutput($result['signature']); ! // Determine user's rank ! if($result['posts']&& $this->_user_ranks) { ! $isSpecialuser = $result['deity'] || stristr($result['varValue'], 'lock_threads'); ! foreach ($this->_user_ranks as $rank) ! if(($rank['rank_min']<=$result['posts']) ! && (($rank['rank_special'] && $isSpecialuser) ! || (!$rank['rank_special'] && !$isSpecialuser))) { ! $result['RANK'] = $rank['rank_title']; ! } ! } ! return $result; ! } } |
|
From: Eloi G. <ada...@us...> - 2004-09-15 18:50:39
|
Update of /cvsroot/phpwsbb/phpwsbb/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9503/lang Modified Files: phpwsbb.en.lng Log Message: Updated language entries Index: phpwsbb.en.lng =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/lang/phpwsbb.en.lng,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** phpwsbb.en.lng 2 Apr 2004 02:47:20 -0000 1.17 --- phpwsbb.en.lng 15 Sep 2004 18:50:29 -0000 1.18 *************** *** 1,3 **** --- 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. *************** *** 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? --- 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? *************** *** 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 --- 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 *************** *** 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 --- 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 *************** *** 100,104 **** --- 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 *************** *** 115,118 **** --- 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. *************** *** 125,128 **** --- 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 *************** *** 133,139 **** 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 --- 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 |
|
From: Don S. <ri...@us...> - 2004-09-15 02:19:18
|
Update of /cvsroot/phpwsbb/phpwsbb/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22425/boost Modified Files: uninstall.php Log Message: PHPWS_HOME_DIR has been deprecated Index: uninstall.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/uninstall.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** uninstall.php 13 Sep 2004 21:41:54 -0000 1.12 --- uninstall.php 15 Sep 2004 02:19:07 -0000 1.13 *************** *** 53,57 **** // Remove image dir ! PHPWS_File::rmdir(PHPWS_HOME_DIR . 'images/phpwsbb/'); } else { --- 53,57 ---- // Remove image dir ! PHPWS_File::rmdir($GLOBALS['core']->home_dir . 'images/phpwsbb/'); } else { |
|
From: Eloi G. <ada...@us...> - 2004-09-14 04:23:17
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2463/templates Modified Files: view.tpl Log Message: Put the 2 "Ban..." lines into different conditional sections. A Guest would activate one but not the other. Index: view.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view.tpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** view.tpl 13 Aug 2004 21:32:38 -0000 1.13 --- view.tpl 14 Sep 2004 04:23:08 -0000 1.14 *************** *** 23,28 **** {IP_TEXT}: {IPADDR}<br /> <!-- END IPADDR --> ! <!-- BEGIN BAN_USER --> [{BAN_IP}]<br /> [{BAN_USERNAME}]<br /> <!-- END BAN_USER --> --- 23,30 ---- {IP_TEXT}: {IPADDR}<br /> <!-- END IPADDR --> ! <!-- BEGIN BAN_IPADDR --> [{BAN_IP}]<br /> + <!-- END BAN_IPADDR --> + <!-- BEGIN BAN_USER --> [{BAN_USERNAME}]<br /> <!-- END BAN_USER --> |
|
From: Eloi G. <ada...@us...> - 2004-09-14 04:14:12
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv890/class Modified Files: Message.php Thread.php Log Message: Cleaned up some string fragments Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** Thread.php 13 Sep 2004 21:41:55 -0000 1.55 --- Thread.php 14 Sep 2004 04:13:46 -0000 1.56 *************** *** 325,329 **** $admin_email = $user_contact; } ! $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <${admin_email}>'; $subject = $_SESSION['translate']->it('Reply to "[var1]"', $this->getLabel()); $message = $_SESSION['PHPWSBB_Manager']->_email_text; --- 325,329 ---- $admin_email = $user_contact; } ! $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <'.$admin_email.'>'; $subject = $_SESSION['translate']->it('Reply to "[var1]"', $this->getLabel()); $message = $_SESSION['PHPWSBB_Manager']->_email_text; Index: Message.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** Message.php 13 Sep 2004 21:41:55 -0000 1.62 --- Message.php 14 Sep 2004 04:13:46 -0000 1.63 *************** *** 454,458 **** } ! $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <${admin_email}>'; $subject = $_SESSION['translate']->it('Bulletin Board Post: "[var1]"', $this->getLabel()); $message = $_SESSION['PHPWSBB_Manager']->_email_text; --- 454,458 ---- } ! $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <'.$admin_email.'>'; $subject = $_SESSION['translate']->it('Bulletin Board Post: "[var1]"', $this->getLabel()); $message = $_SESSION['PHPWSBB_Manager']->_email_text; *************** *** 591,595 **** $admin_email = $user_contact; } ! $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <${admin_email}>'; $subject = $_SESSION['translate']->it('Reported BB Post: "[var1]"', $this->getLabel()); $message = str_replace('[url]', 'http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId(), $message); --- 591,595 ---- $admin_email = $user_contact; } ! $from = '"' . $_SESSION['translate']->it('Bulletin Board Admin') . '" <'.$admin_email.'>'; $subject = $_SESSION['translate']->it('Reported BB Post: "[var1]"', $this->getLabel()); $message = str_replace('[url]', 'http://' . PHPWS_HOME_HTTP . 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS=' . $this->getId(), $message); |
|
From: Eloi G. <ada...@us...> - 2004-09-14 04:10:52
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv489/class Modified Files: Manager.php Log Message: Cleaned up some string fragments Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Manager.php 13 Sep 2004 21:41:55 -0000 1.42 --- Manager.php 14 Sep 2004 04:10:42 -0000 1.43 *************** *** 268,275 **** if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_forums')) ! $tags['ADD_FORUM'] = '<a href="index.php?module=phpwsbb&PHPWSBB_MAN_OP=editforum">${addForum}</a>'; if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_settings')) ! $tags['SETTINGS'] = '<a href="index.php?module=phpwsbb&PHPWSBB_MAN_OP=getsettings">${settings}</a>'; $tags['LIST'] = PHPWS_Text::moduleLink($_SESSION['translate']->it('Forums'), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'list')); --- 268,275 ---- if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_forums')) ! $tags['ADD_FORUM'] = '<a href="index.php?module=phpwsbb&PHPWSBB_MAN_OP=editforum">'.$addForum.'</a>'; if($_SESSION['OBJ_user']->allow_access('phpwsbb', 'edit_settings')) ! $tags['SETTINGS'] = '<a href="index.php?module=phpwsbb&PHPWSBB_MAN_OP=getsettings">'.$settings.'</a>'; $tags['LIST'] = PHPWS_Text::moduleLink($_SESSION['translate']->it('Forums'), 'phpwsbb', array('PHPWSBB_MAN_OP'=>'list')); *************** *** 332,338 **** $this->setOrder('sticky DESC, lastpost DESC'); if(!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads')) ! $this->setSort('fid=${fid} AND hidden=0'); else ! $this->setSort('fid=${fid}'); return $this->getList('threads', NULL, FALSE); --- 332,338 ---- $this->setOrder('sticky DESC, lastpost DESC'); if(!$_SESSION['OBJ_user']->allow_access('phpwsbb', 'hide_threads')) ! $this->setSort('fid='.$fid.' AND hidden=0'); else ! $this->setSort('fid='.$fid); return $this->getList('threads', NULL, FALSE); *************** *** 1316,1320 **** // If user data was passed in, use it $result = $id; ! } elseif (!$result = $GLOBALS['core']->getRow('SELECT * FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_phpwsbb_user_info AS i LEFT JOIN ' . $GLOBALS['core']->tbl_prefix . 'mod_users AS u ON ( u.user_id = i.user_id ) WHERE i.user_id = ${id}')) { /* * Using 1 sql statement instead of loading user classes which --- 1316,1320 ---- // If user data was passed in, use it $result = $id; ! } elseif (!$result = $GLOBALS['core']->getRow('SELECT * FROM ' . $GLOBALS['core']->tbl_prefix . 'mod_phpwsbb_user_info AS i LEFT JOIN ' . $GLOBALS['core']->tbl_prefix . 'mod_users AS u ON ( u.user_id = i.user_id ) WHERE i.user_id = '.$id)) { /* * Using 1 sql statement instead of loading user classes which *************** *** 1326,1330 **** // Develop correct user post counts ! $posts = $GLOBALS['core']->getRow('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id=${id}', 1); $result['posts'] = $posts['COUNT(owner_id)']; --- 1326,1330 ---- // Develop correct user post counts ! $posts = $GLOBALS['core']->getRow('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1); $result['posts'] = $posts['COUNT(owner_id)']; *************** *** 1344,1348 **** if($result['posts']==0) { // Develop correct user post counts ! $result['posts'] = $data['posts'] = $GLOBALS['core']->getOne('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id=${id}', 1); $GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_info', 'user_id', $id); } --- 1344,1348 ---- if($result['posts']==0) { // Develop correct user post counts ! $result['posts'] = $data['posts'] = $GLOBALS['core']->getOne('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1); $GLOBALS['core']->sqlUpdate($data, 'mod_phpwsbb_user_info', 'user_id', $id); } |
|
From: Don S. <ri...@us...> - 2004-09-13 21:42:06
|
Update of /cvsroot/phpwsbb/phpwsbb/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29269/inc Modified Files: runtime.php Log Message: Switching to use single-quotes when possible for faster parsing and PEAR followingness Index: runtime.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/inc/runtime.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** runtime.php 10 Sep 2004 02:01:34 -0000 1.6 --- runtime.php 13 Sep 2004 21:41:56 -0000 1.7 *************** *** 24,30 **** */ ! require_once(PHPWS_SOURCE_DIR . "mod/phpwsbb/class/Runtime.php"); ! if($GLOBALS["module"] == "home") { // Display Forum List PHPWSBB_Runtime::showForumsBlock(); --- 24,30 ---- */ ! require_once(PHPWS_SOURCE_DIR . 'mod/phpwsbb/class/Runtime.php'); ! if($GLOBALS['module'] == 'home') { // Display Forum List PHPWSBB_Runtime::showForumsBlock(); |
|
From: Don S. <ri...@us...> - 2004-09-13 21:42:06
|
Update of /cvsroot/phpwsbb/phpwsbb/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29269/boost Modified Files: install.php uninstall.php update.php Log Message: Switching to use single-quotes when possible for faster parsing and PEAR followingness Index: uninstall.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/uninstall.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** uninstall.php 13 Sep 2004 16:31:16 -0000 1.11 --- uninstall.php 13 Sep 2004 21:41:54 -0000 1.12 *************** *** 24,33 **** */ ! require_once(PHPWS_SOURCE_DIR . "core/File.php"); ! require_once(PHPWS_SOURCE_DIR . "mod/language/class/Language.php"); ! require_once(PHPWS_SOURCE_DIR . "mod/help/class/CLS_help.php"); ! if(!$_SESSION["OBJ_user"]->isDeity()) { ! header("location:index.php"); exit(); } --- 24,33 ---- */ ! require_once(PHPWS_SOURCE_DIR . 'core/File.php'); ! require_once(PHPWS_SOURCE_DIR . 'mod/language/class/Language.php'); ! require_once(PHPWS_SOURCE_DIR . 'mod/help/class/CLS_help.php'); ! if(!$_SESSION['OBJ_user']->isDeity()) { ! header('location:index.php'); exit(); } *************** *** 35,60 **** $status = 1; ! if($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/phpwsbb/boost/uninstall.sql", 1, 1)) { ! $content .= "All Bulletin Board tables successfully removed!<br />"; // Remove search registry for old core ! if($GLOBALS["core"]->version < "0.9.3-2") ! if(isset($_SESSION["OBJ_search"])) ! $status = $GLOBALS["core"]->sqlDelete("mod_search_register", "module", "phpwsbb"); // Remove help information ! CLS_help::uninstall_help("phpwsbb"); // Remove Language ! PHPWS_Language::uninstallLanguages("phpwsbb"); // Remove uservar entries ! $_SESSION["OBJ_user"]->dropUserModule("phpwsbb"); // Remove image dir ! PHPWS_File::rmdir(PHPWS_HOME_DIR . "images/phpwsbb/"); } else { ! $content .= "There was a problem writing to the database.<br />"; $status = 0; } --- 35,60 ---- $status = 1; ! if($status = $GLOBALS['core']->sqlImport(PHPWS_SOURCE_DIR . 'mod/phpwsbb/boost/uninstall.sql', 1, 1)) { ! $content .= 'All Bulletin Board tables successfully removed!<br />'; // Remove search registry for old core ! if($GLOBALS['core']->version < '0.9.3-2') ! if(isset($_SESSION['OBJ_search'])) ! $status = $GLOBALS['core']->sqlDelete('mod_search_register', 'module', 'phpwsbb'); // Remove help information ! CLS_help::uninstall_help('phpwsbb'); // Remove Language ! PHPWS_Language::uninstallLanguages('phpwsbb'); // Remove uservar entries ! $_SESSION['OBJ_user']->dropUserModule('phpwsbb'); // Remove image dir ! PHPWS_File::rmdir(PHPWS_HOME_DIR . 'images/phpwsbb/'); } else { ! $content .= 'There was a problem writing to the database.<br />'; $status = 0; } Index: install.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** install.php 10 Sep 2004 02:01:33 -0000 1.21 --- install.php 13 Sep 2004 21:41:54 -0000 1.22 *************** *** 24,67 **** */ ! require_once(PHPWS_SOURCE_DIR . "core/File.php"); ! if(!$_SESSION["OBJ_user"]->isDeity()) { ! header("location:index.php"); exit(); } // Need to do core version check ! if(version_compare($GLOBALS["core"]->version, "0.9.3-4") < 0) { ! $content .= "This module requires a phpWebSite core version of 0.9.3-4 or greater to install.<br />"; ! $content .= "<br />You are currently using phpWebSite core version " . $GLOBALS["core"]->version . ".<br />"; return; } ! if($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/phpwsbb/boost/install.sql", TRUE)) { ! require_once(PHPWS_SOURCE_DIR . "mod/help/class/CLS_help.php"); ! CLS_help::setup_help("phpwsbb"); ! $content .= "All Bulletin Board tables successfully written.<br />"; } else { ! $content .= "There was a problem writing to the database!<br />"; } /* Create image directory */ ! PHPWS_File::makeDir($GLOBALS["core"]->home_dir . "images/phpwsbb"); ! if (is_dir($GLOBALS["core"]->home_dir . "images/phpwsbb")) { ! $content .= "phpwsBB image directory " . $GLOBALS["core"]->home_dir . "images/phpwsbb/ successfully created!<br />"; /* Copy image files */ $images = array(); ! if($handle = opendir(PHPWS_SOURCE_DIR . "mod/phpwsbb/img/")) { while (false !== ($file = readdir($handle))) { ! //if ($file != "." && $file != "..") ! if (is_file(PHPWS_SOURCE_DIR . "mod/phpwsbb/img/$file")) ! if(!copy(PHPWS_SOURCE_DIR . "mod/phpwsbb/img/$file", $GLOBALS["core"]->home_dir . "images/phpwsbb/$file")) ! $content .= "Failed to copy $file<br />\n"; } } } else ! $content .= "phpwsBB could not create the image directory: " . $GLOBALS["core"]->home_dir . "images/phpwsbb/<br />You will have to do this manually!<br />"; --- 24,67 ---- */ ! require_once(PHPWS_SOURCE_DIR . 'core/File.php'); ! if(!$_SESSION['OBJ_user']->isDeity()) { ! header('location:index.php'); exit(); } // Need to do core version check ! if(version_compare($GLOBALS['core']->version, '0.9.3-4') < 0) { ! $content .= 'This module requires a phpWebSite core version of 0.9.3-4 or greater to install.<br />'; ! $content .= '<br />You are currently using phpWebSite core version ' . $GLOBALS['core']->version . '.<br />'; return; } ! if($status = $GLOBALS['core']->sqlImport(PHPWS_SOURCE_DIR . 'mod/phpwsbb/boost/install.sql', TRUE)) { ! require_once(PHPWS_SOURCE_DIR . 'mod/help/class/CLS_help.php'); ! CLS_help::setup_help('phpwsbb'); ! $content .= 'All Bulletin Board tables successfully written.<br />'; } else { ! $content .= 'There was a problem writing to the database!<br />'; } /* Create image directory */ ! PHPWS_File::makeDir($GLOBALS['core']->home_dir . 'images/phpwsbb'); ! if (is_dir($GLOBALS['core']->home_dir . 'images/phpwsbb')) { ! $content .= 'phpwsBB image directory ' . $GLOBALS['core']->home_dir . 'images/phpwsbb/ successfully created!<br />'; /* Copy image files */ $images = array(); ! if($handle = opendir(PHPWS_SOURCE_DIR . 'mod/phpwsbb/img/')) { while (false !== ($file = readdir($handle))) { ! //if ($file != '.' && $file != '..') ! if (is_file(PHPWS_SOURCE_DIR . 'mod/phpwsbb/img/${file}')) ! if(!copy(PHPWS_SOURCE_DIR . 'mod/phpwsbb/img/${file}', $GLOBALS['core']->home_dir . 'images/phpwsbb/${file}')) ! $content .= 'Failed to copy ${file}<br />\n'; } } } else ! $content .= 'phpwsBB could not create the image directory: ' . $GLOBALS['core']->home_dir . 'images/phpwsbb/<br />You will have to do this manually!<br />'; Index: update.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** update.php 13 Sep 2004 18:23:09 -0000 1.38 --- update.php 13 Sep 2004 21:41:54 -0000 1.39 *************** *** 24,98 **** */ ! if(!$_SESSION["OBJ_user"]->isDeity()) { ! header("location:index.php"); exit(); } // Need to do core version check ! if(version_compare($GLOBALS["core"]->version, "0.9.3-4") < 0) { ! $content .= "This module requires a phpWebSite core version of 0.9.3-4 or greater to install.<br />"; ! $content .= "<br />You are currently using phpWebSite core version " . $GLOBALS["core"]->version . ".<br />"; return; } // Load needed classes ! require_once(PHPWS_SOURCE_DIR . "mod/phpwsbb/class/Manager.php"); // Load help information ! require_once(PHPWS_SOURCE_DIR . "mod/help/class/CLS_help.php"); ! CLS_help::uninstall_help("phpwsbb"); ! CLS_help::setup_help("phpwsbb"); // Update Language ! require_once(PHPWS_SOURCE_DIR . "mod/language/class/Language.php"); ! PHPWS_Language::uninstallLanguages("phpwsbb"); ! PHPWS_Language::installLanguages("phpwsbb"); $status = 1; // This might not exist during update ! if (!isset($_SESSION["PHPWSBB_Manager"])) ! $_SESSION["PHPWSBB_Manager"] = new PHPWSBB_Manager; ! if(version_compare($currentVersion, "0.4.0") < 0) { ! if ($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/phpwsbb/boost/update040.sql", TRUE)) { ! $content .= "All phpwsBB tables successfully updated.<br />"; } else { ! $content .= "There was a problem writing to the database.<br />"; } } ! if(version_compare($currentVersion, "0.5.0") < 0) { ! if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_settings ADD admin_email varchar(80), ADD email_text text, ADD monitor_posts smallint", TRUE)) { ! $content .= "phpwsBB settings table successfully modified.<br />"; ! if($status = $GLOBALS["core"]->sqlUpdate(array("email_text"=>"The thread [name] has been updated. Go to [url] to view it.", "monitor_posts"=>0), "mod_phpwsbb_settings")) { ! $content .= "phpwsBB settings table successfully updated.<br />"; } else { ! $content .= "There was a problem updating the phpwsBB settings.<br />"; } } else { ! $content .= "There was a problem modifying the phpwsBB settings table.<br />"; } } ! if(version_compare($currentVersion, "0.5.2") < 0) { // Remove hard-coded labels in subjects ! $content .= "Updating labels in sticky and locked threads ...<br />"; ! $sql = "SELECT id FROM mod_phpwsbb_threads where label like '%" . $_SESSION["translate"]->it("STICKY") . "%' or label like '%" . $_SESSION["translate"]->it("LOCKED") . "%'"; ! $result = $GLOBALS["core"]->getCol($sql,TRUE); if($result) { foreach($result as $rowid) { $thread = new PHPWSBB_Thread($rowid); ! if(strpos($thread->_label, $_SESSION["translate"]->it("STICKY"))) { ! $thread->setLabel(str_replace("[" . $_SESSION["translate"]->it("STICKY") . "] ", "", $thread->_label)); $thread->commit(); ! $content .= "Updated sticky thread " . $thread->_label . ".<br />"; } ! if(strpos($thread->_label, $_SESSION["translate"]->it("LOCKED"))) { ! $thread->setLabel(str_replace("[" . $_SESSION["translate"]->it("LOCKED") . "] ", "", $thread->_label)); $thread->commit(); ! $content .= "Updated locked thread " . $thread->_label . ".<br />"; } --- 24,98 ---- */ ! if(!$_SESSION['OBJ_user']->isDeity()) { ! header('location:index.php'); exit(); } // Need to do core version check ! if(version_compare($GLOBALS['core']->version, '0.9.3-4') < 0) { ! $content .= 'This module requires a phpWebSite core version of 0.9.3-4 or greater to install.<br />'; ! $content .= '<br />You are currently using phpWebSite core version ' . $GLOBALS['core']->version . '.<br />'; return; } // Load needed classes ! require_once(PHPWS_SOURCE_DIR . 'mod/phpwsbb/class/Manager.php'); // Load help information ! require_once(PHPWS_SOURCE_DIR . 'mod/help/class/CLS_help.php'); ! CLS_help::uninstall_help('phpwsbb'); ! CLS_help::setup_help('phpwsbb'); // Update Language ! require_once(PHPWS_SOURCE_DIR . 'mod/language/class/Language.php'); ! PHPWS_Language::uninstallLanguages('phpwsbb'); ! PHPWS_Language::installLanguages('phpwsbb'); $status = 1; // This might not exist during update ! if (!isset($_SESSION['PHPWSBB_Manager'])) ! $_SESSION['PHPWSBB_Manager'] = new PHPWSBB_Manager; ! if(version_compare($currentVersion, '0.4.0') < 0) { ! if ($status = $GLOBALS['core']->sqlImport(PHPWS_SOURCE_DIR . 'mod/phpwsbb/boost/update040.sql', TRUE)) { ! $content .= 'All phpwsBB tables successfully updated.<br />'; } else { ! $content .= 'There was a problem writing to the database.<br />'; } } ! if(version_compare($currentVersion, '0.5.0') < 0) { ! if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_settings ADD admin_email varchar(80), ADD email_text text, ADD monitor_posts smallint', TRUE)) { ! $content .= 'phpwsBB settings table successfully modified.<br />'; ! if($status = $GLOBALS['core']->sqlUpdate(array('email_text'=>'The thread [name] has been updated. Go to [url] to view it.', 'monitor_posts'=>0), 'mod_phpwsbb_settings')) { ! $content .= 'phpwsBB settings table successfully updated.<br />'; } else { ! $content .= 'There was a problem updating the phpwsBB settings.<br />'; } } else { ! $content .= 'There was a problem modifying the phpwsBB settings table.<br />'; } } ! if(version_compare($currentVersion, '0.5.2') < 0) { // Remove hard-coded labels in subjects ! $content .= 'Updating labels in sticky and locked threads ...<br />'; ! $sql = "SELECT id FROM mod_phpwsbb_threads where label like '%" . $_SESSION['translate']->it('STICKY') . "%' or label like '%" . $_SESSION['translate']->it('LOCKED') . "%'"; ! $result = $GLOBALS['core']->getCol($sql,TRUE); if($result) { foreach($result as $rowid) { $thread = new PHPWSBB_Thread($rowid); ! if(strpos($thread->_label, $_SESSION['translate']->it('STICKY'))) { ! $thread->setLabel(str_replace('[' . $_SESSION['translate']->it('STICKY') . '] ', '', $thread->_label)); $thread->commit(); ! $content .= 'Updated sticky thread ' . $thread->_label . '.<br />'; } ! if(strpos($thread->_label, $_SESSION['translate']->it('LOCKED'))) { ! $thread->setLabel(str_replace('[' . $_SESSION['translate']->it('LOCKED') . '] ', '', $thread->_label)); $thread->commit(); ! $content .= 'Updated locked thread ' . $thread->_label . '.<br />'; } *************** *** 102,123 **** } ! if(version_compare($currentVersion, "0.5.3") < 0) { // Remove hard-coded labels in subjects ! $content .= "Updating labels in messages ...<br />"; ! $sql = "SELECT id FROM mod_phpwsbb_messages"; ! $result = $GLOBALS["core"]->getCol($sql,TRUE); if($result) { foreach($result as $rowid) { $message = new PHPWSBB_Message($rowid); ! if(strpos($message->_label, $_SESSION["translate"]->it("STICKY"))) { ! $message->setLabel(str_replace("[" . $_SESSION["translate"]->it("STICKY") . "] ", "", $message->_label)); $message->commit(); ! $content .= "Updated message " . $message->_label . ".<br />"; } ! if(strpos($message->_label, $_SESSION["translate"]->it("LOCKED"))) { ! $message->setLabel(str_replace("[" . $_SESSION["translate"]->it("LOCKED") . "] ", "", $message->_label)); $message->commit(); ! $content .= "Updated message " . $message->_label . ".<br />"; } --- 102,123 ---- } ! if(version_compare($currentVersion, '0.5.3') < 0) { // Remove hard-coded labels in subjects ! $content .= 'Updating labels in messages ...<br />'; ! $sql = 'SELECT id FROM mod_phpwsbb_messages'; ! $result = $GLOBALS['core']->getCol($sql,TRUE); if($result) { foreach($result as $rowid) { $message = new PHPWSBB_Message($rowid); ! if(strpos($message->_label, $_SESSION['translate']->it('STICKY'))) { ! $message->setLabel(str_replace('[' . $_SESSION['translate']->it('STICKY') . '] ', '', $message->_label)); $message->commit(); ! $content .= 'Updated message ' . $message->_label . '.<br />'; } ! if(strpos($message->_label, $_SESSION['translate']->it('LOCKED'))) { ! $message->setLabel(str_replace('[' . $_SESSION['translate']->it('LOCKED') . '] ', '', $message->_label)); $message->commit(); ! $content .= 'Updated message ' . $message->_label . '.<br />'; } *************** *** 127,182 **** } ! if(version_compare($currentVersion, "0.6.0") < 0) { ! if ($status = $GLOBALS["core"]->sqlImport(PHPWS_SOURCE_DIR . "mod/phpwsbb/boost/update060.sql", TRUE)) { ! $content .= "All phpwsBB tables successfully updated.<br />"; } else { ! $content .= "There was a problem writing to the database.<br />"; } ! if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_threads ADD fid int NOT NULL default 0", TRUE)) { ! $content .= "Successfully modified the phpwsBB threads table.<br />"; // Add one forum and assign all threads to it. $forum = new PHPWSBB_Forum(); ! $forum->setLabel("General Discussion"); ! $forum->_description = "Topics on anything and everything."; $forum->commit(); ! if($status = $GLOBALS["core"]->sqlUpdate(array("fid"=>$forum->getId()),"mod_phpwsbb_threads")) { ! $content .= "Successfully added default forum and assigned all threads to it.<br />"; $forum->updateForum(); } } else { ! $content .= "There was a problem modifying the phpwsBB threads table.<br />"; } ! $content .= "Setting manager to NULL ... "; ! $_SESSION["PHPWSBB_Manager"] = NULL; ! if(is_null($_SESSION["PHPWSBB_Manager"])) ! $content .= "Done<br />"; else ! $content .= "NO<br />"; ! $content .= "Unsetting manager ... "; ! unset($_SESSION["PHPWSBB_Manager"]); ! if(!isset($_SESSION["PHPWSBB_Manager"])) ! $content .= "Done<br />"; else ! $content .= "NO<br />"; } ! if(version_compare($currentVersion, "0.7.0") < 0) { ! if($status = $GLOBALS["core"]->sqlCreateIndex("mod_phpwsbb_threads",array("fid"))) ! if($status = $GLOBALS["core"]->sqlCreateIndex("mod_phpwsbb_messages",array("tid"))) ! if($status = $GLOBALS["core"]->sqlCreateIndex("mod_phpwsbb_monitors",array("thread_id"))) ! $content .= "Successfully added foreign key indexes.<br />"; } ! if(version_compare($currentVersion, "0.8.0") < 0) { ! if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_threads ADD lastpost int NOT NULL default 0", TRUE)) { ! if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_forums ADD lastpost int NOT NULL default 0", TRUE)) { ! $sql = "SELECT id FROM mod_phpwsbb_threads"; ! $result = $GLOBALS["core"]->getCol($sql,TRUE); if($result) { foreach($result as $rowid) { --- 127,182 ---- } ! if(version_compare($currentVersion, '0.6.0') < 0) { ! if ($status = $GLOBALS['core']->sqlImport(PHPWS_SOURCE_DIR . 'mod/phpwsbb/boost/update060.sql', TRUE)) { ! $content .= 'All phpwsBB tables successfully updated.<br />'; } else { ! $content .= 'There was a problem writing to the database.<br />'; } ! if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_threads ADD fid int NOT NULL default 0', TRUE)) { ! $content .= 'Successfully modified the phpwsBB threads table.<br />'; // Add one forum and assign all threads to it. $forum = new PHPWSBB_Forum(); ! $forum->setLabel('General Discussion'); ! $forum->_description = 'Topics on anything and everything.'; $forum->commit(); ! if($status = $GLOBALS['core']->sqlUpdate(array('fid'=>$forum->getId()),'mod_phpwsbb_threads')) { ! $content .= 'Successfully added default forum and assigned all threads to it.<br />'; $forum->updateForum(); } } else { ! $content .= 'There was a problem modifying the phpwsBB threads table.<br />'; } ! $content .= 'Setting manager to NULL ... '; ! $_SESSION['PHPWSBB_Manager'] = NULL; ! if(is_null($_SESSION['PHPWSBB_Manager'])) ! $content .= 'Done<br />'; else ! $content .= 'NO<br />'; ! $content .= 'Unsetting manager ... '; ! unset($_SESSION['PHPWSBB_Manager']); ! if(!isset($_SESSION['PHPWSBB_Manager'])) ! $content .= 'Done<br />'; else ! $content .= 'NO<br />'; } ! if(version_compare($currentVersion, '0.7.0') < 0) { ! if($status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_threads',array('fid'))) ! if($status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_messages',array('tid'))) ! if($status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_monitors',array('thread_id'))) ! $content .= 'Successfully added foreign key indexes.<br />'; } ! if(version_compare($currentVersion, '0.8.0') < 0) { ! if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_threads ADD lastpost int NOT NULL default 0', TRUE)) { ! if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_forums ADD lastpost int NOT NULL default 0', TRUE)) { ! $sql = 'SELECT id FROM mod_phpwsbb_threads'; ! $result = $GLOBALS['core']->getCol($sql,TRUE); if($result) { foreach($result as $rowid) { *************** *** 186,251 **** } ! $content .= "Successfully modified the phpwsBB threads table.<br />"; } else { ! $content .= "There was a problem modifying the phpwsBB forums table.<br />"; } } else { ! $content .= "There was a problem modifying the phpwsBB threads table.<br />"; } ! if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_settings ADD showforumsblock smallint NOT NULL default 1, ADD forumsblocktitle varchar(80) NULL, ADD showlatestthreadsblock smallint NOT NULL default 1, ADD latestthreadsblocktitle varchar(80) NULL, ADD maxlatestthreads int NOT NULL default 0", TRUE)) { ! $content .= "phpwsBB settings table successfully modified.<br />"; ! if($status = $GLOBALS["core"]->sqlUpdate( ! array( "showforumsblock"=>1, ! "forumsblocktitle"=>"Forums", ! "showlatestthreadsblock"=>1, ! "latestthreadsblocktitle"=>"Latest Forum Posts", ! "maxlatestthreads"=>5 ) ! , "mod_phpwsbb_settings")) { ! $content .= "phpwsBB settings table successfully updated.<br />"; } else { ! $content .= "There was a problem updating the phpwsBB settings.<br />"; } } else { ! $content .= "There was a problem modifying the phpwsBB settings table.<br />"; } } ! if(version_compare($currentVersion, "0.9.0") < 0) { ! if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_settings ADD bboffline smallint NOT NULL default '0', ADD allow_user_monitors smallint NOT NULL default '1'", TRUE)) { ! $content .= "phpwsBB settings table successfully updated.<br />"; ! if($status = $GLOBALS["core"]->sqlUpdate( ! array( "allow_user_monitors"=>1, ! "bboffline"=>0 ) ! , "mod_phpwsbb_settings")) { ! $content .= "phpwsBB settings table successfully updated.<br />"; } else { ! $content .= "There was a problem updating the phpwsBB settings.<br />"; } } else { ! $content .= "There was a problem updating the phpwsBB settings.<br />"; } } ! if(version_compare($currentVersion, "0.9.1") < 0) { /* Create image directory */ ! PHPWS_File::makeDir($GLOBALS["core"]->home_dir . "images/phpwsbb"); ! if (is_dir($GLOBALS["core"]->home_dir . "images/phpwsbb")) { ! $content .= "phpwsBB image directory " . $GLOBALS["core"]->home_dir . "images/phpwsbb/ successfully created!<br />"; /* Copy image files */ $images = array(); ! if($handle = opendir(PHPWS_SOURCE_DIR . "mod/phpwsbb/img/")) { while (false !== ($file = readdir($handle))) { ! //if ($file != "." && $file != "..") ! if (is_file(PHPWS_SOURCE_DIR . "mod/phpwsbb/img/$file")) ! if(!copy(PHPWS_SOURCE_DIR . "mod/phpwsbb/img/$file", $GLOBALS["core"]->home_dir . "images/phpwsbb/$file")) ! $content .= "Failed to copy $file<br />\n"; } } } else ! $content .= "phpwsBB could not create the image directory: " . $GLOBALS["core"]->home_dir . "images/phpwsbb/<br />You will have to do this manually!<br />"; } ! if(version_compare($currentVersion, "1.0.0") < 0) { if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_messages ADD owner_id int NOT NULL default 0 AFTER owner', TRUE) && $status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_messages',array('owner_id'))) { --- 186,251 ---- } ! $content .= 'Successfully modified the phpwsBB threads table.<br />'; } else { ! $content .= 'There was a problem modifying the phpwsBB forums table.<br />'; } } else { ! $content .= 'There was a problem modifying the phpwsBB threads table.<br />'; } ! if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_settings ADD showforumsblock smallint NOT NULL default 1, ADD forumsblocktitle varchar(80) NULL, ADD showlatestthreadsblock smallint NOT NULL default 1, ADD latestthreadsblocktitle varchar(80) NULL, ADD maxlatestthreads int NOT NULL default 0', TRUE)) { ! $content .= 'phpwsBB settings table successfully modified.<br />'; ! if($status = $GLOBALS['core']->sqlUpdate( ! array( 'showforumsblock'=>1, ! 'forumsblocktitle'=>'Forums', ! 'showlatestthreadsblock'=>1, ! 'latestthreadsblocktitle'=>'Latest Forum Posts', ! 'maxlatestthreads'=>5 ) ! , 'mod_phpwsbb_settings')) { ! $content .= 'phpwsBB settings table successfully updated.<br />'; } else { ! $content .= 'There was a problem updating the phpwsBB settings.<br />'; } } else { ! $content .= 'There was a problem modifying the phpwsBB settings table.<br />'; } } ! if(version_compare($currentVersion, '0.9.0') < 0) { ! if($status = $GLOBALS['core']->query("ALTER TABLE mod_phpwsbb_settings ADD bboffline smallint NOT NULL default '0', ADD allow_user_monitors smallint NOT NULL default '1'", TRUE)) { ! $content .= 'phpwsBB settings table successfully updated.<br />'; ! if($status = $GLOBALS['core']->sqlUpdate( ! array( 'allow_user_monitors'=>1, ! 'bboffline'=>0 ) ! , 'mod_phpwsbb_settings')) { ! $content .= 'phpwsBB settings table successfully updated.<br />'; } else { ! $content .= 'There was a problem updating the phpwsBB settings.<br />'; } } else { ! $content .= 'There was a problem updating the phpwsBB settings.<br />'; } } ! if(version_compare($currentVersion, '0.9.1') < 0) { /* Create image directory */ ! PHPWS_File::makeDir($GLOBALS['core']->home_dir . 'images/phpwsbb'); ! if (is_dir($GLOBALS['core']->home_dir . 'images/phpwsbb')) { ! $content .= 'phpwsBB image directory ' . $GLOBALS['core']->home_dir . 'images/phpwsbb/ successfully created!<br />'; /* Copy image files */ $images = array(); ! if($handle = opendir(PHPWS_SOURCE_DIR . 'mod/phpwsbb/img/')) { while (false !== ($file = readdir($handle))) { ! //if ($file != '.' && $file != '..') ! if (is_file(PHPWS_SOURCE_DIR . 'mod/phpwsbb/img/${file}')) ! if(!copy(PHPWS_SOURCE_DIR . 'mod/phpwsbb/img/${file}', $GLOBALS['core']->home_dir . 'images/phpwsbb/${file}')) ! $content .= 'Failed to copy ${file}<br />\n'; } } } else ! $content .= 'phpwsBB could not create the image directory: ' . $GLOBALS['core']->home_dir . 'images/phpwsbb/<br />You will have to do this manually!<br />'; } ! if(version_compare($currentVersion, '1.0.0') < 0) { if($status = $GLOBALS['core']->query('ALTER TABLE mod_phpwsbb_messages ADD owner_id int NOT NULL default 0 AFTER owner', TRUE) && $status = $GLOBALS['core']->sqlCreateIndex('mod_phpwsbb_messages',array('owner_id'))) { |
|
From: Don S. <ri...@us...> - 2004-09-13 21:42:06
|
Update of /cvsroot/phpwsbb/phpwsbb/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29269/docs Modified Files: ChangeLog Log Message: Switching to use single-quotes when possible for faster parsing and PEAR followingness Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/docs/ChangeLog,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** ChangeLog 13 Sep 2004 16:07:48 -0000 1.113 --- ChangeLog 13 Sep 2004 21:41:56 -0000 1.114 *************** *** 4,7 **** --- 4,8 ---- 13 Sep 2004; Don Seiler <do...@NO...> PATCH #1002850: Patch from Eloi that changes everything. + Switched to using single-quotes for faster parsing possibilities. *phpwsbb-0.9.7 (10 Aug 2004) |
|
From: Don S. <ri...@us...> - 2004-09-13 21:42:05
|
Update of /cvsroot/phpwsbb/phpwsbb/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29269/conf Modified Files: boost.php controlpanel.php help.php layout.php manager.php menuman.php search.php Log Message: Switching to use single-quotes when possible for faster parsing and PEAR followingness Index: controlpanel.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/controlpanel.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** controlpanel.php 10 Sep 2004 02:01:34 -0000 1.7 --- controlpanel.php 13 Sep 2004 21:41:55 -0000 1.8 *************** *** 24,43 **** */ ! $image["name"] = "phpwsbb.png"; ! $image["alt"] = "Author: Don Seiler"; ! $link[] = array ("label"=>"Bulletin Board", ! "module"=>"phpwsbb", ! "url"=>"index.php?module=phpwsbb&PHPWSBB_MAN_OP=list", ! "image"=>$image, ! "description"=>"A bulletin board module.", ! "tab"=>"content"); ! $link[] = array ("label"=>"Set My Bulletin Board Preferences", ! "module"=>"phpwsbb", ! "url"=>"index.php?module=phpwsbb&PHPWSBB_MAN_OP=usersettings", ! "image"=>$image, ! "description"=>"Allows you to set your bulletin board preferences.", ! "tab"=>"my_settings"); ?> --- 24,43 ---- */ ! $image['name'] = 'phpwsbb.png'; ! $image['alt'] = 'Author: Don Seiler'; ! $link[] = array ('label'=>'Bulletin Board', ! 'module'=>'phpwsbb', ! 'url'=>'index.php?module=phpwsbb&PHPWSBB_MAN_OP=list', ! 'image'=>$image, ! 'description'=>'A bulletin board module.', ! 'tab'=>'content'); ! $link[] = array ('label'=>'Set My Bulletin Board Preferences', ! 'module'=>'phpwsbb', ! 'url'=>'index.php?module=phpwsbb&PHPWSBB_MAN_OP=usersettings', ! 'image'=>$image, ! 'description'=>'Allows you to set your bulletin board preferences.', ! 'tab'=>'my_settings'); ?> Index: search.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/search.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** search.php 10 Sep 2004 02:01:34 -0000 1.5 --- search.php 13 Sep 2004 21:41:55 -0000 1.6 *************** *** 24,35 **** */ ! $module = "phpwsbb"; ! $search_class = "PHPWSBB_Manager"; ! $search_function = "search"; ! $search_cols = "label, body, owner"; ! $view_string = "&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]="; $show_block = 1; ! $block_title = "Bulletin Board"; ! $class_file = "Manager.php"; ?> --- 24,35 ---- */ ! $module = 'phpwsbb'; ! $search_class = 'PHPWSBB_Manager'; ! $search_function = 'search'; ! $search_cols = 'label, body, owner'; ! $view_string = '&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]='; $show_block = 1; ! $block_title = 'Bulletin Board'; ! $class_file = 'Manager.php'; ?> Index: boost.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/boost.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** boost.php 13 Sep 2004 16:07:17 -0000 1.37 --- boost.php 13 Sep 2004 21:41:55 -0000 1.38 *************** *** 24,39 **** */ ! $mod_title = "phpwsbb"; ! $mod_pname = "Bulletin Board"; ! $mod_directory = "phpwsbb"; ! $mod_filename = "index.php"; ! $allow_view = "all"; $priority = 50; $admin_mod = 1; ! $active = "on"; ! $version = "1.0.0"; ! $admin_op = "&PHPWSBB_MAN_OP=list"; ! $mod_class_files = array("Manager.php"); ! $mod_sessions = array("PHPWSBB_Manager"); ?> --- 24,39 ---- */ ! $mod_title = 'phpwsbb'; ! $mod_pname = 'Bulletin Board'; ! $mod_directory = 'phpwsbb'; ! $mod_filename = 'index.php'; ! $allow_view = 'all'; $priority = 50; $admin_mod = 1; ! $active = 'on'; ! $version = '1.0.0'; ! $admin_op = '&PHPWSBB_MAN_OP=list'; ! $mod_class_files = array('Manager.php'); ! $mod_sessions = array('PHPWSBB_Manager'); ?> Index: manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/manager.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** manager.php 10 Sep 2004 02:01:34 -0000 1.12 --- manager.php 13 Sep 2004 21:41:55 -0000 1.13 *************** *** 25,110 **** /* The name of my lists and their corresponding database constraints */ ! $lists = array( "forums"=>"approved=1", ! "threads"=>"approved=1"); /* The name of the tables to pull the lists from */ ! $tables = array("forums"=>"mod_phpwsbb_forums", ! "threads"=>"mod_phpwsbb_threads"); /* The directory where my templates are located */ ! $templates = array( "forums"=>"forums", ! "threads"=>"threads"); ! /* The columns to list for my defined "saved" list and their labels */ ! $forumsColumns = array( "label"=>$_SESSION["translate"]->it("Forum"), ! "description"=>$_SESSION["translate"]->it("Description"), ! "threads"=>$_SESSION["translate"]->it("Topics"), ! "lastpost"=>$_SESSION["translate"]->it("Last Post"), ! "posts"=>$_SESSION["translate"]->it("Posts"), ! "lastpost_topic_label"=>NULL, ! "lastpost_topic_id"=>NULL, ! "lastpost_post_id"=>NULL, ! "editor"=>NULL, ! "id"=>NULL ); ! /* The actions to show in the defined "saved" list and their labels */ ! $forumsActions = array( "view"=>"View", ! "delete"=>"Delete", ! "hide"=>"Hide", ! "show"=>"Show" ); /* The permissions associated with the defined actions above */ ! $forumsPermissions = array( "view"=>NULL, ! "delete"=>"delete_forums", ! "hide"=>"hide_forums", ! "show"=>"hide_forums" ); /* The paging parameters for the list */ ! $forumsPaging = array( "op"=>"PHPWSBB_MAN_OP=list", ! "limit"=>50, ! "section"=>1, ! "limits"=>array(5,10,25,50), ! "back"=>"<<", ! "forward"=>">>" ); ! /* The columns to list for my defined "saved" list and their labels */ ! $threadsColumns = array( "label"=>$_SESSION["translate"]->it("Topic"), ! "owner"=>$_SESSION["translate"]->it("Poster"), ! "replies"=>$_SESSION["translate"]->it("Replies"), ! "lastpost"=>$_SESSION["translate"]->it("Last Post"), ! "id"=>NULL, ! "locked"=>NULL, ! "lastpost_post_id"=>NULL, ! "lastpost_post_owner"=>NULL, ! "sticky"=>NULL ); ! /* The actions to show in the defined "saved" list and their labels */ ! $threadsActions = array( "view"=>"View", ! "delete"=>"Delete", ! "lock"=>"Lock", ! "unlock"=>"Unlock", ! "hide"=>"Hide", ! "show"=>"Show" ); /* The permissions associated with the defined actions above */ ! $threadsPermissions = array( "view"=>NULL, ! "delete"=>"delete_threads", ! "lock"=>"lock_threads", ! "unlock"=>"lock_threads", ! "hide"=>"hide_threads", ! "show"=>"hide_threads" ); /* The paging parameters for the list */ ! $threadsPaging = array( "op"=>"PHPWSBB_MAN_OP=viewforum", ! "limit"=>50, ! "section"=>1, ! "limits"=>array(5,10,25,50), ! "back"=>"<<", ! "forward"=>">>" ); ?> --- 25,110 ---- /* The name of my lists and their corresponding database constraints */ ! $lists = array( 'forums'=>'approved=1', ! 'threads'=>'approved=1'); /* The name of the tables to pull the lists from */ ! $tables = array('forums'=>'mod_phpwsbb_forums', ! 'threads'=>'mod_phpwsbb_threads'); /* The directory where my templates are located */ ! $templates = array( 'forums'=>'forums', ! 'threads'=>'threads'); ! /* The columns to list for my defined 'saved' list and their labels */ ! $forumsColumns = array( 'label'=>$_SESSION['translate']->it('Forum'), ! 'description'=>$_SESSION['translate']->it('Description'), ! 'threads'=>$_SESSION['translate']->it('Topics'), ! 'lastpost'=>$_SESSION['translate']->it('Last Post'), ! 'posts'=>$_SESSION['translate']->it('Posts'), ! 'lastpost_topic_label'=>NULL, ! 'lastpost_topic_id'=>NULL, ! 'lastpost_post_id'=>NULL, ! 'editor'=>NULL, ! 'id'=>NULL ); ! /* The actions to show in the defined 'saved' list and their labels */ ! $forumsActions = array( 'view'=>'View', ! 'delete'=>'Delete', ! 'hide'=>'Hide', ! 'show'=>'Show' ); /* The permissions associated with the defined actions above */ ! $forumsPermissions = array( 'view'=>NULL, ! 'delete'=>'delete_forums', ! 'hide'=>'hide_forums', ! 'show'=>'hide_forums' ); /* The paging parameters for the list */ ! $forumsPaging = array( 'op'=>'PHPWSBB_MAN_OP=list', ! 'limit'=>50, ! 'section'=>1, ! 'limits'=>array(5,10,25,50), ! 'back'=>'<<', ! 'forward'=>'>>' ); ! /* The columns to list for my defined 'saved' list and their labels */ ! $threadsColumns = array( 'label'=>$_SESSION['translate']->it('Topic'), ! 'owner'=>$_SESSION['translate']->it('Poster'), ! 'replies'=>$_SESSION['translate']->it('Replies'), ! 'lastpost'=>$_SESSION['translate']->it('Last Post'), ! 'id'=>NULL, ! 'locked'=>NULL, ! 'lastpost_post_id'=>NULL, ! 'lastpost_post_owner'=>NULL, ! 'sticky'=>NULL ); ! /* The actions to show in the defined 'saved' list and their labels */ ! $threadsActions = array( 'view'=>'View', ! 'delete'=>'Delete', ! 'lock'=>'Lock', ! 'unlock'=>'Unlock', ! 'hide'=>'Hide', ! 'show'=>'Show' ); /* The permissions associated with the defined actions above */ ! $threadsPermissions = array( 'view'=>NULL, ! 'delete'=>'delete_threads', ! 'lock'=>'lock_threads', ! 'unlock'=>'lock_threads', ! 'hide'=>'hide_threads', ! 'show'=>'hide_threads' ); /* The paging parameters for the list */ ! $threadsPaging = array( 'op'=>'PHPWSBB_MAN_OP=viewforum', ! 'limit'=>50, ! 'section'=>1, ! 'limits'=>array(5,10,25,50), ! 'back'=>'<<', ! 'forward'=>'>>' ); ?> Index: layout.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/layout.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** layout.php 10 Sep 2004 02:01:34 -0000 1.6 --- layout.php 13 Sep 2004 21:41:55 -0000 1.7 *************** *** 24,35 **** */ ! $layout_info[] = array( "content_var"=>"CNT_phpwsbb", ! "transfer_var"=>"body"); ! $layout_info[] = array( "content_var"=>"CNT_phpwsbb_forumsblock", ! "transfer_var"=>"right_col_top"); ! $layout_info[] = array( "content_var"=>"CNT_phpwsbb_latestthreadsblock", ! "transfer_var"=>"right_col_mid"); ?> --- 24,35 ---- */ ! $layout_info[] = array( 'content_var'=>'CNT_phpwsbb', ! 'transfer_var'=>'body'); ! $layout_info[] = array( 'content_var'=>'CNT_phpwsbb_forumsblock', ! 'transfer_var'=>'right_col_top'); ! $layout_info[] = array( 'content_var'=>'CNT_phpwsbb_latestthreadsblock', ! 'transfer_var'=>'right_col_mid'); ?> Index: menuman.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/menuman.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** menuman.php 10 Sep 2004 02:01:34 -0000 1.6 --- menuman.php 13 Sep 2004 21:41:55 -0000 1.7 *************** *** 24,27 **** */ ! $link[$_SESSION["translate"]->it("Bulletin Board")] = "index.php?module=phpwsbb&PHPWSBB_MAN_OP=list"; ?> --- 24,27 ---- */ ! $link[$_SESSION['translate']->it('Bulletin Board')] = 'index.php?module=phpwsbb&PHPWSBB_MAN_OP=list'; ?> Index: help.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/help.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** help.php 10 Sep 2004 02:01:34 -0000 1.11 --- help.php 13 Sep 2004 21:41:55 -0000 1.12 *************** *** 24,47 **** */ ! $admin_email = "Bulletin Board Administrator Email"; ! $admin_email_content = "Enter in the email address of the bulletin board administrator, if he/she is different than the overall phpWebSite administrator. If this field is left blank, then phpwsBB will use the contact email address in the User control panel's Settings screen."; ! $email_text = "Notification Email Text"; ! $email_text_content = "This is the text sent to users who are monitoring threads when those threads are replied to. Enter in the text you would like to appear in the body of the email message. You can use variables [name] and [url] to represent the name of the thread and the url to view the thread, respectively."; ! $monitor_posts = "Monitor Posts"; ! $monitor_posts_content = "Enabling this setting will have all posts emailed to the bulletin board administrator email (or the website admin if it is blank)."; ! $sortorder = "Forum Sort Order"; ! $sortorder_content = "This value sets the order in which the forums are listed on the Forums page. Must be an integer value."; ! $bboffline = "Take Bulletin Board Offline"; ! $bboffline_content = "Checking this will prevent non-deity users from accessing the bulletin board. They will be presented with a message indicating the bulletin board is offline for maintenance. This can be used when doing upgrades or maintenance like cleaning/moving messages and threads."; ! $suspend_monitors = "Suspend Monitors"; ! $suspend_monitors_content = "Checking this will suspend the sending of emails that would notify you when someone has replied to a thread that you are monitoring. This is useful if you are going on vacation, for example."; ! $remove_all_monitors = "Remove All Monitors"; ! $remove_all_monitors_content = "This will clear all monitors so you will no longer be monitoring any threads."; ?> --- 24,47 ---- */ ! $admin_email = 'Bulletin Board Administrator Email'; ! $admin_email_content = 'Enter in the email address of the bulletin board administrator, if he/she is different than the overall phpWebSite administrator. If this field is left blank, then phpwsBB will use the contact email address in the User control panel\'s Settings screen.'; ! $email_text = 'Notification Email Text'; ! $email_text_content = 'This is the text sent to users who are monitoring threads when those threads are replied to. Enter in the text you would like to appear in the body of the email message. You can use variables [name] and [url] to represent the name of the thread and the url to view the thread, respectively.'; ! $monitor_posts = 'Monitor Posts'; ! $monitor_posts_content = 'Enabling this setting will have all posts emailed to the bulletin board administrator email (or the website admin if it is blank).'; ! $sortorder = 'Forum Sort Order'; ! $sortorder_content = 'This value sets the order in which the forums are listed on the Forums page. Must be an integer value.'; ! $bboffline = 'Take Bulletin Board Offline'; ! $bboffline_content = 'Checking this will prevent non-deity users from accessing the bulletin board. They will be presented with a message indicating the bulletin board is offline for maintenance. This can be used when doing upgrades or maintenance like cleaning/moving messages and threads.'; ! $suspend_monitors = 'Suspend Monitors'; ! $suspend_monitors_content = 'Checking this will suspend the sending of emails that would notify you when someone has replied to a thread that you are monitoring. This is useful if you are going on vacation, for example.'; ! $remove_all_monitors = 'Remove All Monitors'; ! $remove_all_monitors_content = 'This will clear all monitors so you will no longer be monitoring any threads.'; ?> |
|
From: Don S. <ri...@us...> - 2004-09-13 21:42:03
|
Update of /cvsroot/phpwsbb/phpwsbb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29269 Modified Files: index.php Log Message: Switching to use single-quotes when possible for faster parsing and PEAR followingness Index: index.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/index.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** index.php 10 Sep 2004 02:01:32 -0000 1.10 --- index.php 13 Sep 2004 21:41:54 -0000 1.11 *************** *** 24,48 **** */ ! $CNT_phpwsbb["content"] = NULL; ! if (!isset($_SESSION["PHPWSBB_Manager"])) ! $_SESSION["PHPWSBB_Manager"] = new PHPWSBB_Manager; ! if ($_SESSION["PHPWSBB_Manager"]->offline() && !$_SESSION["OBJ_user"]->isDeity()) { ! $CNT_phpwsbb["title"] = $_SESSION["translate"]->it("Bulletin Board Offline"); ! $CNT_phpwsbb["content"] = $_SESSION["translate"]->it("Sorry, the bulletin board is currently down for maintenance."); } else { ! if (isset($_REQUEST["PHPWSBB_MAN_OP"])) { ! $_SESSION["PHPWSBB_Manager"]->action(); } ! if (isset($_REQUEST["PHPWSBB_FORUM_OP"]) && isset($_SESSION["PHPWSBB_Manager"]->forum)) ! $_SESSION["PHPWSBB_Manager"]->forum->action(); ! if (isset($_REQUEST["PHPWSBB_THREAD_OP"]) && isset($_SESSION["PHPWSBB_Manager"]->thread)) ! $_SESSION["PHPWSBB_Manager"]->thread->action(); ! if (isset($_REQUEST["PHPWSBB_MESSAGE_OP"]) && isset($_SESSION["PHPWSBB_Manager"]->message)) ! $_SESSION["PHPWSBB_Manager"]->message->action(); } ?> --- 24,48 ---- */ ! $CNT_phpwsbb['content'] = NULL; ! if (!isset($_SESSION['PHPWSBB_Manager'])) ! $_SESSION['PHPWSBB_Manager'] = new PHPWSBB_Manager; ! if ($_SESSION['PHPWSBB_Manager']->offline() && !$_SESSION['OBJ_user']->isDeity()) { ! $CNT_phpwsbb['title'] = $_SESSION['translate']->it('Bulletin Board Offline'); ! $CNT_phpwsbb['content'] = $_SESSION['translate']->it('Sorry, the bulletin board is currently down for maintenance.'); } else { ! if (isset($_REQUEST['PHPWSBB_MAN_OP'])) { ! $_SESSION['PHPWSBB_Manager']->action(); } ! if (isset($_REQUEST['PHPWSBB_FORUM_OP']) && isset($_SESSION['PHPWSBB_Manager']->forum)) ! $_SESSION['PHPWSBB_Manager']->forum->action(); ! if (isset($_REQUEST['PHPWSBB_THREAD_OP']) && isset($_SESSION['PHPWSBB_Manager']->thread)) ! $_SESSION['PHPWSBB_Manager']->thread->action(); ! if (isset($_REQUEST['PHPWSBB_MESSAGE_OP']) && isset($_SESSION['PHPWSBB_Manager']->message)) ! $_SESSION['PHPWSBB_Manager']->message->action(); } ?> |
|
From: Don S. <ri...@us...> - 2004-09-13 19:48:32
|
Update of /cvsroot/phpwsbb/phpwsbb/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4472/boost Modified Files: install.sql Log Message: Fixer upper Index: install.sql =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.sql,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** install.sql 13 Sep 2004 19:12:04 -0000 1.17 --- install.sql 13 Sep 2004 19:48:23 -0000 1.18 *************** *** 16,20 **** sortorder int NOT NULL default '0', lastpost int NOT NULL default '0', ! posts int NOT NULL default '0', lastpost_topic_label text NOT NULL, lastpost_topic_id int NOT NULL default '0', --- 16,20 ---- sortorder int NOT NULL default '0', lastpost int NOT NULL default '0', ! posts int NOT NULL default '0', lastpost_topic_label text NOT NULL, lastpost_topic_id int NOT NULL default '0', |
|
From: Don S. <ri...@us...> - 2004-09-13 19:47:46
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4256/class Modified Files: Manager.php Log Message: anal single-quote stuff Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Manager.php 13 Sep 2004 18:17:20 -0000 1.40 --- Manager.php 13 Sep 2004 19:47:36 -0000 1.41 *************** *** 1293,1297 **** function _load_user_ranks () { ! $results = $GLOBALS["core"]->sqlSelect('mod_phpwsbb_user_ranks',NULL,NULL,'rank_min'); if($results) $this->_user_ranks = $results; --- 1293,1297 ---- function _load_user_ranks () { ! $results = $GLOBALS["core"]->sqlSelect("mod_phpwsbb_user_ranks", NULL, NULL, "rank_min"); if($results) $this->_user_ranks = $results; *************** *** 1316,1344 **** // If user data was passed in, use it $result = $id; ! } elseif (!$result = $GLOBALS["core"]->getRow('SELECT * FROM ' ! . $GLOBALS["core"]->tbl_prefix . 'mod_phpwsbb_user_info AS i LEFT JOIN ' . $GLOBALS["core"]->tbl_prefix ! . 'mod_users AS u ON ( u.user_id = i.user_id ) WHERE i.user_id ='.$id)) { ! // Using 1 sql statement instead of loading user classes which would use more memory ! // and generate an additional query per user. // If no record was found, create one $result = array(); // Develop correct user post counts ! $posts = $GLOBALS["core"]->getRow('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1); ! $result['posts'] = $posts['COUNT(owner_id)']; // If the user has uservars set for this module... ! $monitordefault = $_SESSION['OBJ_user']->getUserVar('monitordefault', NULL, 'phpwsbb'); if ($monitordefault!==NULL) { // transfer the values to the table ! $result['monitordefault'] = $monitordefault; ! $result['suspendmonitors'] = $_SESSION['OBJ_user']->getUserVar('suspendmonitors', NULL, 'phpwsbb'); } ! $GLOBALS["core"]->sqlInsert($result,'mod_phpwsbb_user_info'); ! $result['location']=$result['avatar']=$result['signature']=$result['monitordefault']=$result['suspendmonitors']=null; } // If user's post count is set to 0, recalculate it. ! if($result['posts']==0) { // Develop correct user post counts ! $result['posts'] = $data['posts'] = $GLOBALS["core"]->getOne('SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id='.$id, 1); $GLOBALS["core"]->sqlUpdate($data, 'mod_phpwsbb_user_info', 'user_id', $id); } --- 1316,1348 ---- // If user data was passed in, use it $result = $id; ! } elseif (!$result = $GLOBALS["core"]->getRow("SELECT * FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_user_info AS i LEFT JOIN " . $GLOBALS["core"]->tbl_prefix . "mod_users AS u ON ( u.user_id = i.user_id ) WHERE i.user_id = $id")) { ! /* ! * Using 1 sql statement instead of loading user classes which ! * would use more memoryand generate an additional query per user. ! */ ! // If no record was found, create one $result = array(); + // Develop correct user post counts ! $posts = $GLOBALS["core"]->getRow("SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id=$id", 1); ! $result['posts'] = $posts["COUNT(owner_id)"]; ! // If the user has uservars set for this module... ! $monitordefault = $_SESSION["OBJ_user"]->getUserVar("monitordefault", NULL, "phpwsbb"); if ($monitordefault!==NULL) { // transfer the values to the table ! $result["monitordefault"] = $monitordefault; ! $result["suspendmonitors"] = $_SESSION['OBJ_user']->getUserVar("suspendmonitors", NULL, "phpwsbb"); } ! ! $GLOBALS["core"]->sqlInsert($result, "mod_phpwsbb_user_info"); ! $result["location"] = $result["avatar"] = $result["signature"] = $result["monitordefault"] = $result["suspendmonitors"] = null; } // If user's post count is set to 0, recalculate it. ! if($result["posts"]==0) { // Develop correct user post counts ! $result["posts"] = $data["posts"] = $GLOBALS["core"]->getOne("SELECT COUNT(owner_id) FROM mod_phpwsbb_messages WHERE owner_id=$id", 1); $GLOBALS["core"]->sqlUpdate($data, 'mod_phpwsbb_user_info', 'user_id', $id); } *************** *** 1347,1352 **** --- 1351,1358 ---- $result['MONITORDEFAULT'] = $result['monitordefault']; $result['SUSPENDMONITORS'] = $result['suspendmonitors']; + if (!empty($result['location'])) $result['FROM'] = $_SESSION['translate']->it('From').': '.PHPWS_Text::parseOutput($result['location']); + $result['AVATAR'] = null; if (!empty($result['avatar_file']) && $this->_use_avatars) { *************** *** 1358,1363 **** --- 1364,1371 ---- $result['AVATAR'] = '<img src="http://'.$result['avatar_file'].'" alt="" title="" border="0" />'; } + if (!empty($result['signature']) && $this->_use_signatures) $result['SIGNATURE'] = PHPWS_Text::parseOutput($result['signature']); + // Determine user's rank if($result['posts']&& $this->_user_ranks) { |
|
From: Don S. <ri...@us...> - 2004-09-13 19:47:23
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4157/class Modified Files: Forum.php Log Message: Fixing post count logic Index: Forum.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Forum.php 13 Sep 2004 19:43:31 -0000 1.26 --- Forum.php 13 Sep 2004 19:47:11 -0000 1.27 *************** *** 310,319 **** if(!empty($this->_id)) { /* Develop total replies and extended thread information */ ! $sql = 'SELECT COUNT(id),SUM(replies) FROM ' . $GLOBALS["core"]->tbl_prefix . 'mod_phpwsbb_threads WHERE fid=' . $this->getId() . ' ORDER BY lastpost DESC'; $t = $GLOBALS["core"]->getRow($sql); ! $this->_threads = $t['COUNT(id)']; ! $this->_posts = $t['SUM(replies)']; ! if (empty($this->_posts)) ! $this->_posts = 0; $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_threads WHERE fid=" . $this->getId() . " ORDER BY lastpost DESC"; --- 310,319 ---- if(!empty($this->_id)) { /* Develop total replies and extended thread information */ ! $sql = "SELECT COUNT(id), SUM(replies) FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_threads WHERE fid=" . $this->getId() . " ORDER BY lastpost DESC"; $t = $GLOBALS["core"]->getRow($sql); ! $this->_threads = $t["COUNT(id)"]; ! ! /* Replies doesn't include the original post in the thread, add # of threads */ ! $this->_posts = $t["SUM(replies)"] + $this->_threads; $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_threads WHERE fid=" . $this->getId() . " ORDER BY lastpost DESC"; |
|
From: Don S. <ri...@us...> - 2004-09-13 19:43:41
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3380/class Modified Files: Forum.php Log Message: These fields can't be null in DB, but are null when adding new forums. To get around it I'm just setting them for now Index: Forum.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Forum.php 13 Sep 2004 18:17:20 -0000 1.25 --- Forum.php 13 Sep 2004 19:43:31 -0000 1.26 *************** *** 271,274 **** --- 271,287 ---- } + /* Hacks to get around some of Eloi's DDL */ + if (empty($this->_posts)) + $this->_posts = 0; + + if (empty($this->_lastpost_topic_label)) + $this->_lastpost_topic_label = ""; + + if (empty($this->_lastpost_topic_id)) + $this->_lastpost_topic_id = 0; + + if (empty($this->_lastpost_post_id)) + $this->_lastpost_post_id = 0; + $error = $this->commit(); if(PHPWS_Error::isError($error)) { *************** *** 301,304 **** --- 314,319 ---- $this->_threads = $t['COUNT(id)']; $this->_posts = $t['SUM(replies)']; + if (empty($this->_posts)) + $this->_posts = 0; $sql = "SELECT id FROM " . $GLOBALS["core"]->tbl_prefix . "mod_phpwsbb_threads WHERE fid=" . $this->getId() . " ORDER BY lastpost DESC"; |
|
From: Don S. <ri...@us...> - 2004-09-13 19:41:54
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3017/class Modified Files: Message.php Thread.php Log Message: Some cleanup Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** Thread.php 13 Sep 2004 18:17:21 -0000 1.53 --- Thread.php 13 Sep 2004 19:41:45 -0000 1.54 *************** *** 494,498 **** if ($GLOBALS["core"]->sqlInsert($data, "mod_phpwsbb_monitors", TRUE, FALSE, FALSE, FALSE)) { $GLOBALS["CNT_phpwsbb"]["content"] .= $_SESSION["translate"]->it("You are now monitoring the topic \"[var1]\" and will be emailed when there is a new reply.", $this->getLabel()); ! $GLOBALS["CNT_phpwsbb"]["content"] .= "<br /><a href=\"http://" . PHPWS_HOME_HTTP . "index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Back to the topic.") . "</a>"; $this->monitored = TRUE; } else { --- 494,498 ---- if ($GLOBALS["core"]->sqlInsert($data, "mod_phpwsbb_monitors", TRUE, FALSE, FALSE, FALSE)) { $GLOBALS["CNT_phpwsbb"]["content"] .= $_SESSION["translate"]->it("You are now monitoring the topic \"[var1]\" and will be emailed when there is a new reply.", $this->getLabel()); ! $GLOBALS["CNT_phpwsbb"]["content"] .= "<br /><a href=\"http://" . PHPWS_HOME_HTTP . "index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Back to the topic.") . "</a>"; $this->monitored = TRUE; } else { Index: Message.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** Message.php 13 Sep 2004 18:17:21 -0000 1.60 --- Message.php 13 Sep 2004 19:41:45 -0000 1.61 *************** *** 470,474 **** } ! $GLOBALS["CNT_phpwsbb"]["content"] .= "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $thread->getId() . "\">" . $_SESSION["translate"]->it("Back to the topic.") . "</a><br />\n"; } --- 470,474 ---- } ! $GLOBALS["CNT_phpwsbb"]["content"] .= "<br /><a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $thread->getId() . "\">" . $_SESSION["translate"]->it("Back to the topic.") . "</a><br />\n"; } |
