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: Don S. <ri...@us...> - 2004-03-30 23:02:46
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15688/templates Modified Files: view.tpl view_forum.tpl view_thread.tpl Log Message: Tidying up. Should move to tables methinks Index: view_forum.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_forum.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** view_forum.tpl 16 Mar 2004 04:04:05 -0000 1.4 --- view_forum.tpl 30 Mar 2004 22:51:04 -0000 1.5 *************** *** 3,16 **** <!-- END NEW --> <!-- BEGIN EDIT --> ! <span class="smalltext"> | {EDIT}</span> <!-- END EDIT --> <!-- BEGIN DELETE --> ! <span class="smalltext"> | {DELETE}</span> <!-- END DELETE --> <!-- BEGIN HIDE --> ! <span class="smalltext"> | {HIDE}</span> <!-- END HIDE --> <!-- BEGIN CATEGORY --> ! <span class="smalltext"> | {CATEGORY_TEXT}: {CATEGORY}</span> <!-- END CATEGORY --> - --- 3,15 ---- <!-- END NEW --> <!-- BEGIN EDIT --> ! <span class="smalltext">| {EDIT}</span> <!-- END EDIT --> <!-- BEGIN DELETE --> ! <span class="smalltext">| {DELETE}</span> <!-- END DELETE --> <!-- BEGIN HIDE --> ! <span class="smalltext">| {HIDE}</span> <!-- END HIDE --> <!-- BEGIN CATEGORY --> ! <span class="smalltext">| {CATEGORY_TEXT}: {CATEGORY}</span> <!-- END CATEGORY --> Index: view.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** view.tpl 18 Mar 2004 04:02:15 -0000 1.10 --- view.tpl 30 Mar 2004 22:50:55 -0000 1.11 *************** *** 19,23 **** </span> <!-- END BAN_USERNAME --> ! <hr size="1" width="100%" noshade /><br /> {BODY}<br /> <!-- BEGIN EDITED --> --- 19,23 ---- </span> <!-- END BAN_USERNAME --> ! <hr size="1" width="100%" noshade /> {BODY}<br /> <!-- BEGIN EDITED --> *************** *** 26,30 **** <div class="smalltext" align="right"> <!-- BEGIN NOTE --> ! {NOTE} <!-- END NOTE --> <!-- BEGIN REPORT --> --- 26,30 ---- <div class="smalltext" align="right"> <!-- BEGIN NOTE --> ! | {NOTE} <!-- END NOTE --> <!-- BEGIN REPORT --> *************** *** 34,50 **** | {EDIT} <!-- END EDIT --> - <!-- BEGIN FORK --> | {FORK} <!-- END FORK --> - <!-- BEGIN DELETE --> | {DELETE} <!-- END DELETE --> - <!-- BEGIN HIDE --> | {HIDE} <!-- END HIDE --> ! </div> </td></tr> --- 34,47 ---- | {EDIT} <!-- END EDIT --> <!-- BEGIN FORK --> | {FORK} <!-- END FORK --> <!-- BEGIN DELETE --> | {DELETE} <!-- END DELETE --> <!-- BEGIN HIDE --> | {HIDE} <!-- END HIDE --> ! | </div> </td></tr> Index: view_thread.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_thread.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** view_thread.tpl 18 Mar 2004 04:28:08 -0000 1.10 --- view_thread.tpl 30 Mar 2004 22:51:04 -0000 1.11 *************** *** 1,19 **** <!-- BEGIN REPLY --> ! <span class="smalltext">{REPLY}</span> <!-- END REPLY --> <!-- BEGIN MONITOR --> ! <span class="smalltext"> | {MONITOR}</span> <!-- END MONITOR --> <!-- BEGIN LOCK --> ! <span class="smalltext"> | {LOCK}</span> <!-- END LOCK --> <!-- BEGIN DELETE --> ! <span class="smalltext"> | {DELETE}</span> <!-- END DELETE --> <!-- BEGIN HIDE --> ! <span class="smalltext"> | {HIDE}</span> <!-- END HIDE --> <!-- BEGIN STICKY --> ! <span class="smalltext"> | {STICKY}</span> <!-- END STICKY --> <!-- BEGIN THREAD_MOVE --> --- 1,19 ---- <!-- BEGIN REPLY --> ! <span class="smalltext">{REPLY} |</span> <!-- END REPLY --> <!-- BEGIN MONITOR --> ! <span class="smalltext">{MONITOR} |</span> <!-- END MONITOR --> <!-- BEGIN LOCK --> ! <span class="smalltext">{LOCK} |</span> <!-- END LOCK --> <!-- BEGIN DELETE --> ! <span class="smalltext">{DELETE} |</span> <!-- END DELETE --> <!-- BEGIN HIDE --> ! <span class="smalltext">{HIDE} |</span> <!-- END HIDE --> <!-- BEGIN STICKY --> ! <span class="smalltext">{STICKY} |</span> <!-- END STICKY --> <!-- BEGIN THREAD_MOVE --> |
|
From: Don S. <ri...@us...> - 2004-03-30 16:06:41
|
Update of /cvsroot/phpwsbb/phpwsbb/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23782/docs Modified Files: ChangeLog Log Message: Correcting dates in ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/docs/ChangeLog,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** ChangeLog 29 Mar 2004 04:40:53 -0000 1.89 --- ChangeLog 30 Mar 2004 15:55:02 -0000 1.90 *************** *** 21,25 **** RFE #870690 Cleaning up interface. ! *phpwsbb-0.8.1 (15 Mar 2003) 07 Mar 2004; Don Seiler <do...@NO...> --- 21,25 ---- RFE #870690 Cleaning up interface. ! *phpwsbb-0.8.1 (15 Mar 2004) 07 Mar 2004; Don Seiler <do...@NO...> *************** *** 31,35 **** Starting to go back and add phpdoc comments, especially class headers. ! *phpwsbb-0.8.0 (05 Feb 2003) 31 Jan 2004; Don Seiler <do...@NO...> --- 31,35 ---- Starting to go back and add phpdoc comments, especially class headers. ! *phpwsbb-0.8.0 (05 Feb 2004) 31 Jan 2004; Don Seiler <do...@NO...> *************** *** 38,42 **** RFE #887667 Adding "forums" block ! *phpwsbb-0.7.3 (27 Jan 2003) 27 Jan 2004; Don Seiler <do...@NO...> --- 38,42 ---- RFE #887667 Adding "forums" block ! *phpwsbb-0.7.3 (27 Jan 2004) 27 Jan 2004; Don Seiler <do...@NO...> *************** *** 48,52 **** to Bobby Kennedy for pointing it out. ! *phpwsbb-0.7.2 (14 Jan 2003) 14 Jan 2004; Don Seiler <do...@NO...> --- 48,52 ---- to Bobby Kennedy for pointing it out. ! *phpwsbb-0.7.2 (14 Jan 2004) 14 Jan 2004; Don Seiler <do...@NO...> *************** *** 55,64 **** Windsor for spotting it. ! *phpwsbb-0.7.1 (12 Jan 2003) 12 Jan 2004; Don Seiler <do...@NO...> Forgot to require class definitions in boost/update.php. ! *phpwsbb-0.7.0 (09 Jan 2003) 05 Jan 2004; Don Seiler <do...@NO...> --- 55,64 ---- Windsor for spotting it. ! *phpwsbb-0.7.1 (12 Jan 2004) 12 Jan 2004; Don Seiler <do...@NO...> Forgot to require class definitions in boost/update.php. ! *phpwsbb-0.7.0 (09 Jan 2004) 05 Jan 2004; Don Seiler <do...@NO...> |
|
From: Don S. <ri...@us...> - 2004-03-29 04:52:18
|
Update of /cvsroot/phpwsbb/phpwsbb/templates/threads In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25783/templates/threads Modified Files: list.tpl row.tpl Log Message: Bucket of display/template changes for RFE 920696 Index: row.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/threads/row.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** row.tpl 31 Jan 2004 16:26:25 -0000 1.2 --- row.tpl 29 Mar 2004 04:40:54 -0000 1.3 *************** *** 5,10 **** <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> ! <td class="smalltext">{REPLIES}</td> ! <td class="smalltext">{LASTPOST}</td> </tr> --- 5,12 ---- <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> ! --> ! <td align="center" class="smalltext">{REPLIES}</td> ! <td align="center" class="smalltext">{LASTPOST}</td> </tr> Index: list.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/threads/list.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** list.tpl 31 Jan 2004 16:26:25 -0000 1.2 --- list.tpl 29 Mar 2004 04:40:54 -0000 1.3 *************** *** 10,17 **** <td class="smalltext"><b>{SELECT_LABEL}</b></td> <!-- END SELECT_LABEL --> ! <td width="100%" class="smalltext"><b>{LABEL_LABEL}</b></td> <td align="center" valign="middle" class="smalltext"><b>{OWNER_LABEL}</b></td> <td align="center" valign="middle" class="smalltext"><b>{REPLIES_LABEL}</b></td> ! <td align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTPOST_LABEL}</b></td> </tr> {LIST_ITEMS} --- 10,19 ---- <td class="smalltext"><b>{SELECT_LABEL}</b></td> <!-- END SELECT_LABEL --> ! <td width="70%" class="smalltext"><b>{LABEL_LABEL}</b></td> ! <!-- <td align="center" valign="middle" class="smalltext"><b>{OWNER_LABEL}</b></td> + --> <td align="center" valign="middle" class="smalltext"><b>{REPLIES_LABEL}</b></td> ! <td width="25%" align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTPOST_LABEL}</b></td> </tr> {LIST_ITEMS} |
|
From: Don S. <ri...@us...> - 2004-03-29 04:52:18
|
Update of /cvsroot/phpwsbb/phpwsbb/templates/forums In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25783/templates/forums Modified Files: list.tpl row.tpl Log Message: Bucket of display/template changes for RFE 920696 Index: row.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/forums/row.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** row.tpl 31 Jan 2004 16:26:25 -0000 1.2 --- row.tpl 29 Mar 2004 04:40:53 -0000 1.3 *************** *** 5,9 **** <td class="smalltext"> <a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS[]={ID}">{LABEL}</a><br /><font size="-2">{DESCRIPTION}</font></td> ! <td class="smalltext">{THREADS}</td> ! <td class="smalltext">{LASTPOST}</td> </tr> --- 5,9 ---- <td class="smalltext"> <a href="./index.php?module=phpwsbb&PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS[]={ID}">{LABEL}</a><br /><font size="-2">{DESCRIPTION}</font></td> ! <td align="center" class="smalltext">{THREADS}</td> ! <td align="center" class="smalltext">{LASTPOST}</td> </tr> Index: list.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/forums/list.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** list.tpl 31 Jan 2004 16:26:25 -0000 1.2 --- list.tpl 29 Mar 2004 04:40:53 -0000 1.3 *************** *** 10,16 **** <td class="smalltext"><b>{SELECT_LABEL}</b></td> <!-- END SELECT_LABEL --> ! <td width="100%" class="smalltext"><b>{LABEL_LABEL}</b></td> <td align="center" valign="middle" class="smalltext"><b>{THREADS_LABEL}</b></td> ! <td align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTPOST_LABEL}</b></td> </tr> {LIST_ITEMS} --- 10,16 ---- <td class="smalltext"><b>{SELECT_LABEL}</b></td> <!-- END SELECT_LABEL --> ! <td width="70%" class="smalltext"><b>{LABEL_LABEL}</b></td> <td align="center" valign="middle" class="smalltext"><b>{THREADS_LABEL}</b></td> ! <td width="25%" align="center" valign="middle" nowrap="nowrap" class="smalltext"><b>{LASTPOST_LABEL}</b></td> </tr> {LIST_ITEMS} |
|
From: Don S. <ri...@us...> - 2004-03-29 04:52:17
|
Update of /cvsroot/phpwsbb/phpwsbb/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25783/docs Modified Files: ChangeLog Log Message: Bucket of display/template changes for RFE 920696 Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/docs/ChangeLog,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** ChangeLog 29 Mar 2004 04:21:33 -0000 1.88 --- ChangeLog 29 Mar 2004 04:40:53 -0000 1.89 *************** *** 3,6 **** --- 3,7 ---- 28 Mar 2004; Don Seiler <do...@NO...> + RFE #920696 Using poster name in Last Post field If using phpwsContacts, contact first/last name are used in Posted By RFE #862993 Pause/resume monitor user setting and added "remove all |
|
From: Don S. <ri...@us...> - 2004-03-29 04:52:17
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25783/class Modified Files: Forum.php Thread.php Log Message: Bucket of display/template changes for RFE 920696 Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Thread.php 29 Mar 2004 04:06:47 -0000 1.42 --- Thread.php 29 Mar 2004 04:40:53 -0000 1.43 *************** *** 578,583 **** function getLastPost() { ! if ($this->_lastpost) return date(PHPWS_DATE_FORMAT . " " . PHPWS_TIME_FORMAT, $this->_lastpost); ! else return NULL; }// END FUNC getLastPost --- 578,592 ---- function getLastPost() { ! if ($this->_lastpost) { ! $poster = $this->getEditor(); ! if(empty($poster)) ! $poster = $_SESSION["translate"]->it("Guest"); ! ! $retstring = NULL; ! //$retstring .= "<font size=\"-2\">"; ! $retstring .= $_SESSION["translate"]->it("[var1]<br />by [var2]",date(PHPWS_DATE_FORMAT . " " . PHPWS_TIME_FORMAT, $this->_lastpost), $poster); ! //$retstring .= "</font>"; ! return $retstring; ! } else return NULL; }// END FUNC getLastPost Index: Forum.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Forum.php 29 Mar 2004 04:06:47 -0000 1.16 --- Forum.php 29 Mar 2004 04:40:53 -0000 1.17 *************** *** 361,366 **** function getLastPost() { ! if($this->_lastpost) return date(PHPWS_DATE_FORMAT . " " . PHPWS_TIME_FORMAT, $this->_lastpost); ! else return NULL; }// END FUNC getLastPost --- 361,375 ---- function getLastPost() { ! if($this->_lastpost) { ! $poster = $this->getEditor(); ! if(empty($poster)) ! $poster = $_SESSION["translate"]->it("Guest"); ! ! $retstring = NULL; ! //$retstring .= "<font size=\"-2\">"; ! $retstring .= $_SESSION["translate"]->it("[var1]<br />by [var2]",date(PHPWS_DATE_FORMAT . " " . PHPWS_TIME_FORMAT, $this->_lastpost), $poster); ! //$retstring .= "</font>"; ! return $retstring; ! } else return NULL; }// END FUNC getLastPost |
|
From: Don S. <ri...@us...> - 2004-03-29 04:52:17
|
Update of /cvsroot/phpwsbb/phpwsbb/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25783/conf Modified Files: manager.php Log Message: Bucket of display/template changes for RFE 920696 Index: manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/manager.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** manager.php 2 Mar 2004 02:40:48 -0000 1.6 --- manager.php 29 Mar 2004 04:40:53 -0000 1.7 *************** *** 57,61 **** "owner"=>$_SESSION["translate"]->it("Poster"), "replies"=>$_SESSION["translate"]->it("Replies"), ! "lastpost"=>$_SESSION["translate"]->it("Last Reply"), "id"=>NULL, "locked"=>NULL, --- 57,61 ---- "owner"=>$_SESSION["translate"]->it("Poster"), "replies"=>$_SESSION["translate"]->it("Replies"), ! "lastpost"=>$_SESSION["translate"]->it("Last Post"), "id"=>NULL, "locked"=>NULL, |
|
From: Don S. <ri...@us...> - 2004-03-29 04:33:00
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22121/class Modified Files: Message.php Log Message: Using phpwsContacts first/last name in posted by Index: Message.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Message.php 29 Mar 2004 04:06:47 -0000 1.46 --- Message.php 29 Mar 2004 04:21:31 -0000 1.47 *************** *** 113,121 **** if ($GLOBALS['core']->moduleExists("phpwscontacts")) { // Find contact owned by this username ! $sql = "select id from " . PHPWS_TBL_PREFIX . "mod_phpwscontacts_contacts where owner='" . $this->getOwner() . "'"; $results = $GLOBALS["core"]->getCol($sql); ! if ($results) ! $poster = "<a href=\"index.php?module=phpwscontacts&CONTACTS_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $results[0] . "\">$poster</a>"; } } --- 113,125 ---- if ($GLOBALS['core']->moduleExists("phpwscontacts")) { + require_once(PHPWS_SOURCE_DIR.'mod/phpwscontacts/class/Contact.php'); // Find contact owned by this username ! $sql = "select id from " . PHPWS_TBL_PREFIX . "mod_phpwscontacts_contacts where owner='" . $this->getOwner() . "' and mine=1"; $results = $GLOBALS["core"]->getCol($sql); ! if ($results) { ! //$poster = "<a href=\"index.php?module=phpwscontacts&CONTACTS_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $results[0] . "\">$poster</a>"; ! $contact = new CONTACTS_Contact($results[0]); ! $poster = "<a href=\"index.php?module=phpwscontacts&CONTACTS_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $contact->getId() . "\">" . $contact->getListFirstName() . " " . $contact->getListLastName() . "</a>"; ! } } } |
|
From: Don S. <ri...@us...> - 2004-03-29 04:33:00
|
Update of /cvsroot/phpwsbb/phpwsbb/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22121/docs Modified Files: ChangeLog Log Message: Using phpwsContacts first/last name in posted by Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/docs/ChangeLog,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** ChangeLog 29 Mar 2004 04:06:47 -0000 1.87 --- ChangeLog 29 Mar 2004 04:21:33 -0000 1.88 *************** *** 3,6 **** --- 3,7 ---- 28 Mar 2004; Don Seiler <do...@NO...> + If using phpwsContacts, contact first/last name are used in Posted By RFE #862993 Pause/resume monitor user setting and added "remove all monitors" link. |
|
From: Don S. <ri...@us...> - 2004-03-29 04:18:14
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19853/templates Modified Files: edit_user_settings.tpl Added Files: delete.tpl Removed Files: delete_forum.tpl delete_message.tpl delete_thread.tpl Log Message: Changes for RFE #862993 and consolidated delete templates --- delete_forum.tpl DELETED --- --- NEW FILE: delete.tpl --- {START_FORM} {MESSAGE}<br /><br /> {OPTION_NO}  {OPTION_YES} {END_FORM} --- delete_message.tpl DELETED --- Index: edit_user_settings.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/edit_user_settings.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit_user_settings.tpl 23 Mar 2004 03:57:46 -0000 1.2 --- edit_user_settings.tpl 29 Mar 2004 04:06:47 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- <!-- END MONITORDEFAULT_WARNING --> {SETTINGS_SUSPENDMONITORS} {SUSPENDMONITORS_TEXT} {SUSPENDMONITORS_HELP}<br /> + {REMOVEALLMONITORS} {REMOVEALLMONITORS_HELP}<br /> <br /> {SETTINGS_SAVE} --- delete_thread.tpl DELETED --- |
|
From: Don S. <ri...@us...> - 2004-03-29 04:18:13
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19853/class Modified Files: Forum.php Manager.php Message.php Thread.php Log Message: Changes for RFE #862993 and consolidated delete templates Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Thread.php 23 Mar 2004 03:33:59 -0000 1.41 --- Thread.php 29 Mar 2004 04:06:47 -0000 1.42 *************** *** 284,313 **** // Send email to monitors for new messages if ($_SESSION["PHPWSBB_Manager"]->_allow_user_monitors) { ! if ($new) { ! $sql = "SELECT email FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_monitors a," . $GLOBALS["core"]->tbl_prefix . "mod_users b WHERE a.thread_id=" . $this->getId() . " AND b.user_id=a.user_id"; ! $emails = $GLOBALS["core"]->getCol($sql); ! ! $admin_email = $_SESSION["PHPWSBB_Manager"]->_admin_email; ! if (empty($admin_email)) { ! extract(PHPWS_User::getSettings()); ! $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; ! // Replace [name] and [url] in $message ! $message = str_replace("[name]", "\"" . $this->getLabel() . "\"", $message); ! $message = str_replace("[url]", "http://" . PHPWS_HOME_HTTP . "index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $this->getId(), $message); ! ! foreach ($emails as $email) { ! $mail_object =& Mail::factory('mail'); ! $headers['From'] = $from; ! $headers['Subject'] = $subject; ! // $headers['To'] = $email; ! $mail_object->send($email, $headers, $message); } - - if (!$this->monitored && $_SESSION["OBJ_user"]->getUserVar("monitordefault", NULL, "phpwsbb")) - $this->_monitor(); } } --- 284,315 ---- // Send email to monitors for new messages if ($_SESSION["PHPWSBB_Manager"]->_allow_user_monitors) { ! if (!$_SESSION["OBJ_user"]->getUserVar("suspendmonitors", NULL, "phpwsbb")) { ! if ($new) { ! $sql = "SELECT email FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_monitors a," . $GLOBALS["core"]->tbl_prefix . "mod_users b WHERE a.thread_id=" . $this->getId() . " AND b.user_id=a.user_id"; ! $emails = $GLOBALS["core"]->getCol($sql); ! ! $admin_email = $_SESSION["PHPWSBB_Manager"]->_admin_email; ! if (empty($admin_email)) { ! extract(PHPWS_User::getSettings()); ! $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; ! // Replace [name] and [url] in $message ! $message = str_replace("[name]", "\"" . $this->getLabel() . "\"", $message); ! $message = str_replace("[url]", "http://" . PHPWS_HOME_HTTP . "index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $this->getId(), $message); ! ! foreach ($emails as $email) { ! $mail_object =& Mail::factory('mail'); ! $headers['From'] = $from; ! $headers['Subject'] = $subject; ! // $headers['To'] = $email; ! $mail_object->send($email, $headers, $message); ! } ! ! if (!$this->monitored && $_SESSION["OBJ_user"]->getUserVar("monitordefault", NULL, "phpwsbb")) ! $this->_monitor(); } } } *************** *** 324,328 **** } ! if (isset($_REQUEST["Thread_yes"])) { $this->kill(); --- 326,330 ---- } ! if (isset($_REQUEST["option_yes"])) { $this->kill(); *************** *** 340,344 **** $_SESSION["PHPWSBB_Manager"]->action(); ! } elseif (isset($_REQUEST["Thread_no"])) { $message = $_SESSION["translate"]->it("No topic was deleted from the database."); $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb"); --- 342,346 ---- $_SESSION["PHPWSBB_Manager"]->action(); ! } elseif (isset($_REQUEST["option_no"])) { $message = $_SESSION["translate"]->it("No topic was deleted from the database."); $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb"); *************** *** 353,358 **** $form->add("PHPWSBB_THREAD_OP", "hidden", "delete"); ! $form->add("Thread_yes", "submit", $_SESSION["translate"]->it("Yes")); ! $form->add("Thread_no", "submit", $_SESSION["translate"]->it("No")); $tags = array(); --- 355,360 ---- $form->add("PHPWSBB_THREAD_OP", "hidden", "delete"); ! $form->add("option_yes", "submit", $_SESSION["translate"]->it("Yes")); ! $form->add("option_no", "submit", $_SESSION["translate"]->it("No")); $tags = array(); *************** *** 360,364 **** $tags["MESSAGE"] = $_SESSION["translate"]->it("Are you sure you want to delete this topic?"); ! $content = PHPWS_Template::processTemplate($tags, "phpwsbb", "delete_thread.tpl"); $_SESSION["OBJ_layout"]->popbox($title, $content, NULL, "CNT_phpwsbb"); } --- 362,366 ---- $tags["MESSAGE"] = $_SESSION["translate"]->it("Are you sure you want to delete this topic?"); ! $content = PHPWS_Template::processTemplate($tags, "phpwsbb", "delete.tpl"); $_SESSION["OBJ_layout"]->popbox($title, $content, NULL, "CNT_phpwsbb"); } Index: Message.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Message.php 18 Mar 2004 04:28:07 -0000 1.45 --- Message.php 29 Mar 2004 04:06:47 -0000 1.46 *************** *** 475,479 **** } ! if (isset($_REQUEST["Message_yes"])) { $this->kill(); --- 475,479 ---- } ! if (isset($_REQUEST["option_yes"])) { $this->kill(); *************** *** 488,492 **** $_SESSION["PHPWSBB_Manager"]->action(); ! } elseif (isset($_REQUEST["Message_no"])) { $message = $_SESSION["translate"]->it("No message was deleted from the database."); $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb"); --- 488,492 ---- $_SESSION["PHPWSBB_Manager"]->action(); ! } elseif (isset($_REQUEST["option_no"])) { $message = $_SESSION["translate"]->it("No message was deleted from the database."); $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb"); *************** *** 502,507 **** $form->add("PHPWSBB_MESSAGE_OP", "hidden", "delete"); ! $form->add("Message_yes", "submit", $_SESSION["translate"]->it("Yes")); ! $form->add("Message_no", "submit", $_SESSION["translate"]->it("No")); $tags = array(); --- 502,507 ---- $form->add("PHPWSBB_MESSAGE_OP", "hidden", "delete"); ! $form->add("option_yes", "submit", $_SESSION["translate"]->it("Yes")); ! $form->add("option_no", "submit", $_SESSION["translate"]->it("No")); $tags = array(); *************** *** 509,513 **** $tags["MESSAGE"] = $_SESSION["translate"]->it("Are you sure you want to delete this message?"); ! $content = PHPWS_Template::processTemplate($tags, "phpwsbb", "delete_message.tpl"); $_SESSION["OBJ_layout"]->popbox($title, $content, NULL, "CNT_phpwsbb"); } --- 509,513 ---- $tags["MESSAGE"] = $_SESSION["translate"]->it("Are you sure you want to delete this message?"); ! $content = PHPWS_Template::processTemplate($tags, "phpwsbb", "delete.tpl"); $_SESSION["OBJ_layout"]->popbox($title, $content, NULL, "CNT_phpwsbb"); } Index: Forum.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Forum.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Forum.php 18 Mar 2004 04:02:15 -0000 1.15 --- Forum.php 29 Mar 2004 04:06:47 -0000 1.16 *************** *** 272,276 **** } ! if(isset($_REQUEST["Forum_yes"])) { $this->kill(); --- 272,276 ---- } ! if(isset($_REQUEST["option_yes"])) { $this->kill(); *************** *** 291,295 **** $_SESSION["PHPWSBB_Manager"]->action(); ! } elseif(isset($_REQUEST["Forum_no"])) { $message = $_SESSION["translate"]->it("No forum was deleted from the database."); $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb"); --- 291,295 ---- $_SESSION["PHPWSBB_Manager"]->action(); ! } elseif(isset($_REQUEST["option_no"])) { $message = $_SESSION["translate"]->it("No forum was deleted from the database."); $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb"); *************** *** 304,309 **** $form->add("PHPWSBB_FORUM_OP", "hidden", "delete"); ! $form->add("Forum_yes", "submit", $_SESSION["translate"]->it("Yes")); ! $form->add("Forum_no", "submit", $_SESSION["translate"]->it("No")); $tags = array(); --- 304,309 ---- $form->add("PHPWSBB_FORUM_OP", "hidden", "delete"); ! $form->add("option_yes", "submit", $_SESSION["translate"]->it("Yes")); ! $form->add("option_no", "submit", $_SESSION["translate"]->it("No")); $tags = array(); *************** *** 311,315 **** $tags["MESSAGE"] = $_SESSION["translate"]->it("Are you sure you want to delete this forum and all its threads and messages?"); ! $content = PHPWS_Template::processTemplate($tags, "phpwsbb", "delete_forum.tpl"); $_SESSION["OBJ_layout"]->popbox($title, $content, NULL, "CNT_phpwsbb"); } --- 311,315 ---- $tags["MESSAGE"] = $_SESSION["translate"]->it("Are you sure you want to delete this forum and all its threads and messages?"); ! $content = PHPWS_Template::processTemplate($tags, "phpwsbb", "delete.tpl"); $_SESSION["OBJ_layout"]->popbox($title, $content, NULL, "CNT_phpwsbb"); } Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Manager.php 23 Mar 2004 03:57:46 -0000 1.31 --- Manager.php 29 Mar 2004 04:06:47 -0000 1.32 *************** *** 514,517 **** --- 514,519 ---- $tags["SUSPENDMONITORS_TEXT"] = $_SESSION["translate"]->it("Suspend monitors"); $tags["SUSPENDMONITORS_HELP"] = CLS_help::show_link("phpwsbb", "suspend_monitors"); + $tags["REMOVEALLMONITORS"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=removeallmonitors\">" . $_SESSION["translate"]->it("Remove all monitors") . "</a>"; + $tags["REMOVEALLMONITORS_HELP"] = CLS_help::show_link("phpwsbb", "remove_all_monitors"); $title = $_SESSION["translate"]->it("phpwsBB User Settings"); *************** *** 735,739 **** --- 737,782 ---- }// END FUNC _saveSettings + + function _removeAllMonitors() { + + if (isset($_REQUEST["option_yes"])) { + + // do the deed here + $data = array(); + $data["user_id"] = $_SESSION["OBJ_user"]->user_id; + $GLOBALS["core"]->sqlDelete("mod_phpwsbb_monitors", $data); + + $message = $_SESSION["translate"]->it("Your monitors have been cleared."); + $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb"); + $_REQUEST["PHPWSBB_MAN_OP"] = "list"; + $_SESSION["PHPWSBB_Manager"]->action(); + + } elseif (isset($_REQUEST["option_no"])) { + $message = $_SESSION["translate"]->it("No monitors were cleared."); + $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb"); + $_REQUEST["PHPWSBB_MAN_OP"] = "list"; + $_SESSION["PHPWSBB_Manager"]->action(); + + } else { + $title = $_SESSION["translate"]->it("Clear Monitor Confirmation"); + + $form = new EZform("PHPWSBB_Message_delete"); + $form->add("module", "hidden", "phpwsbb"); + $form->add("PHPWSBB_MAN_OP", "hidden", "removeallmonitors"); + + $form->add("option_yes", "submit", $_SESSION["translate"]->it("Yes")); + $form->add("option_no", "submit", $_SESSION["translate"]->it("No")); + + $tags = array(); + $tags = $form->getTemplate(); + $tags["MESSAGE"] = $_SESSION["translate"]->it("Are you sure you want to clear ALL of your monitors?"); + + $content = PHPWS_Template::processTemplate($tags, "phpwsbb", "delete.tpl"); + $_SESSION["OBJ_layout"]->popbox($title, $content, NULL, "CNT_phpwsbb"); + } + + }// END FUNC _removeAllMonitors + function offline() { if($this->_bboffline) *************** *** 831,834 **** --- 874,881 ---- break; + case "removeallmonitors": + $this->_removeAllMonitors(); + break; + case "banusername": $this->_banUsername(); |
|
From: Don S. <ri...@us...> - 2004-03-29 04:18:13
|
Update of /cvsroot/phpwsbb/phpwsbb/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19853/docs Modified Files: ChangeLog Log Message: Changes for RFE #862993 and consolidated delete templates Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/docs/ChangeLog,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** ChangeLog 23 Mar 2004 03:33:59 -0000 1.86 --- ChangeLog 29 Mar 2004 04:06:47 -0000 1.87 *************** *** 2,5 **** --- 2,10 ---- # $Id$ + 28 Mar 2004; Don Seiler <do...@NO...> + RFE #862993 Pause/resume monitor user setting and added "remove all + monitors" link. + Consolidated delete templates into one since it's all the same. + 22 Mar 2004; Don Seiler <do...@NO...> RFE #862965 Added user preference setting. CLOSED. |
|
From: Don S. <ri...@us...> - 2004-03-29 04:18:13
|
Update of /cvsroot/phpwsbb/phpwsbb/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19853/conf Modified Files: help.php Log Message: Changes for RFE #862993 and consolidated delete templates Index: help.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/help.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** help.php 23 Mar 2004 03:57:46 -0000 1.8 --- help.php 29 Mar 2004 04:06:47 -0000 1.9 *************** *** 29,31 **** --- 29,34 ---- $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-03-23 04:08:11
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12877/class Modified Files: Manager.php Log Message: Work on RFE #862993 on suspending monitors Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Manager.php 23 Mar 2004 03:33:59 -0000 1.30 --- Manager.php 23 Mar 2004 03:57:46 -0000 1.31 *************** *** 494,497 **** --- 494,502 ---- $tabs++; + $form->add("SETTINGS_suspendmonitors", "checkbox"); + $form->setMatch("SETTINGS_suspendmonitors", $_SESSION["OBJ_user"]->getUserVar("suspendmonitors", NULL, "phpwsbb")); + $form->setTab("SETTINGS_suspendmonitors", $tabs); + $tabs++; + $form->add("SETTINGS_save", "submit", $_SESSION["translate"]->it("Save")); *************** *** 507,510 **** --- 512,518 ---- $tags["MONITORDEFAULT_WARNING"] = $_SESSION["translate"]->it("Monitoring has been disabled by the administrator."); + $tags["SUSPENDMONITORS_TEXT"] = $_SESSION["translate"]->it("Suspend monitors"); + $tags["SUSPENDMONITORS_HELP"] = CLS_help::show_link("phpwsbb", "suspend_monitors"); + $title = $_SESSION["translate"]->it("phpwsBB User Settings"); $content = $this->_menu() . PHPWS_Template::processTemplate($tags, "phpwsbb", "edit_user_settings.tpl"); *************** *** 526,531 **** $monitordefault = 1; ! if($_SESSION["OBJ_user"]->setUserVar("monitordefault", $monitordefault, NULL, "phpwsbb")) { $title = $_SESSION["translate"]->it("Settings Saved"); $content = $this->_menu() . $_SESSION["translate"]->it("Your settings have been successfully saved."); --- 534,544 ---- $monitordefault = 1; + $suspendmonitors = 0; + if(isset($_REQUEST["SETTINGS_suspendmonitors"])) + $suspendmonitors = 1; ! ! if( $_SESSION["OBJ_user"]->setUserVar("monitordefault", $monitordefault, NULL, "phpwsbb") && $_SESSION["OBJ_user"]->setUserVar("suspendmonitors", $suspendmonitors, NULL, "phpwsbb") ! ) { $title = $_SESSION["translate"]->it("Settings Saved"); $content = $this->_menu() . $_SESSION["translate"]->it("Your settings have been successfully saved."); |
|
From: Don S. <ri...@us...> - 2004-03-23 04:08:11
|
Update of /cvsroot/phpwsbb/phpwsbb/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12877/conf Modified Files: help.php Log Message: Work on RFE #862993 on suspending monitors Index: help.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/help.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** help.php 16 Mar 2004 03:52:04 -0000 1.7 --- help.php 23 Mar 2004 03:57:46 -0000 1.8 *************** *** 25,27 **** --- 25,31 ---- $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."; + ?> |
|
From: Don S. <ri...@us...> - 2004-03-23 04:08:11
|
Update of /cvsroot/phpwsbb/phpwsbb/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12877/boost Modified Files: uninstall.php Log Message: Work on RFE #862993 on suspending monitors Index: uninstall.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/uninstall.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** uninstall.php 2 Mar 2004 02:40:48 -0000 1.5 --- uninstall.php 23 Mar 2004 03:57:45 -0000 1.6 *************** *** 33,36 **** --- 33,39 ---- PHPWS_Language::uninstallLanguages("phpwsbb"); + // Remove uservar entries + $_SESSION["OBJ_user"]->dropUserModule("phpwsbb"); + } else { $content .= "There was a problem writing to the database.<br />"; |
|
From: Don S. <ri...@us...> - 2004-03-23 04:08:11
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12877/templates Modified Files: edit_user_settings.tpl Log Message: Work on RFE #862993 on suspending monitors Index: edit_user_settings.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/edit_user_settings.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** edit_user_settings.tpl 23 Mar 2004 03:33:59 -0000 1.1 --- edit_user_settings.tpl 23 Mar 2004 03:57:46 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- <i>({MONITORDEFAULT_WARNING})</i><br /> <!-- END MONITORDEFAULT_WARNING --> + {SETTINGS_SUSPENDMONITORS} {SUSPENDMONITORS_TEXT} {SUSPENDMONITORS_HELP}<br /> <br /> {SETTINGS_SAVE} |
|
From: Don S. <ri...@us...> - 2004-03-23 03:44:21
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8928/templates Added Files: edit_user_settings.tpl Log Message: Finished up monitoring changes --- NEW FILE: edit_user_settings.tpl --- {START_FORM} {SETTINGS_MONITORDEFAULT} {MONITORDEFAULT_TEXT}<br /> <!-- BEGIN MONITORDEFAULT_WARNING --> <i>({MONITORDEFAULT_WARNING})</i><br /> <!-- END MONITORDEFAULT_WARNING --> <br /> {SETTINGS_SAVE} {END_FORM} |
|
From: Don S. <ri...@us...> - 2004-03-23 03:44:21
|
Update of /cvsroot/phpwsbb/phpwsbb/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8928/docs Modified Files: ChangeLog Log Message: Finished up monitoring changes Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/docs/ChangeLog,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** ChangeLog 18 Mar 2004 04:28:07 -0000 1.85 --- ChangeLog 23 Mar 2004 03:33:59 -0000 1.86 *************** *** 2,5 **** --- 2,8 ---- # $Id$ + 22 Mar 2004; Don Seiler <do...@NO...> + RFE #862965 Added user preference setting. CLOSED. + 17 Mar 2004; Don Seiler <do...@NO...> RFE #870690 Added icons. http://svgicons.sourceforge.net/ |
|
From: Don S. <ri...@us...> - 2004-03-23 03:44:21
|
Update of /cvsroot/phpwsbb/phpwsbb/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8928/conf Modified Files: controlpanel.php Log Message: Finished up monitoring changes Index: controlpanel.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/conf/controlpanel.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** controlpanel.php 2 Mar 2004 02:40:48 -0000 1.3 --- controlpanel.php 23 Mar 2004 03:33:59 -0000 1.4 *************** *** 21,23 **** --- 21,30 ---- "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"); + ?> |
|
From: Don S. <ri...@us...> - 2004-03-23 03:44:21
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8928/class Modified Files: Manager.php Thread.php Log Message: Finished up monitoring changes Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Thread.php 18 Mar 2004 04:28:07 -0000 1.40 --- Thread.php 23 Mar 2004 03:33:59 -0000 1.41 *************** *** 308,314 **** } ! /* Removed for RFE 862965 */ ! //if (!$this->monitored && !empty($_SESSION["OBJ_user"]->user_id)) ! //$this->_monitor(); } } --- 308,313 ---- } ! if (!$this->monitored && $_SESSION["OBJ_user"]->getUserVar("monitordefault", NULL, "phpwsbb")) ! $this->_monitor(); } } Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Manager.php 18 Mar 2004 04:28:07 -0000 1.29 --- Manager.php 23 Mar 2004 03:33:59 -0000 1.30 *************** *** 474,477 **** --- 474,543 ---- }// END FUNC _updateAllThreads + /** + * Show user settings form + * + * @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); + return FALSE; + } + + $tabs = 1; + $form = new EZform("PHPWSBB_Settings_edit"); + + $form->add("SETTINGS_monitordefault", "checkbox"); + $form->setMatch("SETTINGS_monitordefault", $_SESSION["OBJ_user"]->getUserVar("monitordefault", NULL, "phpwsbb")); + $form->setTab("SETTINGS_monitordefault", $tabs); + $tabs++; + + + $form->add("SETTINGS_save", "submit", $_SESSION["translate"]->it("Save")); + $form->setTab("SETTINGS_save", $tabs); + + $form->add("module", "hidden", "phpwsbb"); + $form->add("PHPWSBB_MAN_OP", "hidden", "saveusersettings"); + + $tags = array(); + $tags = $form->getTemplate(); + $tags["MONITORDEFAULT_TEXT"] = $_SESSION["translate"]->it("Automatically monitor threads you post to?"); + if(!$this->_allow_user_monitors) + $tags["MONITORDEFAULT_WARNING"] = $_SESSION["translate"]->it("Monitoring has been disabled by the administrator."); + + $title = $_SESSION["translate"]->it("phpwsBB User Settings"); + $content = $this->_menu() . PHPWS_Template::processTemplate($tags, "phpwsbb", "edit_user_settings.tpl"); + + $GLOBALS["CNT_phpwsbb"]["title"] = $title; + $GLOBALS["CNT_phpwsbb"]["content"] .= $content; + + }// END FUNC _getUserSettings + + + /** + * Save user settings + * + * @author Don Seiler <do...@NO...> + */ + function _saveUserSettings() { + $monitordefault = 0; + if(isset($_REQUEST["SETTINGS_monitordefault"])) + $monitordefault = 1; + + + if($_SESSION["OBJ_user"]->setUserVar("monitordefault", $monitordefault, NULL, "phpwsbb")) { + $title = $_SESSION["translate"]->it("Settings Saved"); + $content = $this->_menu() . $_SESSION["translate"]->it("Your settings have been successfully saved."); + $content .= " <a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=list\">" . $_SESSION["translate"]->it("Back to Forums") . "</a>"; + } else { + $title = $_SESSION["translate"]->it("Error Saving Settings"); + $content = $this->_menu() . $_SESSION["translate"]->it("There was an error saving the settings."); + } + + $GLOBALS["CNT_phpwsbb"]["title"] = $title; + $GLOBALS["CNT_phpwsbb"]["content"] .= $content; + }// END FUNC _saveUserSettings + /** *************** *** 744,747 **** --- 810,821 ---- break; + case "usersettings": + $this->_getUserSettings(); + break; + + case "saveusersettings": + $this->_saveUserSettings(); + break; + case "banusername": $this->_banUsername(); |
|
From: Don S. <ri...@us...> - 2004-03-18 04:37:43
|
Update of /cvsroot/phpwsbb/phpwsbb/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27984/boost Modified Files: install.sql update.php Log Message: RFE 86265 Added 'Allow User Monitors' Setting Index: install.sql =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/install.sql,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** install.sql 16 Mar 2004 03:52:03 -0000 1.13 --- install.sql 18 Mar 2004 04:28:07 -0000 1.14 *************** *** 77,80 **** --- 77,81 ---- email_text text, monitor_posts smallint NOT NULL default '0', + allow_user_monitors smallint NOT NULL default '1', showforumsblock smallint NOT NULL default '0', forumsblocktitle varchar(80) NULL, *************** *** 84,86 **** bboffline smallint NOT NULL default '0' ); ! INSERT INTO mod_phpwsbb_settings VALUES (1, 1, NULL, 'The thread [name] has been updated. Go to [url] to view it.', 0, 1, 'Forums', 1, 'Latest Forum Posts', 5, 0); --- 85,87 ---- bboffline smallint NOT NULL default '0' ); ! INSERT INTO mod_phpwsbb_settings VALUES (1, 1, NULL, 'The thread [name] has been updated. Go to [url] to view it.', 0, 1, 1, 'Forums', 1, 'Latest Forum Posts', 5, 0); Index: update.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/boost/update.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** update.php 16 Mar 2004 03:52:03 -0000 1.27 --- update.php 18 Mar 2004 04:28:07 -0000 1.28 *************** *** 186,191 **** "showlatestthreadsblock"=>1, "latestthreadsblocktitle"=>"Latest Forum Posts", ! "maxlatestthreads"=>5 ! ) , "mod_phpwsbb_settings")) { $content .= "phpwsBB settings table successfully updated.<br />"; --- 186,190 ---- "showlatestthreadsblock"=>1, "latestthreadsblocktitle"=>"Latest Forum Posts", ! "maxlatestthreads"=>5 ) , "mod_phpwsbb_settings")) { $content .= "phpwsBB settings table successfully updated.<br />"; *************** *** 199,204 **** if($currentVersion < "0.9.0") { ! if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_settings ADD bboffline smallint NOT NULL default '0'", TRUE)) { $content .= "phpwsBB settings table successfully updated.<br />"; } else { $content .= "There was a problem updating the phpwsBB settings.<br />"; --- 198,211 ---- if($currentVersion < "0.9.0") { ! if($status = $GLOBALS["core"]->query("ALTER TABLE mod_phpwsbb_settings ADD bboffline smallint NOT NULL default '0', ADD allow_user_monitors smallint NOT NULL default '1'", TRUE)) { $content .= "phpwsBB settings table successfully updated.<br />"; + 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 />"; |
|
From: Don S. <ri...@us...> - 2004-03-18 04:37:43
|
Update of /cvsroot/phpwsbb/phpwsbb/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27984/class Modified Files: Manager.php Message.php Thread.php Log Message: RFE 86265 Added 'Allow User Monitors' Setting Index: Thread.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Thread.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Thread.php 18 Mar 2004 04:02:15 -0000 1.39 --- Thread.php 18 Mar 2004 04:28:07 -0000 1.40 *************** *** 102,111 **** /* Populate this object if ID exists */ ! if(is_numeric($THREAD_ID)) { ! if(isset($THREAD_ID)) { $this->setId($THREAD_ID); $this->init(); $sql = "SELECT id FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_messages WHERE tid=" . $this->getId(); ! if(!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "hide_threads")) $sql .= " AND hidden=0"; $sql .= " ORDER BY created"; --- 102,111 ---- /* Populate this object if ID exists */ ! if (is_numeric($THREAD_ID)) { ! if (isset($THREAD_ID)) { $this->setId($THREAD_ID); $this->init(); $sql = "SELECT id FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_messages WHERE tid=" . $this->getId(); ! if (!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "hide_threads")) $sql .= " AND hidden=0"; $sql .= " ORDER BY created"; *************** *** 113,122 **** // Monitor stuff ! if(!empty($_SESSION["OBJ_user"]->user_id)) { ! $data = array(); ! $data["thread_id"] = $this->getId(); ! $data["user_id"] = $_SESSION["OBJ_user"]->user_id; ! if($test_sql = $GLOBALS["core"]->sqlSelect("mod_phpwsbb_monitors",$data)) ! $this->monitored = TRUE; } } --- 113,124 ---- // Monitor stuff ! if ($_SESSION["PHPWSBB_Manager"]->_allow_user_monitors) { ! if (!empty($_SESSION["OBJ_user"]->user_id)) { ! $data = array(); ! $data["thread_id"] = $this->getId(); ! $data["user_id"] = $_SESSION["OBJ_user"]->user_id; ! if ($test_sql = $GLOBALS["core"]->sqlSelect("mod_phpwsbb_monitors",$data)) ! $this->monitored = TRUE; ! } } } *************** *** 125,129 **** } ! if(isset($this->_fid)) { $f = new PHPWSBB_Forum($this->_fid); $this->forumlabel = $f->getLabel(); --- 127,131 ---- } ! if (isset($this->_fid)) { $f = new PHPWSBB_Forum($this->_fid); $this->forumlabel = $f->getLabel(); *************** *** 135,146 **** function _view($ro = FALSE) { ! if($this->isHidden() && !$_SESSION["OBJ_user"]->allow_access("phpwsbb", "hide_threads")) { $content = "<div class=\"errortext\">" . $_SESSION["translate"]->it("There is nothing here to see.") . "</div>"; return $content; } ! if(count($this->messages) == 0) { $content = "<div class=\"errortext\">" . $_SESSION["translate"]->it("This topic has no messages.") . "</div>"; ! if($_SESSION["OBJ_user"]->allow_access("phpwsbb", "delete_threads")) $content .= "<br /><a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=delete&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Delete Topic") . "</a>"; return $content; --- 137,148 ---- function _view($ro = FALSE) { ! if ($this->isHidden() && !$_SESSION["OBJ_user"]->allow_access("phpwsbb", "hide_threads")) { $content = "<div class=\"errortext\">" . $_SESSION["translate"]->it("There is nothing here to see.") . "</div>"; return $content; } ! if (count($this->messages) == 0) { $content = "<div class=\"errortext\">" . $_SESSION["translate"]->it("This topic has no messages.") . "</div>"; ! if ($_SESSION["OBJ_user"]->allow_access("phpwsbb", "delete_threads")) $content .= "<br /><a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=delete&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\">" . $_SESSION["translate"]->it("Delete Topic") . "</a>"; return $content; *************** *** 148,152 **** // Not sure if we want this ! if($_SESSION["OBJ_fatcat"]) $_SESSION["OBJ_fatcat"]->whatsRelated($this->_fid); --- 150,154 ---- // Not sure if we want this ! if ($_SESSION["OBJ_fatcat"]) $_SESSION["OBJ_fatcat"]->whatsRelated($this->_fid); *************** *** 163,170 **** ! if(!$ro) { $tags["REPLY"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=reply&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/reply_message.png\" border=\"0\">" . $_SESSION["translate"]->it("Post Reply") . "</a>"; ! if($_SESSION["OBJ_user"]->allow_access("phpwsbb", "lock_threads")) { ! if($this->_locked) $tags["LOCK"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unlock&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/unlocked.png\" border=\"0\">" . $_SESSION["translate"]->it("Unlock Topic") . "</a>"; else --- 165,172 ---- ! if (!$ro) { $tags["REPLY"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=reply&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/reply_message.png\" border=\"0\">" . $_SESSION["translate"]->it("Post Reply") . "</a>"; ! if ($_SESSION["OBJ_user"]->allow_access("phpwsbb", "lock_threads")) { ! if ($this->_locked) $tags["LOCK"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unlock&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/unlocked.png\" border=\"0\">" . $_SESSION["translate"]->it("Unlock Topic") . "</a>"; else *************** *** 172,180 **** } ! if($_SESSION["OBJ_user"]->allow_access("phpwsbb", "move_threads")) { // Need drop-down of forums $forums = array(); $results = $GLOBALS["core"]->sqlSelect("mod_phpwsbb_forums",NULL,NULL,"sortorder"); ! if($results) foreach($results as $rec) $forums[$rec["id"]] = $rec["label"]; --- 174,182 ---- } ! if ($_SESSION["OBJ_user"]->allow_access("phpwsbb", "move_threads")) { // Need drop-down of forums $forums = array(); $results = $GLOBALS["core"]->sqlSelect("mod_phpwsbb_forums",NULL,NULL,"sortorder"); ! if ($results) foreach($results as $rec) $forums[$rec["id"]] = $rec["label"]; *************** *** 195,203 **** } ! if($_SESSION["OBJ_user"]->allow_access("phpwsbb", "delete_threads")) $tags["DELETE"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=delete&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/delete.png\" border=\"0\">" . $_SESSION["translate"]->it("Delete Topic") . "</a>"; ! if($_SESSION["OBJ_user"]->allow_access("phpwsbb", "hide_threads")) { ! if($this->isHidden()) $tags["HIDE"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=showthread&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/hideshow.png\" border=\"0\">" . $_SESSION["translate"]->it("Show Topic") . "</a>"; else --- 197,205 ---- } ! if ($_SESSION["OBJ_user"]->allow_access("phpwsbb", "delete_threads")) $tags["DELETE"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=delete&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/delete.png\" border=\"0\">" . $_SESSION["translate"]->it("Delete Topic") . "</a>"; ! if ($_SESSION["OBJ_user"]->allow_access("phpwsbb", "hide_threads")) { ! if ($this->isHidden()) $tags["HIDE"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=showthread&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/hideshow.png\" border=\"0\">" . $_SESSION["translate"]->it("Show Topic") . "</a>"; else *************** *** 205,210 **** } ! if($_SESSION["OBJ_user"]->allow_access("phpwsbb", "sticky_threads")) { ! if($this->_sticky) $tags["STICKY"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unstick&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/sticky.png\" border=\"0\">" . $_SESSION["translate"]->it("Unstick Topic") . "</a>"; else --- 207,212 ---- } ! if ($_SESSION["OBJ_user"]->allow_access("phpwsbb", "sticky_threads")) { ! if ($this->_sticky) $tags["STICKY"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unstick&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/sticky.png\" border=\"0\">" . $_SESSION["translate"]->it("Unstick Topic") . "</a>"; else *************** *** 213,220 **** } ! if($this->monitored) ! $tags["MONITOR"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unmonitor&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/unmonitor.png\" border=\"0\">" . $_SESSION["translate"]->it("Stop Monitor") . "</a>"; ! else ! $tags["MONITOR"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=monitor&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/monitor.png\" border=\"0\">" . $_SESSION["translate"]->it("Monitor") . "</a>"; $content = PHPWS_Template::processTemplate($tags, "phpwsbb", "view_thread.tpl"); --- 215,224 ---- } ! if ($_SESSION["PHPWSBB_Manager"]->_allow_user_monitors) { ! if ($this->monitored) ! $tags["MONITOR"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=unmonitor&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/unmonitor.png\" border=\"0\">" . $_SESSION["translate"]->it("Stop Monitor") . "</a>"; ! else ! $tags["MONITOR"] = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=monitor&PHPWS_MAN_ITEMS[]=" . $this->getId() . "\"><img src=\"./mod/phpwsbb/img/monitor.png\" border=\"0\">" . $_SESSION["translate"]->it("Monitor") . "</a>"; ! } $content = PHPWS_Template::processTemplate($tags, "phpwsbb", "view_thread.tpl"); *************** *** 235,243 **** function updateThread($new = FALSE) { ! if(!empty($this->_id)) { $sql = "SELECT id FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_messages WHERE tid=" . $this->getId() . " ORDER BY created;"; $this->messages = $GLOBALS["core"]->getCol($sql); $this->_replies = count($this->messages) - 1; ! if($this->_replies < 0) { /* * This means the only message in the thread was deleted via --- 239,247 ---- function updateThread($new = FALSE) { ! if (!empty($this->_id)) { $sql = "SELECT id FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_messages WHERE tid=" . $this->getId() . " ORDER BY created;"; $this->messages = $GLOBALS["core"]->getCol($sql); $this->_replies = count($this->messages) - 1; ! if ($this->_replies < 0) { /* * This means the only message in the thread was deleted via *************** *** 266,271 **** // Update owner to guestname of root message if empty // This is a backport for a fix that was implemented in 0.3.1 ! if($this->getOwner() == "") ! if(!empty($message->_guestname)) $this->_owner = $message->_guestname; --- 270,275 ---- // Update owner to guestname of root message if empty // This is a backport for a fix that was implemented in 0.3.1 ! if ($this->getOwner() == "") ! if (!empty($message->_guestname)) $this->_owner = $message->_guestname; *************** *** 279,309 **** // Send email to monitors for new messages ! if($new) { ! $sql = "SELECT email FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_monitors a," . $GLOBALS["core"]->tbl_prefix . "mod_users b WHERE a.thread_id=" . $this->getId() . " AND b.user_id=a.user_id"; ! $emails = $GLOBALS["core"]->getCol($sql); ! ! $admin_email = $_SESSION["PHPWSBB_Manager"]->_admin_email; ! if(empty($admin_email)) { ! extract(PHPWS_User::getSettings()); ! $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; ! // Replace [name] and [url] in $message ! $message = str_replace("[name]", "\"" . $this->getLabel() . "\"", $message); ! $message = str_replace("[url]", "http://" . PHPWS_HOME_HTTP . "index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $this->getId(), $message); ! ! foreach ($emails as $email) { ! $mail_object =& Mail::factory('mail'); ! $headers['From'] = $from; ! $headers['Subject'] = $subject; ! // $headers['To'] = $email; ! $mail_object->send($email, $headers, $message); } - - /* Removed for RFE 862965 */ - //if(!$this->monitored && !empty($_SESSION["OBJ_user"]->user_id)) - //$this->_monitor(); } --- 283,315 ---- // Send email to monitors for new messages ! if ($_SESSION["PHPWSBB_Manager"]->_allow_user_monitors) { ! if ($new) { ! $sql = "SELECT email FROM " . PHPWS_TBL_PREFIX . "mod_phpwsbb_monitors a," . $GLOBALS["core"]->tbl_prefix . "mod_users b WHERE a.thread_id=" . $this->getId() . " AND b.user_id=a.user_id"; ! $emails = $GLOBALS["core"]->getCol($sql); ! ! $admin_email = $_SESSION["PHPWSBB_Manager"]->_admin_email; ! if (empty($admin_email)) { ! extract(PHPWS_User::getSettings()); ! $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; ! // Replace [name] and [url] in $message ! $message = str_replace("[name]", "\"" . $this->getLabel() . "\"", $message); ! $message = str_replace("[url]", "http://" . PHPWS_HOME_HTTP . "index.php?module=phpwsbb&PHPWSBB_MAN_OP=view&PHPWS_MAN_ITEMS[]=" . $this->getId(), $message); ! ! foreach ($emails as $email) { ! $mail_object =& Mail::factory('mail'); ! $headers['From'] = $from; ! $headers['Subject'] = $subject; ! // $headers['To'] = $email; ! $mail_object->send($email, $headers, $message); ! } ! ! /* Removed for RFE 862965 */ ! //if (!$this->monitored && !empty($_SESSION["OBJ_user"]->user_id)) ! //$this->_monitor(); } } *************** *** 312,316 **** function _delete() { ! if(!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "delete_threads")) { $message = $_SESSION["translate"]->it("Access to delete this topic was denied due to lack of proper permissions."); $error = new PHPWS_Error("phpwsbb", "PHPWSBB_Thread::_delete()", $message, "exit", 1); --- 318,322 ---- function _delete() { ! if (!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "delete_threads")) { $message = $_SESSION["translate"]->it("Access to delete this topic was denied due to lack of proper permissions."); $error = new PHPWS_Error("phpwsbb", "PHPWSBB_Thread::_delete()", $message, "exit", 1); *************** *** 319,323 **** } ! if(isset($_REQUEST["Thread_yes"])) { $this->kill(); --- 325,329 ---- } ! if (isset($_REQUEST["Thread_yes"])) { $this->kill(); *************** *** 335,339 **** $_SESSION["PHPWSBB_Manager"]->action(); ! } elseif(isset($_REQUEST["Thread_no"])) { $message = $_SESSION["translate"]->it("No topic was deleted from the database."); $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb"); --- 341,345 ---- $_SESSION["PHPWSBB_Manager"]->action(); ! } elseif (isset($_REQUEST["Thread_no"])) { $message = $_SESSION["translate"]->it("No topic was deleted from the database."); $_SESSION["PHPWSBB_Manager"]->notice = new PHPWS_Message($message, "CNT_phpwsbb"); *************** *** 364,368 **** function _lock($unlock = FALSE) { ! if(!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "lock_threads")) { $message = $_SESSION["translate"]->it("Access to lock this topic was denied due to lack of proper permissions."); $error = new PHPWS_Error("phpwsbb", "PHPWSBB_Thread::_lock()", $message, "exit", 1); --- 370,374 ---- function _lock($unlock = FALSE) { ! if (!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "lock_threads")) { $message = $_SESSION["translate"]->it("Access to lock this topic was denied due to lack of proper permissions."); $error = new PHPWS_Error("phpwsbb", "PHPWSBB_Thread::_lock()", $message, "exit", 1); *************** *** 371,380 **** } ! if($unlock && $this->_locked) $this->_locked = 0; ! elseif(!$unlock && !$this->_locked) $this->_locked = 1; else { ! if($this->_locked) $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("This topic is already locked.") . "</div><br />\n"; else --- 377,386 ---- } ! if ($unlock && $this->_locked) $this->_locked = 0; ! elseif (!$unlock && !$this->_locked) $this->_locked = 1; else { ! if ($this->_locked) $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("This topic is already locked.") . "</div><br />\n"; else *************** *** 387,391 **** $error = $this->commit(); ! if(PHPWS_Error::isError($error)) { $message = $_SESSION["translate"]->it("The topic could not be saved to the database."); $error = new PHPWS_Error("phpwsbb", $message, "continue", 0); --- 393,397 ---- $error = $this->commit(); ! if (PHPWS_Error::isError($error)) { $message = $_SESSION["translate"]->it("The topic could not be saved to the database."); $error = new PHPWS_Error("phpwsbb", $message, "continue", 0); *************** *** 406,410 **** function _stick($unstick = FALSE) { ! if(!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "sticky_threads")) { $message = $_SESSION["translate"]->it("Access to stick this topic was denied due to lack of proper permissions."); $error = new PHPWS_Error("phpwsbb", "PHPWSBB_Thread::_stock()", $message, "exit", 1); --- 412,416 ---- function _stick($unstick = FALSE) { ! if (!$_SESSION["OBJ_user"]->allow_access("phpwsbb", "sticky_threads")) { $message = $_SESSION["translate"]->it("Access to stick this topic was denied due to lack of proper permissions."); $error = new PHPWS_Error("phpwsbb", "PHPWSBB_Thread::_stock()", $message, "exit", 1); *************** *** 413,422 **** } ! if($unstick && $this->_sticky) $this->_sticky = 0; ! elseif(!$unstick && !$this->_sticky) $this->_sticky = 1; else { ! if($this->_sticky) $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("This topic is already sticky.") . "</div><br />\n"; else --- 419,428 ---- } ! if ($unstick && $this->_sticky) $this->_sticky = 0; ! elseif (!$unstick && !$this->_sticky) $this->_sticky = 1; else { ! if ($this->_sticky) $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("This topic is already sticky.") . "</div><br />\n"; else *************** *** 429,433 **** $error = $this->commit(); ! if(PHPWS_Error::isError($error)) { $message = $_SESSION["translate"]->it("The topic could not be saved to the database."); $error = new PHPWS_Error("phpwsbb", $message, "continue", 0); --- 435,439 ---- $error = $this->commit(); ! if (PHPWS_Error::isError($error)) { $message = $_SESSION["translate"]->it("The topic could not be saved to the database."); $error = new PHPWS_Error("phpwsbb", $message, "continue", 0); *************** *** 448,483 **** function _monitor() { ! if(empty($_SESSION["OBJ_user"]->user_id)) { ! $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("You must be a registered user and logged in to monitor topics.") . "</div>"; ! } else { ! $data = array(); ! $data["thread_id"] = $this->getId(); ! $data["user_id"] = $_SESSION["OBJ_user"]->user_id; ! 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 { ! $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("There was a problem adding the monitor entry. Please try again or contact the system administrator.") . "</div>"; } } - - //$_REQUEST["PHPWSBB_THREAD_OP"] = "view"; - //$this->action(); }// END FUNC _monitor function _unmonitor() { ! $data = array(); ! $data["thread_id"] = $this->getId(); ! $data["user_id"] = $_SESSION["OBJ_user"]->user_id; ! 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 { ! $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("There was a problem removing the monitor entry. Please try again or contact the system administrator.") . "</div>"; } - }// END FUNC _unmonitor --- 454,492 ---- function _monitor() { ! if ($_SESSION["PHPWSBB_Manager"]->_allow_user_monitors) { ! if (empty($_SESSION["OBJ_user"]->user_id)) { ! $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("You must be a registered user and logged in to monitor topics.") . "</div>"; } else { ! $data = array(); ! $data["thread_id"] = $this->getId(); ! $data["user_id"] = $_SESSION["OBJ_user"]->user_id; ! 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 { ! $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("There was a problem adding the monitor entry. Please try again or contact the system administrator.") . "</div>"; ! } } + + //$_REQUEST["PHPWSBB_THREAD_OP"] = "view"; + //$this->action(); } }// END FUNC _monitor function _unmonitor() { ! if ($_SESSION["PHPWSBB_Manager"]->_allow_user_monitors) { ! $data = array(); ! $data["thread_id"] = $this->getId(); ! $data["user_id"] = $_SESSION["OBJ_user"]->user_id; ! 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 { ! $GLOBALS["CNT_phpwsbb"]["content"] .= "<div class=\"errortext\">" . $_SESSION["translate"]->it("There was a problem removing the monitor entry. Please try again or contact the system administrator.") . "</div>"; ! } } }// END FUNC _unmonitor *************** *** 486,490 **** $oldfid = $this->_fid; $this->_fid = $_REQUEST["Thread_fid"]; ! if($oldfid == $this->_fid) return $_SESSION["translate"]->it("You tried to move it to current forum."); $this->commit(); --- 495,499 ---- $oldfid = $this->_fid; $this->_fid = $_REQUEST["Thread_fid"]; ! if ($oldfid == $this->_fid) return $_SESSION["translate"]->it("You tried to move it to current forum."); $this->commit(); *************** *** 546,550 **** } ! if(isset($content)) { $GLOBALS["CNT_phpwsbb"]["title"] = $title; $GLOBALS["CNT_phpwsbb"]["content"] .= $content; --- 555,559 ---- } ! if (isset($content)) { $GLOBALS["CNT_phpwsbb"]["title"] = $title; $GLOBALS["CNT_phpwsbb"]["content"] .= $content; *************** *** 555,564 **** function getLabel($prefix = TRUE) { $lab = parent::getLabel(); ! if($prefix) { ! if($this->isHidden()) $lab = "<img src=\"./mod/phpwsbb/img/hideshow.png\" border=\"0\"> " . $lab; ! if($this->_locked) $lab = "<img src=\"./mod/phpwsbb/img/locked.png\" border=\"0\"> " . $lab; ! if($this->_sticky) $lab = "<img src=\"./mod/phpwsbb/img/sticky.png\" border=\"0\"> " . $lab; } --- 564,573 ---- function getLabel($prefix = TRUE) { $lab = parent::getLabel(); ! if ($prefix) { ! if ($this->isHidden()) $lab = "<img src=\"./mod/phpwsbb/img/hideshow.png\" border=\"0\"> " . $lab; ! if ($this->_locked) $lab = "<img src=\"./mod/phpwsbb/img/locked.png\" border=\"0\"> " . $lab; ! if ($this->_sticky) $lab = "<img src=\"./mod/phpwsbb/img/sticky.png\" border=\"0\"> " . $lab; } *************** *** 568,572 **** function getLastPost() { ! if($this->_lastpost) return date(PHPWS_DATE_FORMAT . " " . PHPWS_TIME_FORMAT, $this->_lastpost); else return NULL; }// END FUNC getLastPost --- 577,581 ---- function getLastPost() { ! if ($this->_lastpost) return date(PHPWS_DATE_FORMAT . " " . PHPWS_TIME_FORMAT, $this->_lastpost); else return NULL; }// END FUNC getLastPost *************** *** 575,579 **** function getForumLabel($link=FALSE) { $ret = $this->forumlabel; ! if($link) { $ret = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS[]=" . $this->_fid . "\">$ret</a>"; } --- 584,588 ---- function getForumLabel($link=FALSE) { $ret = $this->forumlabel; ! if ($link) { $ret = "<a href=\"./index.php?module=phpwsbb&PHPWSBB_MAN_OP=viewforum&PHPWS_MAN_ITEMS[]=" . $this->_fid . "\">$ret</a>"; } Index: Message.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Message.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** Message.php 18 Mar 2004 04:02:15 -0000 1.44 --- Message.php 18 Mar 2004 04:28:07 -0000 1.45 *************** *** 386,389 **** --- 386,390 ---- $thread->updateThread($new); + // 2004/03/17 DTS: Should this just be done in updateThread()? if ($_SESSION["PHPWSBB_Manager"]->_monitor_posts) { include_once("Mail.php"); Index: Manager.php =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/class/Manager.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Manager.php 16 Mar 2004 03:52:03 -0000 1.28 --- Manager.php 18 Mar 2004 04:28:07 -0000 1.29 *************** *** 68,71 **** --- 68,79 ---- /** + * Flag to enable/disable user monitors site-wide + * + * @var int + * @access private + */ + var $_allow_user_monitors; + + /** * Flag to have show forums block * *************** *** 154,157 **** --- 162,166 ---- $this->_email_text = $result[0]["email_text"]; $this->_monitor_posts = $result[0]["monitor_posts"]; + $this->_allow_user_monitors = $result[0]["allow_user_monitors"]; $this->_showforumsblock = $result[0]["showforumsblock"]; $this->_showlatestthreadsblock = $result[0]["showlatestthreadsblock"]; *************** *** 500,503 **** --- 509,517 ---- $tabs++; + $form->add("SETTINGS_allow_user_monitors", "checkbox"); + $form->setMatch("SETTINGS_allow_user_monitors", $this->_allow_user_monitors); + $form->setTab("SETTINGS_allow_user_monitors", $tabs); + $tabs++; + $form->add("SETTINGS_email_text", "textarea", $this->_email_text); $form->setCols("SETTINGS_email_text", 40); *************** *** 546,549 **** --- 560,564 ---- $tags["ADMIN_EMAIL_TEXT"] = $_SESSION["translate"]->it("Bulletin Board Admin Email"); $tags["MONITOR_POSTS_TEXT"] = $_SESSION["translate"]->it("Monitor Posts"); + $tags["ALLOW_USER_MONITORS_TEXT"] = $_SESSION["translate"]->it("Allow User Monitors"); $tags["BBOFFLINE_TEXT"] = $_SESSION["translate"]->it("Take Bulletin Board Offline"); $tags["EMAIL_TEXT_TEXT"] = $_SESSION["translate"]->it("Email Notification Text"); *************** *** 588,591 **** --- 603,611 ---- $this->_monitor_posts = 0; + if(isset($_REQUEST["SETTINGS_allow_user_monitors"])) + $this->_allow_user_monitors = 1; + else + $this->_allow_user_monitors = 0; + if(isset($_REQUEST["SETTINGS_bboffline"])) $this->_bboffline = 1; *************** *** 615,618 **** --- 635,639 ---- $data["email_text"] = $this->_email_text; $data["monitor_posts"] = $this->_monitor_posts; + $data["allow_user_monitors"] = $this->_allow_user_monitors; $data["bboffline"] = $this->_bboffline; $data["showforumsblock"] = $this->_showforumsblock; |
|
From: Don S. <ri...@us...> - 2004-03-18 04:37:43
|
Update of /cvsroot/phpwsbb/phpwsbb/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27984/templates Modified Files: edit_settings.tpl view_thread.tpl Log Message: RFE 86265 Added 'Allow User Monitors' Setting Index: edit_settings.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/edit_settings.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** edit_settings.tpl 16 Mar 2004 03:52:04 -0000 1.5 --- edit_settings.tpl 18 Mar 2004 04:28:08 -0000 1.6 *************** *** 2,8 **** --- 2,11 ---- {SETTINGS_ALLOW_ANON_POSTS} {ANONPOSTS_TEXT}<br /> {SETTINGS_ALLOW_ANON_VIEW} {ANONVIEW_TEXT}<br /> + <br /> {ADMIN_EMAIL_TEXT}: {SETTINGS_ADMIN_EMAIL} {ADMIN_EMAIL_HELP}<br /> {SETTINGS_MONITOR_POSTS} {MONITOR_POSTS_TEXT} {MONITOR_POSTS_HELP}<br /> + {SETTINGS_ALLOW_USER_MONITORS} {ALLOW_USER_MONITORS_TEXT}<br /> {EMAIL_TEXT_TEXT}: {EMAIL_TEXT_HELP}<br />{SETTINGS_EMAIL_TEXT}<br /> + <br /> {SETTINGS_SHOWFORUMSBLOCK} {SHOWFORUMSBLOCK_TEXT}<br /> {FORUMSBLOCKTITLE_TEXT}: {SETTINGS_FORUMSBLOCKTITLE}<br /> *************** *** 10,13 **** --- 13,17 ---- {LATESTTHREADSBLOCKTITLE_TEXT}: {SETTINGS_LATESTTHREADSBLOCKTITLE}<br /> {SETTINGS_MAXLATESTTHREADS} {MAXLATESTTHREADS_TEXT}<br /> + <br /> {SETTINGS_BBOFFLINE} {BBOFFLINE_TEXT} {BBOFFLINE_HELP}<br /> {SETTINGS_SAVE} Index: view_thread.tpl =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/templates/view_thread.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** view_thread.tpl 18 Mar 2004 04:02:15 -0000 1.9 --- view_thread.tpl 18 Mar 2004 04:28:08 -0000 1.10 *************** *** 2,6 **** --- 2,8 ---- <span class="smalltext">{REPLY}</span> <!-- END REPLY --> + <!-- BEGIN MONITOR --> <span class="smalltext"> | {MONITOR}</span> + <!-- END MONITOR --> <!-- BEGIN LOCK --> <span class="smalltext"> | {LOCK}</span> |
|
From: Don S. <ri...@us...> - 2004-03-18 04:37:43
|
Update of /cvsroot/phpwsbb/phpwsbb/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27984/docs Modified Files: ChangeLog Log Message: RFE 86265 Added 'Allow User Monitors' Setting Index: ChangeLog =================================================================== RCS file: /cvsroot/phpwsbb/phpwsbb/docs/ChangeLog,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** ChangeLog 18 Mar 2004 04:03:31 -0000 1.84 --- ChangeLog 18 Mar 2004 04:28:07 -0000 1.85 *************** *** 4,7 **** --- 4,8 ---- 17 Mar 2004; Don Seiler <do...@NO...> RFE #870690 Added icons. http://svgicons.sourceforge.net/ + RFE #862965 Added "Allow User Monitors" setting. 15 Mar 2004; Don Seiler <do...@NO...> |
