Menu
▾
▴
phpwebsite-comm-cvs-commits — Read-Only CVS commits log list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(120) |
Jun
(74) |
Jul
(97) |
Aug
(35) |
Sep
(35) |
Oct
(34) |
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(18) |
Feb
(8) |
Mar
(7) |
Apr
(23) |
May
(28) |
Jun
(31) |
Jul
(27) |
Aug
(34) |
Sep
(48) |
Oct
(511) |
Nov
(197) |
Dec
(333) |
| 2005 |
Jan
(212) |
Feb
(33) |
Mar
(94) |
Apr
(51) |
May
(16) |
Jun
|
Jul
(200) |
Aug
(43) |
Sep
(88) |
Oct
(60) |
Nov
(62) |
Dec
(41) |
| 2006 |
Jan
(94) |
Feb
(49) |
Mar
(54) |
Apr
|
May
(39) |
Jun
(39) |
Jul
(61) |
Aug
(36) |
Sep
(23) |
Oct
(76) |
Nov
(73) |
Dec
(32) |
| 2007 |
Jan
|
Feb
(87) |
Mar
|
Apr
(8) |
May
(36) |
Jun
(49) |
Jul
(54) |
Aug
(8) |
Sep
(50) |
Oct
(36) |
Nov
|
Dec
(3) |
| 2008 |
Jan
(133) |
Feb
(54) |
Mar
(39) |
Apr
(2) |
May
(6) |
Jun
(74) |
Jul
(97) |
Aug
(70) |
Sep
(12) |
Oct
(20) |
Nov
(64) |
Dec
(24) |
| 2009 |
Jan
(25) |
Feb
(49) |
Mar
(18) |
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(10) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(7) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eloi G. <ada...@us...> - 2008-10-13 14:04:15
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14401/templates Modified Files: search_advanced.tpl Log Message: An "Editable Articles Only" filter is added to the search menu Index: search_advanced.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/templates/search_advanced.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** search_advanced.tpl 30 Jun 2007 19:47:53 -0000 1.3 --- search_advanced.tpl 13 Oct 2008 14:03:54 -0000 1.4 *************** *** 70,73 **** --- 70,76 ---- </tr> <tr> + <td style="background-color: rgb(255, 238, 255); white-space: nowrap;">{EDITABLE_ONLY}{EDITABLE_ONLY_LABEL} </td> + </tr> + <tr> <td style="background-color: rgb(255, 238, 255);">{SEARCHTEXT_LABEL}</td> <td></td> |
|
From: Eloi G. <ada...@us...> - 2008-10-13 14:04:07
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14401/class Modified Files: AM_DisplayForms.php AM_Lists.php AM_Data.php Log Message: An "Editable Articles Only" filter is added to the search menu Index: AM_Data.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Data.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** AM_Data.php 11 Oct 2008 06:13:49 -0000 1.18 --- AM_Data.php 13 Oct 2008 14:03:54 -0000 1.19 *************** *** 374,377 **** --- 374,382 ---- $s_arr['updater_name'] = $_REQUEST['updater_name']; + if(isset($_REQUEST['editable_only'])) + $s_arr['editable_only'] = 1; + else + $s_arr['editable_only'] = 0; + if(!empty($_REQUEST['searchtext'])) $s_arr['searchtext'] = preg_replace('/\W/', '', $_REQUEST['searchtext']);; Index: AM_Lists.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Lists.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** AM_Lists.php 11 Oct 2008 06:13:49 -0000 1.20 --- AM_Lists.php 13 Oct 2008 14:03:54 -0000 1.21 *************** *** 148,158 **** break; } ! ! /* text */ ! if (!empty($s_arr['searchtext'])) { ! $db->addWhere('title', '%' . $s_arr['searchtext']. '%', 'like', 'or', 'textsearch'); ! $db->addWhere('summary', '%' . $s_arr['searchtext']. '%', 'like', 'or', 'textsearch'); ! $db->addWhere('pages', '%' . $s_arr['searchtext']. '%', 'like', 'or', 'textsearch'); ! } } --- 148,166 ---- break; } ! ! /* editable_only */ ! if (!empty($s_arr['editable_only'])) { ! Key::restrictEdit($db, 'article', 'edit_articles'); ! $db->addWhere('created_id', Current_User::getId(), null, 'or','key_1'); ! } ! else ! Key::restrictView($db, 'article'); ! ! /* text */ ! if (!empty($s_arr['searchtext'])) { ! $db->addWhere('title', '%' . $s_arr['searchtext']. '%', 'like', 'or', 'textsearch'); ! $db->addWhere('summary', '%' . $s_arr['searchtext']. '%', 'like', 'or', 'textsearch'); ! $db->addWhere('pages', '%' . $s_arr['searchtext']. '%', 'like', 'or', 'textsearch'); ! } } *************** *** 290,294 **** if(!empty($search_params['orderby'])) $pager->setOrder($search_params['orderby'], $search_params['orderby_dir']); - Key::restrictView($pager->db, 'article'); $lbls = array(); --- 298,301 ---- *************** *** 338,342 **** $pager->addPageTags($lbls); $content = $pager->get(); ! /* This trick is from http://www.madaboutstyle.com/tooltip2.html */ Layout::addStyle('article'); --- 345,349 ---- $pager->addPageTags($lbls); $content = $pager->get(); ! /* This trick is from http://www.madaboutstyle.com/tooltip2.html */ Layout::addStyle('article'); Index: AM_DisplayForms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_DisplayForms.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AM_DisplayForms.php 21 Aug 2008 20:17:32 -0000 1.5 --- AM_DisplayForms.php 13 Oct 2008 14:03:54 -0000 1.6 *************** *** 159,163 **** $tags['UPDATER_LABEL'] = dgettext('article', 'Last updated by'); $tags['UPDATER_3_LBL'] = '<input name="updater_name" value="'.$s_arr['updater_name'].'" size="20" maxlength="30" type="text">'; ! /* text search */ $form->addText('searchtext', $s_arr['searchtext']); --- 159,168 ---- $tags['UPDATER_LABEL'] = dgettext('article', 'Last updated by'); $tags['UPDATER_3_LBL'] = '<input name="updater_name" value="'.$s_arr['updater_name'].'" size="20" maxlength="30" type="text">'; ! ! /* editable_only */ ! $form->addCheckbox('editable_only'); ! $form->setMatch('editable_only', $s_arr['editable_only']); ! $form->setLabel('editable_only', dgettext('article', 'Editable articles only')); ! /* text search */ $form->addText('searchtext', $s_arr['searchtext']); |
|
From: Eloi G. <ada...@us...> - 2008-10-13 14:04:02
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14401/inc Modified Files: default_parameters.php Log Message: An "Editable Articles Only" filter is added to the search menu Index: default_parameters.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/default_parameters.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** default_parameters.php 4 Jul 2007 23:02:02 -0000 1.1 --- default_parameters.php 13 Oct 2008 14:03:51 -0000 1.2 *************** *** 23,28 **** --- 23,30 ---- $parameters['updater'] = 1; $parameters['updater_name'] = ''; + $parameters['editable_only'] = 0; $parameters['searchtext'] = ''; $parameters['orderby'] = 'updated_date'; $parameters['orderby_dir'] = 'desc'; + ?> |
|
From: Eloi G. <ada...@us...> - 2008-10-12 12:58:10
|
Update of /cvsroot/phpwebsite-comm/modules/article/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18282/templates Removed Files: menu.tpl Log Message: Deleted unused template file --- menu.tpl DELETED --- |
|
From: Eloi G. <ada...@us...> - 2008-10-11 06:13:57
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv704/class Modified Files: AM_EditForms.php AM_Actions.php AM_Lists.php AM_Data.php Article.php Log Message: RFE [2091396] - Approval Permissions are now given on a per-Admin basis Index: AM_EditForms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_EditForms.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** AM_EditForms.php 21 Aug 2008 20:17:32 -0000 1.7 --- AM_EditForms.php 11 Oct 2008 06:13:49 -0000 1.8 *************** *** 262,266 **** $article_tags['SAVE_DRAFT_BUTTON'] = '<input type="submit" name="ARTICLE_vars[op:save_draft]" value="'.dgettext('article', 'Save Article as Draft').'" />'; ! if (!$GLOBALS['Article']['val']['need_approval'] || Current_User::isUnrestricted('article')) $article_tags['SAVE_PUBLISH_BUTTON'] = '<input type="submit" name="ARTICLE_vars[op:save_approved]" value="'.dgettext('article', 'Save & Publish').'" />'; --- 262,266 ---- $article_tags['SAVE_DRAFT_BUTTON'] = '<input type="submit" name="ARTICLE_vars[op:save_draft]" value="'.dgettext('article', 'Save Article as Draft').'" />'; ! if (!$GLOBALS['Article']['val']['need_approval'] || Current_User::allow('article', 'approval')) $article_tags['SAVE_PUBLISH_BUTTON'] = '<input type="submit" name="ARTICLE_vars[op:save_approved]" value="'.dgettext('article', 'Save & Publish').'" />'; Index: AM_Data.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Data.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** AM_Data.php 10 Oct 2008 04:27:40 -0000 1.17 --- AM_Data.php 11 Oct 2008 06:13:49 -0000 1.18 *************** *** 148,152 **** , 'link' => 'index.php?module=article&op=main_menu'); ! if (Current_User::isUnrestricted('article')) { /* Count unapproved articles (custom) */ $version_db = new PHPWS_DB('article_version'); --- 148,152 ---- , 'link' => 'index.php?module=article&op=main_menu'); ! if (Current_User::allow('article', 'approval')) { /* Count unapproved articles (custom) */ $version_db = new PHPWS_DB('article_version'); Index: AM_Lists.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Lists.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AM_Lists.php 10 Oct 2008 04:27:40 -0000 1.19 --- AM_Lists.php 11 Oct 2008 06:13:49 -0000 1.20 *************** *** 313,322 **** $actions .= '<option value="set_main">'.dgettext('article', 'Set as Main Articles')."</option>\n" . '<option value="unset_main">'.dgettext('article', 'Remove from Main Articles')."</option>\n"; ! /* Set up Delete button */ ! if(Current_User::allow('article', 'delete_articles')) $actions .= '<option value="delete">'.dgettext('article', 'Delete')."</option>\n"; ! /* Set up Export button */ ! if(Current_User::isUnrestricted('article')) ! $actions .= '<option value="xml_export">'.dgettext('article', 'Export to XML')."</option>\n"; $lbls['BULK_ACTION'] = '<select id="list_actions_edit" name="op" title="' . dgettext('article', 'Select the desired action').'">'.$actions."</select>\n "; --- 313,321 ---- $actions .= '<option value="set_main">'.dgettext('article', 'Set as Main Articles')."</option>\n" . '<option value="unset_main">'.dgettext('article', 'Remove from Main Articles')."</option>\n"; ! /* Set up Delete & Export buttons */ ! if(Current_User::allow('article', 'delete_articles')) { $actions .= '<option value="delete">'.dgettext('article', 'Delete')."</option>\n"; ! $actions .= '<option value="xml_export">'.dgettext('article', 'Export to XML')."</option>\n"; ! } $lbls['BULK_ACTION'] = '<select id="list_actions_edit" name="op" title="' . dgettext('article', 'Select the desired action').'">'.$actions."</select>\n "; Index: AM_Actions.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Actions.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** AM_Actions.php 21 Aug 2008 20:17:31 -0000 1.13 --- AM_Actions.php 11 Oct 2008 06:13:49 -0000 1.14 *************** *** 69,73 **** $new_article->updated_date = date("Y-m-d H:i:s"); $new_article->hits = 0; ! $new_article->approved = (!$GLOBALS['Article']['val']['need_approval'] || Current_User::allow('approval')) ?1:0; $new_article->version = -1; $new_article->language = $language; --- 69,73 ---- $new_article->updated_date = date("Y-m-d H:i:s"); $new_article->hits = 0; ! $new_article->approved = (!$GLOBALS['Article']['val']['need_approval'] || Current_User::allow('article', 'approval')) ?1:0; $new_article->version = -1; $new_article->language = $language; Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** Article.php 10 Oct 2008 04:27:40 -0000 1.54 --- Article.php 11 Oct 2008 06:13:49 -0000 1.55 *************** *** 119,123 **** $this->publication_date = time(); $this->template = $GLOBALS['Article']['val']['default_article_template']; ! $this->approved = (!$GLOBALS['Article']['val']['need_approval'] || Current_User::allow('approval')) ?1:0; // if ($_SESSION['translate']->langActive) // $this->language = $_SESSION['translate']->current_language; --- 119,123 ---- $this->publication_date = time(); $this->template = $GLOBALS['Article']['val']['default_article_template']; ! $this->approved = (!$GLOBALS['Article']['val']['need_approval'] || Current_User::allow('article', 'approval')) ?1:0; // if ($_SESSION['translate']->langActive) // $this->language = $_SESSION['translate']->current_language; |
|
From: Eloi G. <ada...@us...> - 2008-10-11 06:13:57
|
Update of /cvsroot/phpwebsite-comm/modules/article In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv704 Modified Files: index_admin.php Log Message: RFE [2091396] - Approval Permissions are now given on a per-Admin basis Index: index_admin.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/index_admin.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** index_admin.php 10 Oct 2008 05:04:23 -0000 1.21 --- index_admin.php 11 Oct 2008 06:13:52 -0000 1.22 *************** *** 52,56 **** $vars['version_id'] = $version_id; ! if (!$version->vr_approved && Current_User::isUnrestricted('article')) { $vars['op'] = 'approve_item'; $options[] = PHPWS_Text::secureLink(dgettext('article', 'Approve'), 'article', $vars); --- 52,56 ---- $vars['version_id'] = $version_id; ! if (!$version->vr_approved && Current_User::allow('article', 'approval')) { $vars['op'] = 'approve_item'; $options[] = PHPWS_Text::secureLink(dgettext('article', 'Approve'), 'article', $vars); *************** *** 70,74 **** $title = sprintf(dgettext('article', 'This the current version (%s) of this article.'), $version->vr_number); } ! elseif (Current_User::isUnrestricted('article')) { // This is the url to our module that will restore the version $vars['op'] = 'restore_version'; --- 70,74 ---- $title = sprintf(dgettext('article', 'This the current version (%s) of this article.'), $version->vr_number); } ! elseif (Current_User::allow('article', 'approval')) { // This is the url to our module that will restore the version $vars['op'] = 'restore_version'; *************** *** 264,268 **** return; /* Make sure that user can approve the article */ ! if(!$GLOBALS['Article']['val']['need_approval'] || Current_User::isUnrestricted('article')) { /* This removes the [Draft] flag & approves the article. */ $article->approved = 1; --- 264,268 ---- return; /* Make sure that user can approve the article */ ! if(!$GLOBALS['Article']['val']['need_approval'] || Current_User::allow('article', 'approval')) { /* This removes the [Draft] flag & approves the article. */ $article->approved = 1; *************** *** 387,391 **** case 'xml_export': ! if (Current_User::isUnrestricted('article')) { PHPWS_Core::initModClass('article', 'AM_Actions.php'); /* This operation can be performed in bulk */ --- 387,391 ---- case 'xml_export': ! if (Current_User::allow('article', 'delete_articles')) { PHPWS_Core::initModClass('article', 'AM_Actions.php'); /* This operation can be performed in bulk */ *************** *** 420,424 **** case 'approve_item': ! if (!Current_User::isUnrestricted('article')) { Current_User::disallow('Attempted to approve an item.'); return; --- 420,424 ---- case 'approve_item': ! if (!Current_User::allow('article', 'approval')) { Current_User::disallow('Attempted to approve an item.'); return; *************** *** 439,443 **** case 'disapprove_item': ! if (!Current_User::isUnrestricted('article')) { Current_User::disallow('Attempted to disapprove an item.'); return; --- 439,443 ---- case 'disapprove_item': ! if (!Current_User::allow('article', 'approval')) { Current_User::disallow('Attempted to disapprove an item.'); return; *************** *** 458,462 **** case 'disapprove_item_cofirmed': ! if (!Current_User::isUnrestricted('article')) { Current_User::disallow('Attempted to disapprove an item.'); } --- 458,462 ---- case 'disapprove_item_cofirmed': ! if (!Current_User::allow('article', 'approval')) { Current_User::disallow('Attempted to disapprove an item.'); } *************** *** 519,523 **** case 'restore_version': ! if (!Current_User::isUnrestricted('article')) { Current_User::disallow('Attempted to restore a version'); return; --- 519,523 ---- case 'restore_version': ! if (!Current_User::allow('article', 'approval')) { Current_User::disallow('Attempted to restore a version'); return; *************** *** 537,541 **** case 'remove_version': ! if (!Current_User::isUnrestricted('article')) { Current_User::disallow('Attempted to delete a version'); return; --- 537,541 ---- case 'remove_version': ! if (!Current_User::allow('article', 'approval')) { Current_User::disallow('Attempted to delete a version'); return; |
|
From: Eloi G. <ada...@us...> - 2008-10-11 06:13:57
|
Update of /cvsroot/phpwebsite-comm/modules/article/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv704/boost Modified Files: permission.php update.php Log Message: RFE [2091396] - Approval Permissions are now given on a per-Admin basis Index: permission.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/permission.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** permission.php 21 Aug 2008 20:17:29 -0000 1.3 --- permission.php 11 Oct 2008 06:13:52 -0000 1.4 *************** *** 5,9 **** $permissions['create_articles'] = dgettext('article', 'Create Articles'); $permissions['edit_articles'] = dgettext('article', 'Edit Articles'); ! $permissions['delete_articles'] = dgettext('article', 'Delete Articles'); $permissions['images_in_article'] = dgettext('article', 'Place Images In Articles'); $permissions['choose_section_template'] = dgettext('article', 'Choose Section Templates'); --- 5,9 ---- $permissions['create_articles'] = dgettext('article', 'Create Articles'); $permissions['edit_articles'] = dgettext('article', 'Edit Articles'); ! $permissions['delete_articles'] = dgettext('article', 'Delete & Export Articles'); $permissions['images_in_article'] = dgettext('article', 'Place Images In Articles'); $permissions['choose_section_template'] = dgettext('article', 'Choose Section Templates'); *************** *** 15,18 **** --- 15,19 ---- $permissions['set_mainarticle'] = dgettext('article', 'Set Mainarticle'); $permissions['edit_robots'] = dgettext('article', 'Edit Search Engine Instructions'); + $permissions['approve'] = dgettext('article', 'Approve Articles'); $item_permissions = TRUE; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/boost/update.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** update.php 21 Aug 2008 20:17:29 -0000 1.21 --- update.php 11 Oct 2008 06:13:52 -0000 1.22 *************** *** 212,216 **** </pre>'; ! } // end of switch return true; --- 212,230 ---- </pre>'; ! ! case version_compare($currentVersion, '4.2.0', '<'): ! ! $content[] = '<pre> ! ======================== ! Changes in version 4.2.0 ! ======================== ! + RFE [2091396] - Approval Permissions can now be given on a per-Admin basis ! + ([ 2130662 ] Article Manager restricted content) ! + Fixed Bug Report [ 2130663 ] - Restricted Users cannot edit their own articles ! + Fixed Bug Report [ 2089717 ] - Articles awaiting approval all have the date Dec. 31, 1969. ! + ! </pre>'; ! ! } // end of switch return true; |
|
From: Eloi G. <ada...@us...> - 2008-10-10 05:04:31
|
Update of /cvsroot/phpwebsite-comm/modules/article In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30364 Modified Files: index_admin.php Log Message: Fixed Bug Report [ 2089717 ] - Articles awaiting approval all have the date Dec. 31, 1969. Index: index_admin.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/index_admin.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** index_admin.php 10 Oct 2008 04:27:40 -0000 1.20 --- index_admin.php 10 Oct 2008 05:04:23 -0000 1.21 *************** *** 412,416 **** $approval->setDisapproveUrl('index.php?module=article&op=disapprove_item'); $title = dgettext('article', 'Approval List for Article Manager'); ! $approval->columns = PHPWS_Article::get_summary_columns(); /* Don't pull up any rough drafts or deleteds */ $approval->addWhere('draft', 0); --- 412,416 ---- $approval->setDisapproveUrl('index.php?module=article&op=disapprove_item'); $title = dgettext('article', 'Approval List for Article Manager'); ! $approval->columns = array_merge(PHPWS_Article::get_summary_columns(), $approval->standard); /* Don't pull up any rough drafts or deleteds */ $approval->addWhere('draft', 0); |
|
From: Eloi G. <ada...@us...> - 2008-10-10 04:28:01
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28198/class Modified Files: AM_Lists.php AM_Data.php Article.php Log Message: Fixed Bug Report [ 2130663 ] - Restricted Users cannot edit their own articles Index: AM_Data.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Data.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** AM_Data.php 8 Oct 2008 17:21:18 -0000 1.16 --- AM_Data.php 10 Oct 2008 04:27:40 -0000 1.17 *************** *** 211,215 **** if (!empty($object)) { /* if user can edit articles or can edit this article... */ ! if ((Current_User::allow('article', 'edit_articles', $object->id) || (Current_User::getId() && $object->created_id == Current_User::getId())) & !$object->isLocked($object->editlock, $object->edituser)) $link[] = PHPWS_Text::moduleLink(dgettext('article', 'Edit this article'), 'article', array('op'=>'edit', 'id' => $object->id)); /* if user can delete articles or can delete this article... */ --- 211,215 ---- if (!empty($object)) { /* if user can edit articles or can edit this article... */ ! if ($object->can_edit() && !$object->isLocked($object->editlock, $object->edituser)) $link[] = PHPWS_Text::moduleLink(dgettext('article', 'Edit this article'), 'article', array('op'=>'edit', 'id' => $object->id)); /* if user can delete articles or can delete this article... */ Index: AM_Lists.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Lists.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** AM_Lists.php 8 Oct 2008 17:21:18 -0000 1.18 --- AM_Lists.php 10 Oct 2008 04:27:40 -0000 1.19 *************** *** 252,256 **** /* ACTION */ /* if user can edit articles or can edit this article... */ ! if (Current_User::allow('article', 'edit_articles', $id) || (Current_User::getId() && $created_id == Current_User::getId())) { /* If someone else is editing this page... */ if (PHPWS_Article::isLocked($editlock, $edituser)) --- 252,256 ---- /* ACTION */ /* if user can edit articles or can edit this article... */ ! if (PHPWS_Article::can_edit($id, $created_id)) { /* If someone else is editing this page... */ if (PHPWS_Article::isLocked($editlock, $edituser)) Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** Article.php 8 Oct 2008 17:21:18 -0000 1.53 --- Article.php 10 Oct 2008 04:27:40 -0000 1.54 *************** *** 282,286 **** /* if user can edit articles or can edit this article... */ ! if (Current_User::allow('article', 'edit_articles', $this->id) || (Current_User::getId() && $this->created_id == Current_User::getId())) { /* If someone else is editing this article... */ if ($this->isLocked($this->editlock, $this->edituser)) --- 282,286 ---- /* if user can edit articles or can edit this article... */ ! if ($this->can_edit()) { /* If someone else is editing this article... */ if ($this->isLocked($this->editlock, $this->edituser)) *************** *** 930,935 **** || ($_REQUEST['module']=='article' && !$saving ! && (Current_User::allow('article', 'edit_articles', $this->id) ! || (Current_User::getId() && $this->created_id == Current_User::getId())) || $GLOBALS['module']=='approval'); } --- 930,934 ---- || ($_REQUEST['module']=='article' && !$saving ! && ($this->can_edit()) || $GLOBALS['module']=='approval'); } *************** *** 1052,1056 **** , 'msg' => @$version->source_data['vr_reviewer_note']); } ! } ?> \ No newline at end of file --- 1051,1078 ---- , 'msg' => @$version->source_data['vr_reviewer_note']); } ! ! /** ! * Determines if an article can be edited by the user. ! * ! * If an id was not given, the method will assume that we're checking the ! * current object's permissions ! * ! * @author Eloi George <el...@NO...> ! * @module Article Manager ! * @param int $id : Article id to check, if known. ! * @param int $creator_id : Article Author id to check, if known. ! * @return bool : true or false. ! * @access public ! */ ! function can_edit ($id = null, $creator_id = null) { ! /* If an id was not given, check general editing pro */ ! if (empty($id)) { ! $id = $this->id; ! $creator_id = $this->created_id; ! } ! return Current_User::allow('article', 'edit_articles', $id) ! || (Current_User::getId() && $creator_id == Current_User::getId()); ! } ! } ?> \ No newline at end of file |
|
From: Eloi G. <ada...@us...> - 2008-10-10 04:28:01
|
Update of /cvsroot/phpwebsite-comm/modules/article/inc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28198/inc Modified Files: xmlrpc.php Log Message: Fixed Bug Report [ 2130663 ] - Restricted Users cannot edit their own articles Index: xmlrpc.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/xmlrpc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** xmlrpc.php 21 Aug 2008 20:17:19 -0000 1.9 --- xmlrpc.php 10 Oct 2008 04:27:40 -0000 1.10 *************** *** 325,329 **** return new IXR_Error(5020, 'Database Error! Article data could not be found.'); /* Check Authorization to do edit it */ ! if (!Current_User::allow('article', 'edit_articles', $article->id)) return new IXR_Error(4022, 'Authorization Error! You are not authorixed to edit this article!'); /* Make sure it's not a multi-section article */ --- 325,329 ---- return new IXR_Error(5020, 'Database Error! Article data could not be found.'); /* Check Authorization to do edit it */ ! if (!$article->can_edit()) return new IXR_Error(4022, 'Authorization Error! You are not authorixed to edit this article!'); /* Make sure it's not a multi-section article */ *************** *** 464,468 **** return new IXR_Error(5020, 'Database Error! Article data could not be found.'); /* Check Authorization to do edit it */ ! if (!Current_User::allow('article', 'edit_articles', $article->id)) return new IXR_Error(4022, 'Authorization Error! You are not authorixed to edit this article!'); --- 464,468 ---- return new IXR_Error(5020, 'Database Error! Article data could not be found.'); /* Check Authorization to do edit it */ ! if (!$article->can_edit()) return new IXR_Error(4022, 'Authorization Error! You are not authorixed to edit this article!'); |
|
From: Eloi G. <ada...@us...> - 2008-10-10 04:28:00
|
Update of /cvsroot/phpwebsite-comm/modules/article In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28198 Modified Files: index_admin.php Log Message: Fixed Bug Report [ 2130663 ] - Restricted Users cannot edit their own articles Index: index_admin.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/index_admin.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** index_admin.php 10 Oct 2008 03:59:43 -0000 1.19 --- index_admin.php 10 Oct 2008 04:27:40 -0000 1.20 *************** *** 65,69 **** $title = dgettext('article', 'This is a preview of edits to this article.'); } ! elseif ($version->vr_current && (Current_User::allow('article', 'edit_articles', $article->id) || (Current_User::getId() && $article->created_id == Current_User::getId()))) { $vars['edit'] = 'view'; $options[] = PHPWS_Text::secureLink(dgettext('article', 'Edit'), 'article', $vars); --- 65,69 ---- $title = dgettext('article', 'This is a preview of edits to this article.'); } ! elseif ($version->vr_current && $article->can_edit()) { $vars['edit'] = 'view'; $options[] = PHPWS_Text::secureLink(dgettext('article', 'Edit'), 'article', $vars); *************** *** 695,699 **** /* No versions?!?! Load the article. */ $article = & new PHPWS_Article((int) $_REQUEST['id']); ! if (!(Current_User::allow('article', 'edit_articles', $article->id) || (Current_User::getId() && $article->created_id == Current_User::getId()))) { Current_User::disallow(dgettext('article', 'User tried to edit an article.')); return false; --- 695,699 ---- /* No versions?!?! Load the article. */ $article = & new PHPWS_Article((int) $_REQUEST['id']); ! if (!$article->can_edit()) { Current_User::disallow(dgettext('article', 'User tried to edit an article.')); return false; |
|
From: Eloi G. <ada...@us...> - 2008-10-10 03:59:59
|
Update of /cvsroot/phpwebsite-comm/modules/article In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25974 Modified Files: index_admin.php Log Message: Updated Approval db access method to work with phpWS 1.6 Index: index_admin.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/index_admin.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** index_admin.php 21 Aug 2008 20:17:21 -0000 1.18 --- index_admin.php 10 Oct 2008 03:59:43 -0000 1.19 *************** *** 65,69 **** $title = dgettext('article', 'This is a preview of edits to this article.'); } ! elseif ($version->vr_current && Current_User::allow('article', 'edit_articles', $article->id)) { $vars['edit'] = 'view'; $options[] = PHPWS_Text::secureLink(dgettext('article', 'Edit'), 'article', $vars); --- 65,69 ---- $title = dgettext('article', 'This is a preview of edits to this article.'); } ! elseif ($version->vr_current && (Current_User::allow('article', 'edit_articles', $article->id) || (Current_User::getId() && $article->created_id == Current_User::getId()))) { $vars['edit'] = 'view'; $options[] = PHPWS_Text::secureLink(dgettext('article', 'Edit'), 'article', $vars); *************** *** 414,419 **** $approval->columns = PHPWS_Article::get_summary_columns(); /* Don't pull up any rough drafts or deleteds */ ! $approval->_db->addWhere('draft', 0); ! $approval->_db->addWhere('active', 1); $content = $approval->getList(); break; --- 414,419 ---- $approval->columns = PHPWS_Article::get_summary_columns(); /* Don't pull up any rough drafts or deleteds */ ! $approval->addWhere('draft', 0); ! $approval->addWhere('active', 1); $content = $approval->getList(); break; *************** *** 695,699 **** /* No versions?!?! Load the article. */ $article = & new PHPWS_Article((int) $_REQUEST['id']); ! if (!Current_User::allow('article', 'edit_articles', $article->id)) { Current_User::disallow(dgettext('article', 'User tried to edit an article.')); return false; --- 695,699 ---- /* No versions?!?! Load the article. */ $article = & new PHPWS_Article((int) $_REQUEST['id']); ! if (!(Current_User::allow('article', 'edit_articles', $article->id) || (Current_User::getId() && $article->created_id == Current_User::getId()))) { Current_User::disallow(dgettext('article', 'User tried to edit an article.')); return false; |
|
From: Verdon V. <ve...@us...> - 2008-10-09 19:41:01
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27908/class Modified Files: RDX_Forms.php RDX_Member.php RDX_Runtime.php Rolodex.php Log Message: 1.2.0 updates Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** RDX_Forms.php 11 Aug 2008 14:54:08 -0000 1.24 --- RDX_Forms.php 9 Oct 2008 19:40:47 -0000 1.25 *************** *** 42,50 **** case 'edit_member': if (empty($this->rolodex->member)) { ! $this->rolodex->loadMember($_POST['user_id']); // I don't think the id in here matters but am unsure? } if (!isset($this->rolodex->member->user_id)) { ! $this->rolodex->member->user_id = $_POST['user_id']; } $admin = true; --- 42,50 ---- case 'edit_member': if (empty($this->rolodex->member)) { ! $this->rolodex->loadMember($_REQUEST['user_id']); // I don't think the id in here matters but am unsure? } if (!isset($this->rolodex->member->user_id)) { ! $this->rolodex->member->user_id = $_REQUEST['user_id']; } $admin = true; *************** *** 54,61 **** case 'edit_my_member': if (empty($this->rolodex->member)) { ! $this->rolodex->loadMember($_POST['user_id']); // I don't think the id in here matters but am unsure? } if (!isset($this->rolodex->member->user_id)) { ! $this->rolodex->member->user_id = $_POST['user_id']; } if ($this->rolodex->member->isMine()) { --- 54,61 ---- case 'edit_my_member': if (empty($this->rolodex->member)) { ! $this->rolodex->loadMember($_REQUEST['user_id']); // I don't think the id in here matters but am unsure? } if (!isset($this->rolodex->member->user_id)) { ! $this->rolodex->member->user_id = $_REQUEST['user_id']; } if ($this->rolodex->member->isMine()) { *************** *** 834,838 **** $form->addHidden('aop', 'edit_member'); ! PHPWS_Core::initModClass('user', 'Users.php'); $db = new PHPWS_DB('users'); $db->addColumn('id'); --- 834,839 ---- $form->addHidden('aop', 'edit_member'); ! // I don't seem to need the class ! // PHPWS_Core::initModClass('users', 'Users.php'); $db = new PHPWS_DB('users'); $db->addColumn('id'); *************** *** 1119,1122 **** --- 1120,1128 ---- } + if (Current_User::allow('users', 'edit_users')) { + $tpl['EDIT_USER'] = $member->editUserLink(); + $tpl['ACTIVE_LINK'] = $member->activeLink(); + } + if (Current_User::allow('rolodex', 'edit_member')) { $js_vars['form_name'] = 'rolodex_member'; *************** *** 1241,1244 **** --- 1247,1270 ---- function contactMember() { + if (isset($_POST['name'])) { + $_POST['name'] = $_POST['name']; + } else { + $_POST['name'] = null; + } + if (isset($_POST['email'])) { + $_POST['email'] = $_POST['email']; + } else { + $_POST['email'] = null; + } + if (isset($_POST['subject'])) { + $_POST['subject'] = $_POST['subject']; + } else { + $_POST['subject'] = null; + } + if (isset($_POST['message'])) { + $_POST['message'] = $_POST['message']; + } else { + $_POST['message'] = null; + } $form = new PHPWS_Form; $form->addHidden('module', 'rolodex'); Index: RDX_Runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Runtime.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RDX_Runtime.php 6 Jul 2008 13:05:17 -0000 1.3 --- RDX_Runtime.php 9 Oct 2008 19:40:47 -0000 1.4 *************** *** 45,49 **** $db->addColumn('user_id'); $db->addWhere('active', 1); ! if (!$_SESSION['User']->id) { $db->addWhere('privacy', 0); } else { --- 45,49 ---- $db->addColumn('user_id'); $db->addWhere('active', 1); ! if (!Current_User::isLogged()) { $db->addWhere('privacy', 0); } else { Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Rolodex.php 26 Jul 2008 20:57:18 -0000 1.20 --- Rolodex.php 9 Oct 2008 19:40:47 -0000 1.21 *************** *** 532,536 **** case 'post_member': ! if (Current_User::getId() !== $_POST['user_id']) { Current_User::disallow(); } --- 532,539 ---- case 'post_member': ! // print(Current_User::getId() . ':' . $_REQUEST['user_id']); exit; ! // print($_SESSION['User']->id . ':' . $_REQUEST['user_id']); exit; ! // if (Current_User::getId() !== $_REQUEST['user_id']) { ! if ($_SESSION['User']->id != $_REQUEST['user_id']) { Current_User::disallow(); } *************** *** 739,743 **** } ! if (Current_User::allow('rolodex', 'settings', null, null, true)){ $tags['info'] = array('title'=>dgettext('rolodex', 'Read me'), 'link'=>$link); --- 742,746 ---- } ! if (Current_User::isDeity()){ $tags['info'] = array('title'=>dgettext('rolodex', 'Read me'), 'link'=>$link); *************** *** 1003,1011 **** return false; } else { ! if (PHPWS_Settings::save('rolodex')) { ! return true; ! } else { ! return falsel; ! } } --- 1006,1011 ---- return false; } else { ! PHPWS_Settings::save('rolodex'); ! return true; } *************** *** 1592,1596 **** } ! if (Current_User::allow('rolodex', 'settings', null, null, true) && !$_REQUEST['aop']){ $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Settings'), "rolodex", array('aop'=>'menu', 'tab'=>'settings')); } --- 1592,1596 ---- } ! if (Current_User::allow('rolodex', 'settings', null, null, true) && !isset($_REQUEST['aop'])){ $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Settings'), "rolodex", array('aop'=>'menu', 'tab'=>'settings')); } Index: RDX_Member.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** RDX_Member.php 25 Jul 2008 12:28:15 -0000 1.17 --- RDX_Member.php 9 Oct 2008 19:40:47 -0000 1.18 *************** *** 1341,1344 **** --- 1341,1345 ---- $vars2['id'] = $this->user_id; $vars2['uop'] = 'view_rss'; + $links = null; if (Current_User::allow('rolodex', 'edit_member')){ *************** *** 1554,1557 **** --- 1555,1559 ---- function editLink() { + $link = null; if (Current_User::allow('rolodex', 'edit_member') || $this->isMine()) { if ($this->isMine()) { *************** *** 1569,1574 **** --- 1571,1641 ---- + function editUserLink() + { + $link = null; + if (Current_User::allow('users', 'edit_users')) { + $user = new PHPWS_User($this->user_id); + $vars['user_id'] = $this->user_id; + $vars['action'] = 'admin'; + $vars['command'] = 'editUser'; + $link = PHPWS_Text::secureLink(sprintf(dgettext('rolodex', 'Edit email and password for %s (%s)'), $user->display_name, $user->username), 'users', $vars); + } + return $link; + } + + + function activateUserLink() + { + $link = null; + if (Current_User::allow('users', 'edit_users')) { + $user = new PHPWS_User($this->user_id); + $vars['user_id'] = $this->user_id; + $vars['action'] = 'admin'; + $vars['command'] = 'activateUser'; + $link = PHPWS_Text::secureLink(sprintf(dgettext('rolodex', 'Activate user %s (%s)'), $user->display_name, $user->username), 'users', $vars); + } + return $link; + } + + + function deactivateUserLink() + { + $link = null; + if (Current_User::allow('users', 'edit_users')) { + $user = new PHPWS_User($this->user_id); + $vars['user_id'] = $this->user_id; + $vars['action'] = 'admin'; + $vars['command'] = 'deactivateUser'; + $link = PHPWS_Text::secureLink(sprintf(dgettext('rolodex', 'Deactivate user %s (%s)'), $user->display_name, $user->username), 'users', $vars); + } + return $link; + } + + + function activeLink() + { + $link = null; + if (Current_User::allow('users', 'edit_users')) { + $user = new PHPWS_User($this->user_id); + if ($user->active) { + $vars['user_id'] = $this->user_id; + $vars['action'] = 'admin'; + $vars['command'] = 'deactivateUser'; + $link = PHPWS_Text::secureLink(sprintf(dgettext('rolodex', 'Deactivate user %s (%s)'), $user->display_name, $user->username), 'users', $vars); + } else { + $vars['user_id'] = $this->user_id; + $vars['action'] = 'admin'; + $vars['command'] = 'activateUser'; + $link = PHPWS_Text::secureLink(sprintf(dgettext('rolodex', 'Activate user %s (%s)'), $user->display_name, $user->username), 'users', $vars); + } + } + return $link; + } + + function getGoogleMap($location='mailing') { + $address = null; + if ($location == 'mailing') { if (!empty($this->mailing_address_1)) |
|
From: Verdon V. <ve...@us...> - 2008-10-09 19:41:00
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/templates In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27908/templates Modified Files: edit_member.tpl Log Message: 1.2.0 updates Index: edit_member.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_member.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** edit_member.tpl 25 Jul 2008 12:28:19 -0000 1.10 --- edit_member.tpl 9 Oct 2008 19:40:48 -0000 1.11 *************** *** 18,21 **** --- 18,22 ---- </div> <br style="clear: both" /> + <!-- BEGIN edit_user --><p>{EDIT_USER}<br />{ACTIVE_LINK}</p><!-- END edit_user --> <p>{BUSINESS_NAME} {BUSINESS_NAME_LABEL}</p> <p>{DEPARTMENT} {DEPARTMENT_LABEL}<br />{POSITION_TITLE} {POSITION_TITLE_LABEL}</p> |
|
From: Verdon V. <ve...@us...> - 2008-10-09 19:41:00
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27908/docs Modified Files: CHANGELOG Log Message: 1.2.0 updates Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CHANGELOG 11 Aug 2008 14:54:12 -0000 1.13 --- CHANGELOG 9 Oct 2008 19:40:48 -0000 1.14 *************** *** 75,78 **** + Fixed bug where some list parameters were being cleared when a search was not being done, when paging a list of users ! --- 75,85 ---- + Fixed bug where some list parameters were being cleared when a search was not being done, when paging a list of users ! + Fixed a session bug in RDX_Runtime ! + Fixed a few php notices ! + Made Read Me tab restricted to deity users ! + Fixed minor bug in save settings ! + Module now defaults to list view instead of home if no arg is set ! + Fixed bug when users were posting their own update and getting a 403 ! + Added links in Rolodex edit screen so that admins with sufficient ! priveledges will be able to edit and/or activate the related user |
|
From: Verdon V. <ve...@us...> - 2008-10-09 19:40:59
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27908 Modified Files: index.php Log Message: 1.2.0 updates Index: index.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.php 31 Mar 2008 19:42:40 -0000 1.2 --- index.php 9 Oct 2008 19:40:44 -0000 1.3 *************** *** 41,45 **** $rolodex->userMenu('view_member'); } else { ! PHPWS_Core::home(); } --- 41,45 ---- $rolodex->userMenu('view_member'); } else { ! $rolodex->userMenu('list'); } |
|
From: Verdon V. <ve...@us...> - 2008-10-09 19:40:59
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/boost In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27908/boost Modified Files: boost.php update.php Log Message: 1.2.0 updates Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/boost.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** boost.php 24 Jul 2008 12:40:13 -0000 1.7 --- boost.php 9 Oct 2008 19:40:47 -0000 1.8 *************** *** 24,28 **** $proper_name = 'Rolodex'; ! $version = '1.1.0'; $image_dir = true; $import_sql = true; --- 24,28 ---- $proper_name = 'Rolodex'; ! $version = '1.2.0'; $image_dir = true; $import_sql = true; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** update.php 26 Jul 2008 20:57:14 -0000 1.14 --- update.php 9 Oct 2008 19:40:47 -0000 1.15 *************** *** 179,182 **** --- 179,205 ---- + case version_compare($currentVersion, '1.2.0', '<'): + $content[] = '<pre>'; + + /* + $files = array('templates/edit_member.tpl', + 'templates/edit_settings.tpl', + 'templates/adv_search_form.tpl', + 'templates/view_member.tpl', + 'templates/list_member.tpl' + ); + rolodexUpdateFiles($files, $content); + */ + $content[] = '1.2.0 changes + ---------------- + + Fixed bug where some list parameters were being cleared when + a search was not being done, when paging a list of users + + Fixed a session bug in RDX_Runtime + + Fixed a few php notices + + Made Read Me tab restricted to deity users + + </pre>'; + + |
|
From: Eloi G. <ada...@us...> - 2008-10-08 17:21:34
|
Update of /cvsroot/phpwebsite-comm/modules/article/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18219/class Modified Files: AM_Lists.php AM_Data.php Article.php Log Message: Added ownership check before showing an edit link Index: AM_Data.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Data.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** AM_Data.php 21 Aug 2008 20:17:32 -0000 1.15 --- AM_Data.php 8 Oct 2008 17:21:18 -0000 1.16 *************** *** 211,215 **** if (!empty($object)) { /* if user can edit articles or can edit this article... */ ! if (Current_User::allow('article', 'edit_articles', $object->id) & !$object->isLocked($object->editlock, $object->edituser)) $link[] = PHPWS_Text::moduleLink(dgettext('article', 'Edit this article'), 'article', array('op'=>'edit', 'id' => $object->id)); /* if user can delete articles or can delete this article... */ --- 211,215 ---- if (!empty($object)) { /* if user can edit articles or can edit this article... */ ! if ((Current_User::allow('article', 'edit_articles', $object->id) || (Current_User::getId() && $object->created_id == Current_User::getId())) & !$object->isLocked($object->editlock, $object->edituser)) $link[] = PHPWS_Text::moduleLink(dgettext('article', 'Edit this article'), 'article', array('op'=>'edit', 'id' => $object->id)); /* if user can delete articles or can delete this article... */ Index: AM_Lists.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/AM_Lists.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** AM_Lists.php 21 Aug 2008 20:17:32 -0000 1.17 --- AM_Lists.php 8 Oct 2008 17:21:18 -0000 1.18 *************** *** 252,256 **** /* ACTION */ /* if user can edit articles or can edit this article... */ ! if (Current_User::allow('article', 'edit_articles', $created_id)) { /* If someone else is editing this page... */ if (PHPWS_Article::isLocked($editlock, $edituser)) --- 252,256 ---- /* ACTION */ /* if user can edit articles or can edit this article... */ ! if (Current_User::allow('article', 'edit_articles', $id) || (Current_User::getId() && $created_id == Current_User::getId())) { /* If someone else is editing this page... */ if (PHPWS_Article::isLocked($editlock, $edituser)) Index: Article.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/article/class/Article.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** Article.php 21 Aug 2008 20:17:32 -0000 1.52 --- Article.php 8 Oct 2008 17:21:18 -0000 1.53 *************** *** 282,286 **** /* if user can edit articles or can edit this article... */ ! if (Current_User::allow('article', 'edit_articles', $this->id)) { /* If someone else is editing this article... */ if ($this->isLocked($this->editlock, $this->edituser)) --- 282,286 ---- /* if user can edit articles or can edit this article... */ ! if (Current_User::allow('article', 'edit_articles', $this->id) || (Current_User::getId() && $this->created_id == Current_User::getId())) { /* If someone else is editing this article... */ if ($this->isLocked($this->editlock, $this->edituser)) *************** *** 924,928 **** { $now = time(); ! return ($this->mainarticle || ($this->approved && $this->publication_date <= $now --- 924,928 ---- { $now = time(); ! return $this->mainarticle || ($this->approved && $this->publication_date <= $now *************** *** 930,934 **** || ($_REQUEST['module']=='article' && !$saving ! && Current_User::allow('article', 'edit_articles', $this->id)) || $GLOBALS['module']=='approval'); } --- 930,935 ---- || ($_REQUEST['module']=='article' && !$saving ! && (Current_User::allow('article', 'edit_articles', $this->id) ! || (Current_User::getId() && $this->created_id == Current_User::getId())) || $GLOBALS['module']=='approval'); } |
|
From: Eloi G. <ada...@us...> - 2008-10-08 17:11:36
|
Update of /cvsroot/phpwebsite-comm/modules/phpwsbb/class In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17831/class Modified Files: BB_Lists.php Log Message: Corrected minor bugs Index: BB_Lists.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/class/BB_Lists.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BB_Lists.php 12 Sep 2008 07:12:03 -0000 1.2 --- BB_Lists.php 8 Oct 2008 17:11:22 -0000 1.3 *************** *** 174,254 **** } - /** - * Searches the comments stored in the database - * - * @author Eloi George <el...@NO...> - * @module Article Manager - * @param none - * @return none - */ - public function search_comments ($type, $var = null) - { - /* Create DBPager object */ - PHPWS_Core::initCoreClass('DBPager.php'); - Layout::addStyle('comments'); - - $pager = new DBPager('comments_items'); - $pager->setModule('phpwsbb'); - $pager->setTemplate('search_posts.tpl'); - $pager->setCacheIdentifier('search_'.$type); - $pager->cacheQueries(); - $pager->setDefaultOrder('create_time', 'desc'); - $pager->setDefaultLimit(30); - $pager->setLimitList(array(30,60,90)); - $pager->setEmptyMessage(dgettext('phpwsbb', 'No posts were found.')); - $pager->addToggle(' toggle1"'); - $pager->addToggle(' toggle2"'); - $pager->addRowFunction(array('PHPWSBB_Lists', 'getCommentTpl')); - $pager->setSearch('title'); - - /* Modify WHERE clause to the desired list type */ - switch ($type) { - case 'userposts': - $pager->addWhere('author_id', $var); - break; - } - $pager->db->addColumn('comments_items.*'); - $pager->db->addColumn('phpws_key.title', null, 'topic_title'); - $pager->db->addColumn('phpws_key.times_viewed', null, 'times_viewed'); - $pager->db->addColumn('phpwsbb_forums.title', null, 'forum_title'); - $pager->db->addColumn('phpwsbb_forums.id', null, 'forum_id'); - $pager->db->addColumn('phpwsbb_topics.total_posts', null, 'total_posts'); - $pager->addWhere('approved', 1); - $pager->db->addWhere('phpws_key.id', 'phpwsbb_topics.key_id'); - $pager->db->addWhere('phpwsbb_topics.id', 'comments_items.thread_id'); - if(!Current_User::allow('phpwsbb', 'manage_forums')) { - $pager->db->addWhere('phpwsbb_forums.id', 'phpwsbb_topics.fid'); - $pager->db->addWhere('phpwsbb_forums.id', PHPWSBB_Data::get_forum_ids()); - } - $pager->addSortHeader('phpws_key.title', dgettext('phpwsbb', 'Topic')); - $pager->addSortHeader('phpwsbb_forums.title', dgettext('phpwsbb', 'In Forum')); - $pager->addSortHeader('create_time', dgettext('phpwsbb', 'Date')); - $pager->table_columns[] = 'phpws_key.title'; - $pager->table_columns[] = 'phpwsbb_forums.title'; - - return $pager->get(); - } - - public function getCommentTpl($data) { - $thread = new Comment_Thread; - $comment = new Comment_Item; - PHPWS_Core::plugObject($comment, $data); - $tpl = $comment->getTpl($thread); - $tpl['TOPIC_ID'] = $data['thread_id']; - $tpl['TOPIC_TITLE'] = $data['topic_title']; - $tpl['TOPIC_LBL'] = dgettext('phpwsbb', 'In Topic'); - $tpl['TOPIC_LINK'] = PHPWS_Text::rewriteLink($data['topic_title'], 'phpwsbb', array('view'=>'topic', 'id'=>$data['thread_id'])); - $tpl['FORUM_ID'] = $data['forum_id']; - $tpl['FORUM_TITLE'] = $data['forum_title']; - $tpl['FORUM_LBL'] = dgettext('phpwsbb', 'In Forum'); - $tpl['FORUM_LINK'] = PHPWS_Text::rewriteLink($data['forum_title'], 'phpwsbb', array('view'=>'forum', 'id'=>$data['forum_id'])); - $tpl['REPLY_LBL'] = dgettext('phpwsbb', 'Replies'); - $tpl['REPLIES'] = $data['total_posts'] - 1; - $tpl['VIEWS_LBL'] = dgettext('phpwsbb', 'Views'); - $tpl['TOTAL_VIEWS'] = $data['times_viewed']; - - return $tpl; - } - } ?> \ No newline at end of file --- 174,177 ---- |
|
From: Eloi G. <ada...@us...> - 2008-10-08 17:11:33
|
Update of /cvsroot/phpwebsite-comm/modules/phpwsbb In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17831 Modified Files: index.php Log Message: Corrected minor bugs Index: index.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/phpwsbb/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.php 23 Aug 2008 04:15:49 -0000 1.1 --- index.php 8 Oct 2008 17:11:19 -0000 1.2 *************** *** 89,93 **** } break; ! case 'forum': $forum = new PHPWSBB_Forum((int) $_GET['id']); --- 89,93 ---- } break; ! case 'forum': $forum = new PHPWSBB_Forum((int) $_GET['id']); *************** *** 118,122 **** $forum = & $GLOBALS['BBForums'][(int) $_REQUEST['forum']]; } ! switch ($_REQUEST['op']) { case 'create_topic': --- 118,122 ---- $forum = & $GLOBALS['BBForums'][(int) $_REQUEST['forum']]; } ! switch ($_REQUEST['op']) { case 'create_topic': *************** *** 126,130 **** $content = $topic->edit(); break; ! case 'save_topic': // Make sure that we can save this topic --- 126,130 ---- $content = $topic->edit(); break; ! case 'save_topic': // Make sure that we can save this topic *************** *** 146,150 **** unset($message); break; ! case 'getnew': if (!empty($_SESSION['phpwsbb_last_on'])) --- 146,150 ---- unset($message); break; ! case 'getnew': if (!empty($_SESSION['phpwsbb_last_on'])) *************** *** 155,159 **** Layout::addPageTitle($title); break; ! case 'viewtoday': $since = strtotime('00:00 today'); --- 155,159 ---- Layout::addPageTitle($title); break; ! case 'viewtoday': $since = strtotime('00:00 today'); *************** *** 163,167 **** Layout::addPageTitle($title); break; ! case 'viewweek': $since = strtotime('last monday'); --- 163,167 ---- Layout::addPageTitle($title); break; ! case 'viewweek': $since = strtotime('last monday'); *************** *** 171,175 **** Layout::addPageTitle($title); break; ! case 'viewzerothreads': $title = dgettext('phpwsbb', 'Threads with no replies'); --- 171,175 ---- Layout::addPageTitle($title); break; ! case 'viewzerothreads': $title = dgettext('phpwsbb', 'Threads with no replies'); *************** *** 178,182 **** Layout::addPageTitle($title); break; ! case 'viewuserthreads': PHPWS_Core::initModClass('phpwsbb', 'BB_Lists.php'); --- 178,182 ---- Layout::addPageTitle($title); break; ! case 'viewuserthreads': PHPWS_Core::initModClass('phpwsbb', 'BB_Lists.php'); *************** *** 191,206 **** break; - case 'viewuserposts': - PHPWS_Core::initModClass('phpwsbb', 'BB_Lists.php'); - if (isset($_REQUEST['user'])) { - $title = sprintf(dgettext('phpwsbb', 'Bulletin Board Comments made by %s'), $_REQUEST['username']); - $content = PHPWSBB_Lists::search_comments('userposts', (int) $_REQUEST['user']); - } else { - $title = dgettext('phpwsbb', 'My Comments'); - $content = PHPWSBB_Lists::search_comments('userposts', Current_User::getId()); - } - Layout::addPageTitle($title); - break; - case 'viewlockedthreads': $title = dgettext('phpwsbb', 'Locked Threads'); --- 191,194 ---- *************** *** 209,213 **** Layout::addPageTitle($title); break; ! case 'fill_topic': // For diagnostic use only! Creates test comments in a topic // Make sure that we can save this topic --- 197,201 ---- Layout::addPageTitle($title); break; ! case 'fill_topic': // For diagnostic use only! Creates test comments in a topic // Make sure that we can save this topic *************** *** 242,247 **** $content = $topic->view(); break; ! ! default: // If none of these actions were requested & user is an admin.. --- 230,234 ---- $content = $topic->view(); break; ! default: // If none of these actions were requested & user is an admin.. |
|
From: Greg M. <bli...@us...> - 2008-09-27 00:43:41
|
Update of /cvsroot/phpwebsite-comm/modules/mailinglists/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12827/docs Modified Files: changelog.txt Log Message: Releasing 1.2.1 Index: changelog.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/docs/changelog.txt,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** changelog.txt 17 Sep 2008 02:43:04 -0000 1.56 --- changelog.txt 27 Sep 2008 00:43:24 -0000 1.57 *************** *** 7,11 **** ! *cvs - Added more error checks when sending emails. Will help when debugging issues. --- 7,11 ---- ! *mailinglists-1.2.1 (26 Sep 2008) - Added more error checks when sending emails. Will help when debugging issues. |
|
From: Greg M. <bli...@us...> - 2008-09-17 02:59:16
|
Update of /cvsroot/phpwebsite-comm/modules/mailinglists/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29217/boost Modified Files: boost.php update.php Log Message: Preparing for 1.2.1 Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/boost/boost.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** boost.php 23 Aug 2008 18:08:25 -0000 1.3 --- boost.php 17 Sep 2008 02:59:25 -0000 1.4 *************** *** 25,29 **** $proper_name = 'Mailing Lists'; ! $version = '1.2.0'; $register = FALSE; $unregister = FALSE; --- 25,29 ---- $proper_name = 'Mailing Lists'; ! $version = '1.2.1'; $register = FALSE; $unregister = FALSE; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/boost/update.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** update.php 23 Aug 2008 19:46:57 -0000 1.23 --- update.php 17 Sep 2008 02:59:25 -0000 1.24 *************** *** 55,58 **** --- 55,62 ---- $content[] = '- Now call cacheQueries on all DBPagers to retain pager settings.'; $content[] = '- Support Smart Tags in HTML emails.'; + + case version_compare($currentVersion, '1.2.1', '<'): + $content[] = '- Fixed issue sending emails with an apostrophe in "from" or "subject"'; + $content[] = '- Added more error checks when sending emails to help when debugging issues.'; } |
|
From: Greg M. <bli...@us...> - 2008-09-17 02:43:26
|
Update of /cvsroot/phpwebsite-comm/modules/mailinglists/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22324/docs Modified Files: changelog.txt Log Message: Added more error checks when sending emails to help the debugging of future issues. Index: changelog.txt =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/docs/changelog.txt,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** changelog.txt 16 Sep 2008 04:02:27 -0000 1.55 --- changelog.txt 17 Sep 2008 02:43:04 -0000 1.56 *************** *** 9,12 **** --- 9,13 ---- *cvs + - Added more error checks when sending emails. Will help when debugging issues. - BUG #2109418: Fixed issue sending emails with an apostrophe in "from" or "subject". |
|
From: Greg M. <bli...@us...> - 2008-09-17 02:43:24
|
Update of /cvsroot/phpwebsite-comm/modules/mailinglists/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22324/conf Modified Files: error.php Log Message: Added more error checks when sending emails to help the debugging of future issues. Index: error.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/conf/error.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** error.php 2 Jan 2008 21:59:27 -0000 1.1 --- error.php 17 Sep 2008 02:43:03 -0000 1.2 *************** *** 24,28 **** */ ! $errors[MAILINGLISTS_OBJ_INCOMPLETE] = dgettext('mailinglists', 'Object incomplete.'); ?> \ No newline at end of file --- 24,30 ---- */ ! $errors[MAILINGLISTS_OBJ_INCOMPLETE] = dgettext('mailinglists', 'Object incomplete.'); ! $errors[MAILINGLISTS_MAIL_SET_FROM_FAILED] = dgettext('mailinglists', 'Failed to set from address.'); ! $errors[MAILINGLISTS_MAIL_SEND_TO_FAILED] = dgettext('mailinglists', 'Failed to set to address.'); ?> \ No newline at end of file |
|
From: Greg M. <bli...@us...> - 2008-09-17 02:43:23
|
Update of /cvsroot/phpwebsite-comm/modules/mailinglists/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22324/class Modified Files: Email.php Log Message: Added more error checks when sending emails to help the debugging of future issues. Index: Email.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailinglists/class/Email.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Email.php 16 Sep 2008 04:02:23 -0000 1.6 --- Email.php 17 Sep 2008 02:42:58 -0000 1.7 *************** *** 303,308 **** $mail = new PHPWS_Mail; ! $mail->addSendTo($send_to); ! $mail->setFrom('"' . $list->getFromName() . '" <' . $list->getFromEmail() . '>'); /* If the email is a list_id of 0, it means this is not a mass mailing, rather a module email. */ --- 303,317 ---- $mail = new PHPWS_Mail; ! ! if (!$mail->addSendTo($send_to)) ! { ! return PHPWS_Error::get(MAILINGLISTS_MAIL_SEND_TO_FAILED, 'mailinglists', 'MailingLists_Email::send', $send_to); ! } ! ! $setfrom = '"' . $list->getFromName() . '" <' . $list->getFromEmail() . '>'; ! if (!$mail->setFrom($setfrom)) ! { ! return PHPWS_Error::get(MAILINGLISTS_MAIL_SET_FROM_FAILED, 'mailinglists', 'MailingLists_Email::send', $setfrom); ! } /* If the email is a list_id of 0, it means this is not a mass mailing, rather a module email. */ |
