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: Verdon V. <ve...@us...> - 2008-08-11 14:54:06
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15426/class Modified Files: RDX_Forms.php Log Message: fixed bug 2046456 Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** RDX_Forms.php 26 Jul 2008 20:57:18 -0000 1.23 --- RDX_Forms.php 11 Aug 2008 14:54:08 -0000 1.24 *************** *** 273,277 **** /* unset the filters if a search is being done */ // if (isset($_REQUEST['search']) && $_REQUEST['clearFilters']) { ! if (isset($_REQUEST['search'])) { unset($_REQUEST['browseLetter']); unset($_REQUEST['locations']); --- 273,277 ---- /* unset the filters if a search is being done */ // if (isset($_REQUEST['search']) && $_REQUEST['clearFilters']) { ! if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) { unset($_REQUEST['browseLetter']); unset($_REQUEST['locations']); |
|
From: Verdon V. <ve...@us...> - 2008-08-11 14:54:06
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15426/docs Modified Files: CHANGELOG Log Message: fixed bug 2046456 Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CHANGELOG 26 Jul 2008 20:57:19 -0000 1.12 --- CHANGELOG 11 Aug 2008 14:54:12 -0000 1.13 *************** *** 71,73 **** --- 71,78 ---- + Some tweaking of users permissions and security + Version 1.2.0 -- Aug 2008 + ------------------------------------------------------------------ + + Fixed bug where some list parameters were being cleared when + a search was not being done, when paging a list of users + |
|
From: Verdon V. <ve...@us...> - 2008-07-28 19:29:09
|
Update of /cvsroot/phpwebsite-comm/modules/whatsnew/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24554/locale/en_US/LC_MESSAGES Modified Files: whatsnew.po Log Message: 0.3.0 updates Index: whatsnew.po =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/locale/en_US/LC_MESSAGES/whatsnew.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** whatsnew.po 22 Jul 2008 15:18:44 -0000 1.2 --- whatsnew.po 28 Jul 2008 19:29:15 -0000 1.3 *************** *** 25,29 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-07-22 11:13-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 25,29 ---- "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-07-28 15:25-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 39,45 **** --- 39,51 ---- msgstr "" + msgid "Cache flushed." + msgstr "" + msgid "Enable whatsnew" msgstr "" + msgid "Flush cache" + msgstr "" + msgid "General Settings" msgstr "" |
|
From: Verdon V. <ve...@us...> - 2008-07-28 19:20:36
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/locale/en_US/LC_MESSAGES In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20932/locale/en_US/LC_MESSAGES Modified Files: rolodex.po Log Message: 1.1.0 updates Index: rolodex.po =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/locale/en_US/LC_MESSAGES/rolodex.po,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rolodex.po 7 Jul 2008 13:55:03 -0000 1.3 --- rolodex.po 28 Jul 2008 19:20:44 -0000 1.4 *************** *** 25,29 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-07-07 09:49-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 25,29 ---- "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2008-07-28 15:10-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 208,214 **** msgstr "" - msgid "Business/Organization name" - msgstr "" - msgid "CSV Export" msgstr "" --- 208,211 ---- *************** *** 392,395 **** --- 389,401 ---- msgstr "" + msgid "Enable Categories (uses core Categories)" + msgstr "" + + msgid "Enable Features" + msgstr "" + + msgid "Enable Locations" + msgstr "" + msgid "" "Enable anonymous comment settings on profiles (required for the next Force " *************** *** 485,488 **** --- 491,497 ---- msgstr "" + msgid "Hide Email/Contact link from public" + msgstr "" + msgid "Home" msgstr "" *************** *** 543,547 **** msgstr "" ! msgid "List Settings" msgstr "" --- 552,556 ---- msgstr "" ! msgid "List Options" msgstr "" *************** *** 644,647 **** --- 653,659 ---- msgstr "" + msgid "Organizing/Classifying Options" + msgstr "" + msgid "Other" msgstr "" *************** *** 668,673 **** #, php-format msgid "" ! "Please report any bugs or observations of this beta release in %s this post " ! "at phpwsforums.com %s" msgstr "" --- 680,685 ---- #, php-format msgid "" ! "Please report any bugs or observations of this module in %s this post at " ! "phpwsforums.com %s" msgstr "" *************** *** 739,743 **** "Roldex brings many new features and is even more configurable than " "phpwsbusinesses. Rolodex also takes full advantage of the new phpws core " ! "Demographics module. This module allows the sharing of user demographic " "information across all modules in a phpws." msgstr "" --- 751,755 ---- "Roldex brings many new features and is even more configurable than " "phpwsbusinesses. Rolodex also takes full advantage of the new phpws core " ! "Demographics module. That module allows the sharing of user demographic " "information across all modules in a phpws." msgstr "" *************** *** 749,752 **** --- 761,771 ---- msgstr "" + msgid "" + "Rolodex is a new module for phpwebsite 1.5 or better. It is a complete " + "rewrite of my earlier module phpwsbusinesses, for the earlier series of " + "phpws. If you were familiar with that module, you will be familiar with many " + "of Rolodex's features." + msgstr "" + msgid "Rolodex member activated." msgstr "" *************** *** 822,825 **** --- 841,847 ---- msgstr "" + msgid "Settings & Utilities" + msgstr "" + msgid "Show on home only" msgstr "" *************** *** 911,922 **** msgstr "" - msgid "" - "This is the first full release of Rolodex for phpwebsite (phpws). Rolodex is " - "a new module for phpws 1.5 or better. It is a complete rewrite of my earlier " - "module phpwsbusinesses, for the earlier series of phpws. If you were " - "familiar with that module, you will be familiar with many of Rolodex's " - "features." - msgstr "" - #, php-format msgid "This message from %s was sent via %s." --- 933,936 ---- |
|
From: Verdon V. <ve...@us...> - 2008-07-28 19:20:35
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20932/docs Modified Files: TODO Log Message: 1.1.0 updates Index: TODO =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/TODO,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** TODO 26 Jul 2008 20:57:19 -0000 1.15 --- TODO 28 Jul 2008 19:20:39 -0000 1.16 *************** *** 11,17 **** consider improved messages for privacy and expired notices consider more advanced export with some pre-selection or options ! ! do a final update of language file ! --- 11,15 ---- consider improved messages for privacy and expired notices consider more advanced export with some pre-selection or options ! consider a bulk contact method for admins |
|
From: Verdon V. <ve...@us...> - 2008-07-26 21:02:59
|
Update of /cvsroot/phpwebsite-comm/modules/whatsnew/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25410/boost Modified Files: boost.php update.php Log Message: 0.3.0 changes Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/boost/boost.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** boost.php 22 Jul 2008 15:18:38 -0000 1.3 --- boost.php 26 Jul 2008 21:02:35 -0000 1.4 *************** *** 24,28 **** $proper_name = "What's New"; ! $version = '0.2.0'; $import_sql = false; $version_http = 'http://verdon.ca/downloads/modules/whatsnew/check.xml'; --- 24,28 ---- $proper_name = "What's New"; ! $version = '0.3.0'; $import_sql = false; $version_http = 'http://verdon.ca/downloads/modules/whatsnew/check.xml'; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/boost/update.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** update.php 22 Jul 2008 15:18:38 -0000 1.1 --- update.php 26 Jul 2008 21:02:35 -0000 1.2 *************** *** 54,57 **** --- 54,70 ---- </pre>'; + case version_compare($currentVersion, '0.3.0', '<'): + $content[] = '<pre>'; + + $files = array('templates/edit_settings.tpl'); + whatsnewUpdateFiles($files, $content); + + $content[] = '0.3.0 changes + ---------------- + + Added cache_reset to post_settings function (thanks Greg) + + Added link and function to manually flush cache at will + + </pre>'; + |
|
From: Verdon V. <ve...@us...> - 2008-07-26 21:02:59
|
Update of /cvsroot/phpwebsite-comm/modules/whatsnew/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25410/class Modified Files: Whatsnew.php Whatsnew_Forms.php Log Message: 0.3.0 changes Index: Whatsnew.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/class/Whatsnew.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Whatsnew.php 24 Jul 2008 14:14:22 -0000 1.3 --- Whatsnew.php 26 Jul 2008 21:02:36 -0000 1.4 *************** *** 63,66 **** --- 63,78 ---- break; + case 'flush_cache': + if (!Current_User::authorized('whatsnew')) { + Current_User::disallow(); + } + if ($this->flushCache()) { + $this->forwardMessage(dgettext('whatsnew', 'Cache flushed.')); + PHPWS_Core::reroute('index.php?module=whatsnew&aop=menu'); + } else { + $this->loadForm('settings'); + } + break; + } *************** *** 326,329 **** --- 338,347 ---- + function flushCache() { + if (PHPWS_Cache::remove('whatsnew_cache_key')) { + return true; + } + } + } Index: Whatsnew_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/class/Whatsnew_Forms.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Whatsnew_Forms.php 22 Jul 2008 15:18:40 -0000 1.2 --- Whatsnew_Forms.php 26 Jul 2008 21:02:36 -0000 1.3 *************** *** 81,84 **** --- 81,85 ---- $tpl = $form->getTemplate(); $tpl['SETTINGS_LABEL'] = dgettext('whatsnew', 'General Settings'); + $tpl['FLUSH_LINK'] = PHPWS_Text::secureLink(dgettext('whatsnew', 'Flush cache'), 'whatsnew', array('aop'=>'flush_cache')); $tpl['EXCLUDE'] = $this->whatsnew->getKeyMods(unserialize(PHPWS_Settings::get('whatsnew', 'exclude')), 'exclude'); $tpl['EXCLUDE_LABEL'] = dgettext('whatsnew', 'Select any modules you wish to exclude from your whatsnew box.'); |
|
From: Verdon V. <ve...@us...> - 2008-07-26 21:02:31
|
Update of /cvsroot/phpwebsite-comm/modules/whatsnew/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25410/templates Modified Files: edit_settings.tpl Log Message: 0.3.0 changes Index: edit_settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/templates/edit_settings.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit_settings.tpl 22 Jul 2008 15:18:45 -0000 1.2 --- edit_settings.tpl 26 Jul 2008 21:02:39 -0000 1.3 *************** *** 6,10 **** <p>{TITLE_LABEL}<br />{TITLE}</p> <p>{TEXT_LABEL}<br />{TEXT}</p> ! <p>{CACHE_TIMEOUT} {CACHE_TIMEOUT_LABEL}</p> <p>{QTY_ITEMS} {QTY_ITEMS_LABEL}</p> <p>{EXCLUDE_LABEL}<br />{EXCLUDE}</p> --- 6,10 ---- <p>{TITLE_LABEL}<br />{TITLE}</p> <p>{TEXT_LABEL}<br />{TEXT}</p> ! <p>{CACHE_TIMEOUT} {CACHE_TIMEOUT_LABEL}<br />{FLUSH_LINK}</p> <p>{QTY_ITEMS} {QTY_ITEMS_LABEL}</p> <p>{EXCLUDE_LABEL}<br />{EXCLUDE}</p> |
|
From: Verdon V. <ve...@us...> - 2008-07-26 21:02:30
|
Update of /cvsroot/phpwebsite-comm/modules/whatsnew/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25410/docs Modified Files: CHANGELOG Log Message: 0.3.0 changes Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/docs/CHANGELOG,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CHANGELOG 24 Jul 2008 14:14:25 -0000 1.3 --- CHANGELOG 26 Jul 2008 21:02:37 -0000 1.4 *************** *** 16,18 **** Version 0.3.0 -- July 2008 ------------------------------------------------------------------ ! + Added cache_reset to post_settings (thanks Greg) --- 16,20 ---- Version 0.3.0 -- July 2008 ------------------------------------------------------------------ ! + Added cache_reset to post_settings function (thanks Greg) ! + Added link and function to manually flush cache at will ! |
|
From: Verdon V. <ve...@us...> - 2008-07-26 20:57:42
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23449/class Modified Files: RDX_Feature.php RDX_Forms.php RDX_Location.php Rolodex.php Log Message: 1.1.0 changes Index: RDX_Feature.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Feature.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RDX_Feature.php 7 Jul 2008 13:30:15 -0000 1.5 --- RDX_Feature.php 26 Jul 2008 20:57:18 -0000 1.6 *************** *** 150,159 **** $vars['feature'] = $this->id; ! if (Current_User::allow('rolodex', 'settings')){ $vars['aop'] = 'edit_feature'; $links[] = PHPWS_Text::secureLink(dgettext('rolodex', 'Edit'), 'rolodex', $vars); - } - if (Current_User::allow('rolodex', 'settings')){ $vars['aop'] = 'delete_feature'; $js['ADDRESS'] = PHPWS_Text::linkAddress('rolodex', $vars, true); --- 150,157 ---- $vars['feature'] = $this->id; ! if (Current_User::allow('rolodex', 'settings', null, null, true)){ $vars['aop'] = 'edit_feature'; $links[] = PHPWS_Text::secureLink(dgettext('rolodex', 'Edit'), 'rolodex', $vars); $vars['aop'] = 'delete_feature'; $js['ADDRESS'] = PHPWS_Text::linkAddress('rolodex', $vars, true); *************** *** 174,178 **** { $links = array(); ! if (Current_User::allow('rolodex', 'settings')) { $vars['feature'] = $this->id; $vars['aop'] = 'edit_feature'; --- 172,176 ---- { $links = array(); ! if (Current_User::allow('rolodex', 'settings', null, null, true)) { $vars['feature'] = $this->id; $vars['aop'] = 'edit_feature'; Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** RDX_Forms.php 25 Jul 2008 12:28:15 -0000 1.22 --- RDX_Forms.php 26 Jul 2008 20:57:18 -0000 1.23 *************** *** 141,145 **** $link = 'index.php?module=rolodex&aop=menu'; ! if (Current_User::allow('rolodex', 'settings')){ $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings'), 'link'=>$link); --- 141,145 ---- $link = 'index.php?module=rolodex&aop=menu'; ! if (Current_User::allow('rolodex', 'settings', null, null, true)){ $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings'), 'link'=>$link); *************** *** 152,158 **** 'link'=>$link); } - } - if (Current_User::isUnrestricted('rolodex')) { $tags['utilities'] = array('title'=>dgettext('rolodex', 'Utilities'), 'link'=>$link); } --- 152,156 ---- *************** *** 432,436 **** $num = $pager->getTotalRows(); if ($num == '0') { ! if (Current_User::allow('rolodex', 'settings')) { $vars['aop'] = 'menu'; $vars['tab'] = 'settings'; --- 430,434 ---- $num = $pager->getTotalRows(); if ($num == '0') { ! if (Current_User::allow('rolodex', 'settings', null, null, true)) { $vars['aop'] = 'menu'; $vars['tab'] = 'settings'; *************** *** 441,445 **** } } ! if (Current_User::allow('rolodex', 'settings')) { $vars['aop'] = 'new_location'; $ptags['ADD_LINK'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Add Location'), 'rolodex', $vars); --- 439,443 ---- } } ! if (Current_User::allow('rolodex', 'settings', null, null, true)) { $vars['aop'] = 'new_location'; $ptags['ADD_LINK'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Add Location'), 'rolodex', $vars); *************** *** 470,474 **** $num = $pager->getTotalRows(); if ($num == '0') { ! if (Current_User::allow('rolodex', 'settings')) { $vars['aop'] = 'menu'; $vars['tab'] = 'settings'; --- 468,472 ---- $num = $pager->getTotalRows(); if ($num == '0') { ! if (Current_User::allow('rolodex', 'settings', null, null, true)) { $vars['aop'] = 'menu'; $vars['tab'] = 'settings'; *************** *** 479,483 **** } } ! if (Current_User::allow('rolodex', 'settings')) { $vars['aop'] = 'new_feature'; $ptags['ADD_LINK'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Add Feature'), 'rolodex', $vars); --- 477,481 ---- } } ! if (Current_User::allow('rolodex', 'settings', null, null, true)) { $vars['aop'] = 'new_feature'; $ptags['ADD_LINK'] = PHPWS_Text::secureLink(dgettext('rolodex', 'Add Feature'), 'rolodex', $vars); *************** *** 551,560 **** $tpl['ALPHA_CLICK'] = $this->rolodex->alpha_click(); ! $tpl['LOCATION_SELECT'] = $this->rolodex->getItemSelect('location', null, 'locations'); ! $tpl['FEATURE_SELECT'] = $this->rolodex->getItemSelect('feature', null, 'features'); ! $tpl['CATEGORY_SELECT'] = $this->rolodex->getCatSelect(null, 'categories'); ! $tpl['LOCATION_LABEL'] = dgettext('rolodex', 'Location(s)'); ! $tpl['FEATURE_LABEL'] = dgettext('rolodex', 'Feature(s)'); ! $tpl['CATEGORY_LABEL'] = dgettext('rolodex', 'Category(s)'); $tpl['CRITERIA_LABEL'] = dgettext('rolodex', 'Criteria'); $tpl['SEARCH_LABEL'] = dgettext('rolodex', 'Search'); --- 549,564 ---- $tpl['ALPHA_CLICK'] = $this->rolodex->alpha_click(); ! if (PHPWS_Settings::get('rolodex', 'use_locations')) { ! $tpl['LOCATION_SELECT'] = $this->rolodex->getItemSelect('location', null, 'locations'); ! $tpl['LOCATION_LABEL'] = dgettext('rolodex', 'Location(s)'); ! } ! if (PHPWS_Settings::get('rolodex', 'use_features')) { ! $tpl['FEATURE_SELECT'] = $this->rolodex->getItemSelect('feature', null, 'features'); ! $tpl['FEATURE_LABEL'] = dgettext('rolodex', 'Feature(s)'); ! } ! if (PHPWS_Settings::get('rolodex', 'use_categories')) { ! $tpl['CATEGORY_SELECT'] = $this->rolodex->getCatSelect(null, 'categories'); ! $tpl['CATEGORY_LABEL'] = dgettext('rolodex', 'Category(s)'); ! } $tpl['CRITERIA_LABEL'] = dgettext('rolodex', 'Criteria'); $tpl['SEARCH_LABEL'] = dgettext('rolodex', 'Search'); *************** *** 605,609 **** $form->addCheckbox('use_categories', 1); $form->setMatch('use_categories', PHPWS_Settings::get('rolodex', 'use_categories')); ! $form->setLabel('use_categories', dgettext('rolodex', 'Enable Categories')); $form->addCheckbox('use_locations', 1); --- 609,613 ---- $form->addCheckbox('use_categories', 1); $form->setMatch('use_categories', PHPWS_Settings::get('rolodex', 'use_categories')); ! $form->setLabel('use_categories', dgettext('rolodex', 'Enable Categories (uses core Categories)')); $form->addCheckbox('use_locations', 1); *************** *** 1328,1336 **** $tpl['TITLE'] = dgettext('rolodex', 'Important Information'); $tpl['INFO_1_LABEL'] = dgettext('rolodex', 'About this module:'); ! $tpl['INFO_1'] = dgettext('rolodex', 'This is the first full release of Rolodex for phpwebsite (phpws). Rolodex is a new module for phpws 1.5 or better. It is a complete rewrite of my earlier module phpwsbusinesses, for the earlier series of phpws. If you were familiar with that module, you will be familiar with many of Rolodex\'s features.'); $tpl['INFO_2_LABEL'] = null; ! $tpl['INFO_2'] = dgettext('rolodex', 'Roldex brings many new features and is even more configurable than phpwsbusinesses. Rolodex also takes full advantage of the new phpws core Demographics module. This module allows the sharing of user demographic information across all modules in a phpws.'); $tpl['INFO_3_LABEL'] = dgettext('rolodex', 'Bugs:'); ! $tpl['INFO_3'] = sprintf(dgettext('rolodex', 'Please report any bugs or observations of this beta release in %s this post at phpwsforums.com %s'), '<a href="http://phpwsforums.com/showthread.php?t=5969" target="new">', '</a>'); $tpl['INFO_4_LABEL'] = null; $tpl['INFO_4'] = null; --- 1332,1340 ---- $tpl['TITLE'] = dgettext('rolodex', 'Important Information'); $tpl['INFO_1_LABEL'] = dgettext('rolodex', 'About this module:'); ! $tpl['INFO_1'] = dgettext('rolodex', 'Rolodex is a new module for phpwebsite 1.5 or better. It is a complete rewrite of my earlier module phpwsbusinesses, for the earlier series of phpws. If you were familiar with that module, you will be familiar with many of Rolodex\'s features.'); $tpl['INFO_2_LABEL'] = null; ! $tpl['INFO_2'] = dgettext('rolodex', 'Roldex brings many new features and is even more configurable than phpwsbusinesses. Rolodex also takes full advantage of the new phpws core Demographics module. That module allows the sharing of user demographic information across all modules in a phpws.'); $tpl['INFO_3_LABEL'] = dgettext('rolodex', 'Bugs:'); ! $tpl['INFO_3'] = sprintf(dgettext('rolodex', 'Please report any bugs or observations of this module in %s this post at phpwsforums.com %s'), '<a href="http://phpwsforums.com/showthread.php?t=5969" target="new">', '</a>'); $tpl['INFO_4_LABEL'] = null; $tpl['INFO_4'] = null; Index: RDX_Location.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Location.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RDX_Location.php 7 Jul 2008 13:30:15 -0000 1.5 --- RDX_Location.php 26 Jul 2008 20:57:18 -0000 1.6 *************** *** 149,158 **** $vars['location'] = $this->id; ! if (Current_User::allow('rolodex', 'settings')){ $vars['aop'] = 'edit_location'; $links[] = PHPWS_Text::secureLink(dgettext('rolodex', 'Edit'), 'rolodex', $vars); - } - if (Current_User::allow('rolodex', 'settings')){ $vars['aop'] = 'delete_location'; $js['ADDRESS'] = PHPWS_Text::linkAddress('rolodex', $vars, true); --- 149,156 ---- $vars['location'] = $this->id; ! if (Current_User::allow('rolodex', 'settings', null, null, true)){ $vars['aop'] = 'edit_location'; $links[] = PHPWS_Text::secureLink(dgettext('rolodex', 'Edit'), 'rolodex', $vars); $vars['aop'] = 'delete_location'; $js['ADDRESS'] = PHPWS_Text::linkAddress('rolodex', $vars, true); *************** *** 173,177 **** { $links = array(); ! if (Current_User::allow('rolodex', 'settings')) { $vars['location'] = $this->id; $vars['aop'] = 'edit_location'; --- 171,175 ---- { $links = array(); ! if (Current_User::allow('rolodex', 'settings', null, null, true)) { $vars['location'] = $this->id; $vars['aop'] = 'edit_location'; Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Rolodex.php 25 Jul 2008 12:28:15 -0000 1.19 --- Rolodex.php 26 Jul 2008 20:57:18 -0000 1.20 *************** *** 734,743 **** } ! if (Current_User::allow('rolodex', 'settings')){ $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings & Utilities'), 'link'=>$link); } ! if (Current_User::allow('rolodex', 'settings')){ $tags['info'] = array('title'=>dgettext('rolodex', 'Read me'), 'link'=>$link); --- 734,743 ---- } ! if (Current_User::allow('rolodex', 'settings', null, null, true)){ $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings & Utilities'), 'link'=>$link); } ! if (Current_User::allow('rolodex', 'settings', null, null, true)){ $tags['info'] = array('title'=>dgettext('rolodex', 'Read me'), 'link'=>$link); *************** *** 1588,1598 **** } - // $db = new PHPWS_DB('rolodex_feature'); - // $features = $db->count(); if ($categories > 0 || $locations > 0 || $features > 0) { $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Advanced'), "rolodex", array('uop'=>'advanced')); } ! if (Current_User::allow('rolodex', 'settings') && !$_REQUEST['aop']){ $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Settings'), "rolodex", array('aop'=>'menu', 'tab'=>'settings')); } --- 1588,1596 ---- } if ($categories > 0 || $locations > 0 || $features > 0) { $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Advanced'), "rolodex", array('uop'=>'advanced')); } ! if (Current_User::allow('rolodex', 'settings', null, null, true) && !$_REQUEST['aop']){ $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Settings'), "rolodex", array('aop'=>'menu', 'tab'=>'settings')); } |
|
From: Verdon V. <ve...@us...> - 2008-07-26 20:57:40
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23449/boost Modified Files: update.php Log Message: 1.1.0 changes Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** update.php 25 Jul 2008 12:28:11 -0000 1.13 --- update.php 26 Jul 2008 20:57:14 -0000 1.14 *************** *** 155,158 **** --- 155,160 ---- $files = array('templates/edit_member.tpl', + 'templates/edit_settings.tpl', + 'templates/adv_search_form.tpl', 'templates/view_member.tpl', 'templates/list_member.tpl' *************** *** 160,164 **** rolodexUpdateFiles($files, $content); ! $content[] = '1.0.1 changes ---------------- + Added support for email/contact link privacy at user level --- 162,166 ---- rolodexUpdateFiles($files, $content); ! $content[] = '1.1.0 changes ---------------- + Added support for email/contact link privacy at user level *************** *** 168,175 **** + Added security check so that only users with edit_member perms can edit internal custom field data ! + Added categories to dependency.xml and check file + Re-organized some control panel tabs into sub-tabs + Added settings to enable or disable categories, locations, and features </pre>'; --- 170,178 ---- + Added security check so that only users with edit_member perms can edit internal custom field data ! + Added Categories to dependency.xml and check file + Re-organized some control panel tabs into sub-tabs + Added settings to enable or disable categories, locations, and features + + Some tweaking of users permissions and security </pre>'; |
|
From: Verdon V. <ve...@us...> - 2008-07-26 20:57:14
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23449/templates Modified Files: adv_search_form.tpl Log Message: 1.1.0 changes Index: adv_search_form.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/adv_search_form.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** adv_search_form.tpl 6 Jul 2008 13:05:21 -0000 1.4 --- adv_search_form.tpl 26 Jul 2008 20:57:21 -0000 1.5 *************** *** 5,11 **** <p>{TIP_SELECT}</p> <p class="smaller">{TIP_MULTI}</p> ! <p>{LOCATION_LABEL}<br />{LOCATION_SELECT}</p> ! <p>{FEATURE_LABEL}<br />{FEATURE_SELECT}</p> ! <p>{CATEGORY_LABEL}<br />{CATEGORY_SELECT}</p> <p>{SEARCH_LABEL}<br />{PAGER_C_SEARCH}</p> </fieldset> --- 5,11 ---- <p>{TIP_SELECT}</p> <p class="smaller">{TIP_MULTI}</p> ! <!-- BEGIN location_label --><p>{LOCATION_LABEL}<br />{LOCATION_SELECT}</p><!-- END location_label --> ! <!-- BEGIN feature_label --><p>{FEATURE_LABEL}<br />{FEATURE_SELECT}</p><!-- END feature_label --> ! <!-- BEGIN category_label --><p>{CATEGORY_LABEL}<br />{CATEGORY_SELECT}</p><!-- END category_label --> <p>{SEARCH_LABEL}<br />{PAGER_C_SEARCH}</p> </fieldset> |
|
From: Verdon V. <ve...@us...> - 2008-07-26 20:57:14
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23449/docs Modified Files: CHANGELOG TODO Log Message: 1.1.0 changes Index: TODO =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/TODO,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** TODO 24 Jul 2008 20:09:00 -0000 1.14 --- TODO 26 Jul 2008 20:57:19 -0000 1.15 *************** *** 15,19 **** - CHECK combination of settings perms and unrestricted only, in all locations - --- 15,17 ---- Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CHANGELOG 25 Jul 2008 12:28:16 -0000 1.11 --- CHANGELOG 26 Jul 2008 20:57:19 -0000 1.12 *************** *** 65,71 **** + Added security check so that only users with edit_member perms can edit internal custom field data ! + Added categories to dependency.xml and check file + Re-organized some control panel tabs into sub-tabs + Added settings to enable or disable categories, locations, and features --- 65,73 ---- + Added security check so that only users with edit_member perms can edit internal custom field data ! + Added Categories to dependency.xml and check file + Re-organized some control panel tabs into sub-tabs + Added settings to enable or disable categories, locations, and features + + Some tweaking of users permissions and security + |
|
From: Verdon V. <ve...@us...> - 2008-07-25 12:28:39
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6454/docs Modified Files: CHANGELOG Log Message: category, location, feature switches Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CHANGELOG 24 Jul 2008 20:09:00 -0000 1.10 --- CHANGELOG 25 Jul 2008 12:28:16 -0000 1.11 *************** *** 67,70 **** + Added categories to dependency.xml and check file + Re-organized some control panel tabs into sub-tabs ! --- 67,71 ---- + Added categories to dependency.xml and check file + Re-organized some control panel tabs into sub-tabs ! + Added settings to enable or disable categories, locations, ! and features |
|
From: Verdon V. <ve...@us...> - 2008-07-25 12:28:39
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6454/class Modified Files: RDX_Forms.php RDX_Member.php Rolodex.php Log Message: category, location, feature switches Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** RDX_Forms.php 24 Jul 2008 20:08:51 -0000 1.21 --- RDX_Forms.php 25 Jul 2008 12:28:15 -0000 1.22 *************** *** 144,151 **** $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings'), 'link'=>$link); ! $tags['locations'] = array('title'=>dgettext('rolodex', 'Locations'), ! 'link'=>$link); ! $tags['features'] = array('title'=>dgettext('rolodex', 'Features'), ! 'link'=>$link); } --- 144,155 ---- $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings'), 'link'=>$link); ! if (PHPWS_Settings::get('rolodex', 'use_locations')) { ! $tags['locations'] = array('title'=>dgettext('rolodex', 'Locations'), ! 'link'=>$link); ! } ! if (PHPWS_Settings::get('rolodex', 'use_features')) { ! $tags['features'] = array('title'=>dgettext('rolodex', 'Features'), ! 'link'=>$link); ! } } *************** *** 599,602 **** --- 603,618 ---- $form->setLabel('admin_contact', dgettext('rolodex', 'The admin contact email address for this module')); + $form->addCheckbox('use_categories', 1); + $form->setMatch('use_categories', PHPWS_Settings::get('rolodex', 'use_categories')); + $form->setLabel('use_categories', dgettext('rolodex', 'Enable Categories')); + + $form->addCheckbox('use_locations', 1); + $form->setMatch('use_locations', PHPWS_Settings::get('rolodex', 'use_locations')); + $form->setLabel('use_locations', dgettext('rolodex', 'Enable Locations')); + + $form->addCheckbox('use_features', 1); + $form->setMatch('use_features', PHPWS_Settings::get('rolodex', 'use_features')); + $form->setLabel('use_features', dgettext('rolodex', 'Enable Features')); + $form->addCheckbox('comments_enable', 1); $form->setMatch('comments_enable', PHPWS_Settings::get('rolodex', 'comments_enable')); *************** *** 793,799 **** $tpl['LIST_SETTINGS_TIP'] = dgettext('rolodex', 'The following settings respect the privacy settings above and do not over-ride them.'); $tpl['LIST_ADDRESS_TITLE'] = dgettext('rolodex', 'Address to display on browse list views'); $tpl['COMMENTS_GROUP_LABEL'] = dgettext('rolodex', 'Comments Settings'); $tpl['PRIVACY_GROUP_LABEL'] = dgettext('rolodex', 'Privacy Settings'); ! $tpl['LIST_GROUP_LABEL'] = dgettext('rolodex', 'List Settings'); $tpl['IMAGE_GROUP_LABEL'] = dgettext('rolodex', 'Image Settings'); $tpl['FIELDS_GROUP_LABEL'] = dgettext('rolodex', 'Custom Fields'); --- 809,816 ---- $tpl['LIST_SETTINGS_TIP'] = dgettext('rolodex', 'The following settings respect the privacy settings above and do not over-ride them.'); $tpl['LIST_ADDRESS_TITLE'] = dgettext('rolodex', 'Address to display on browse list views'); + $tpl['OPTIONS_GROUP_LABEL'] = dgettext('rolodex', 'Organizing/Classifying Options'); $tpl['COMMENTS_GROUP_LABEL'] = dgettext('rolodex', 'Comments Settings'); $tpl['PRIVACY_GROUP_LABEL'] = dgettext('rolodex', 'Privacy Settings'); ! $tpl['LIST_GROUP_LABEL'] = dgettext('rolodex', 'List Options'); $tpl['IMAGE_GROUP_LABEL'] = dgettext('rolodex', 'Image Settings'); $tpl['FIELDS_GROUP_LABEL'] = dgettext('rolodex', 'Custom Fields'); *************** *** 1085,1094 **** $tpl = $form->getTemplate(); ! $tpl['CATEGORIES'] = Categories::getForm($match=$member->get_categories(), $select_name='categories', $multiple=true); ! $tpl['LOCATIONS'] = $this->rolodex->getItemForm('location', $match=$member->get_locations(), $select_name='locations', $multiple=true); ! $tpl['FEATURES'] = $this->rolodex->getItemForm('feature', $match=$member->get_features(), $select_name='features', $multiple=true); ! $tpl['CATEGORIES_LABEL'] = dgettext('rolodex', 'Category(s)'); ! $tpl['LOCATIONS_LABEL'] = dgettext('rolodex', 'Location(s)'); ! $tpl['FEATURES_LABEL'] = dgettext('rolodex', 'Feature(s)'); if (Current_User::allow('rolodex', 'edit_member')) { --- 1102,1117 ---- $tpl = $form->getTemplate(); ! if (PHPWS_Settings::get('rolodex', 'use_categories')) { ! $tpl['CATEGORIES'] = Categories::getForm($match=$member->get_categories(), $select_name='categories', $multiple=true); ! $tpl['CATEGORIES_LABEL'] = dgettext('rolodex', 'Category(s)'); ! } ! if (PHPWS_Settings::get('rolodex', 'use_locations')) { ! $tpl['LOCATIONS'] = $this->rolodex->getItemForm('location', $match=$member->get_locations(), $select_name='locations', $multiple=true); ! $tpl['LOCATIONS_LABEL'] = dgettext('rolodex', 'Location(s)'); ! } ! if (PHPWS_Settings::get('rolodex', 'use_features')) { ! $tpl['FEATURES'] = $this->rolodex->getItemForm('feature', $match=$member->get_features(), $select_name='features', $multiple=true); ! $tpl['FEATURES_LABEL'] = dgettext('rolodex', 'Feature(s)'); ! } if (Current_User::allow('rolodex', 'edit_member')) { *************** *** 1105,1109 **** $tpl['BUSINESS_LABEL'] = dgettext('rolodex', 'Business address'); $tpl['SETTINGS_GROUP_LABEL'] = dgettext('rolodex', 'Settings'); ! $tpl['SELECT_LIST_TIP'] = dgettext('rolodex', 'To use the category, location, or feature lists, select an item from the list and click on the "+" symbool to add the selection to this profile. To remove a selection, click on the name of the item in the box below the select menu.'); if (PHPWS_Settings::get('rolodex', 'custom1_name') || PHPWS_Settings::get('rolodex', 'custom2_name') || --- 1128,1134 ---- $tpl['BUSINESS_LABEL'] = dgettext('rolodex', 'Business address'); $tpl['SETTINGS_GROUP_LABEL'] = dgettext('rolodex', 'Settings'); ! if (PHPWS_Settings::get('rolodex', 'use_categories') || PHPWS_Settings::get('rolodex', 'use_locations') || PHPWS_Settings::get('rolodex', 'use_features')) { ! $tpl['SELECT_LIST_TIP'] = dgettext('rolodex', 'To use the category, location, or feature lists, select an item from the list and click on the "+" symbool to add the selection to this profile. To remove a selection, click on the name of the item in the box below the select menu.'); ! } if (PHPWS_Settings::get('rolodex', 'custom1_name') || PHPWS_Settings::get('rolodex', 'custom2_name') || Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Rolodex.php 24 Jul 2008 20:08:52 -0000 1.18 --- Rolodex.php 25 Jul 2008 12:28:15 -0000 1.19 *************** *** 784,787 **** --- 784,799 ---- } + isset($_POST['use_categories']) ? + PHPWS_Settings::set('rolodex', 'use_categories', 1) : + PHPWS_Settings::set('rolodex', 'use_categories', 0); + + isset($_POST['use_locations']) ? + PHPWS_Settings::set('rolodex', 'use_locations', 1) : + PHPWS_Settings::set('rolodex', 'use_locations', 0); + + isset($_POST['use_features']) ? + PHPWS_Settings::set('rolodex', 'use_features', 1) : + PHPWS_Settings::set('rolodex', 'use_features', 0); + if (isset($_POST['comments_enable'])) { if (isset($_POST['comments_enforce'])) { *************** *** 1551,1575 **** $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Browse members'), 'rolodex', array('uop'=>'list')); ! $db = new PHPWS_DB('category_items'); ! $db->addWhere('module', 'rolodex'); ! $categories = $db->count(); ! if ($categories > 0) { ! $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Categories'), "rolodex", array('uop'=>'categories')); } ! $db = new PHPWS_DB('rolodex_location'); ! $locations = $db->count(); ! if ($locations > 0) { ! $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Locations'), "rolodex", array('uop'=>'locations')); } ! $db = new PHPWS_DB('rolodex_feature'); ! $features = $db->count(); ! if ($features > 0) { ! $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Features'), "rolodex", array('uop'=>'features')); } ! $db = new PHPWS_DB('rolodex_feature'); ! $features = $db->count(); if ($categories > 0 || $locations > 0 || $features > 0) { $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Advanced'), "rolodex", array('uop'=>'advanced')); --- 1563,1593 ---- $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Browse members'), 'rolodex', array('uop'=>'list')); ! if (PHPWS_Settings::get('rolodex', 'use_categories')) { ! $db = new PHPWS_DB('category_items'); ! $db->addWhere('module', 'rolodex'); ! $categories = $db->count(); ! if ($categories > 0) { ! $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Categories'), "rolodex", array('uop'=>'categories')); ! } } ! if (PHPWS_Settings::get('rolodex', 'use_locations')) { ! $db = new PHPWS_DB('rolodex_location'); ! $locations = $db->count(); ! if ($locations > 0) { ! $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Locations'), "rolodex", array('uop'=>'locations')); ! } } ! if (PHPWS_Settings::get('rolodex', 'use_features')) { ! $db = new PHPWS_DB('rolodex_feature'); ! $features = $db->count(); ! if ($features > 0) { ! $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Features'), "rolodex", array('uop'=>'features')); ! } } ! // $db = new PHPWS_DB('rolodex_feature'); ! // $features = $db->count(); if ($categories > 0 || $locations > 0 || $features > 0) { $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Advanced'), "rolodex", array('uop'=>'advanced')); Index: RDX_Member.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** RDX_Member.php 24 Jul 2008 12:40:18 -0000 1.16 --- RDX_Member.php 25 Jul 2008 12:28:15 -0000 1.17 *************** *** 1165,1178 **** $tpl['IMAGE'] = $this->getImage(true); ! if ($this->get_categories(true)) { $tpl['CATEGORY_LINKS'] = implode(', ', $this->get_categories(true)); $tpl['CATEGORY_LINKS_LABEL'] = dgettext('rolodex', 'Category(s)'); } ! if ($this->get_locations(true)) { $tpl['LOCATION_LINKS'] = implode(', ', $this->get_locations(true)); $tpl['LOCATION_LINKS_LABEL'] = dgettext('rolodex', 'Location(s)'); } ! if ($this->get_features(true)) { $tpl['FEATURE_LINKS'] = implode(', ', $this->get_features(true)); $tpl['FEATURE_LINKS_LABEL'] = dgettext('rolodex', 'Feature(s)'); --- 1165,1178 ---- $tpl['IMAGE'] = $this->getImage(true); ! if ($this->get_categories(true) && PHPWS_Settings::get('rolodex', 'use_categories')) { $tpl['CATEGORY_LINKS'] = implode(', ', $this->get_categories(true)); $tpl['CATEGORY_LINKS_LABEL'] = dgettext('rolodex', 'Category(s)'); } ! if ($this->get_locations(true) && PHPWS_Settings::get('rolodex', 'use_locations')) { $tpl['LOCATION_LINKS'] = implode(', ', $this->get_locations(true)); $tpl['LOCATION_LINKS_LABEL'] = dgettext('rolodex', 'Location(s)'); } ! if ($this->get_features(true) && PHPWS_Settings::get('rolodex', 'use_features')) { $tpl['FEATURE_LINKS'] = implode(', ', $this->get_features(true)); $tpl['FEATURE_LINKS_LABEL'] = dgettext('rolodex', 'Feature(s)'); *************** *** 1441,1445 **** } ! if (PHPWS_Settings::get('rolodex', 'list_categories')) { if ($this->get_categories(true)) { $tpl['CATEGORY_LINKS'] = implode(', ', $this->get_categories(true)); --- 1441,1445 ---- } ! if (PHPWS_Settings::get('rolodex', 'list_categories') && PHPWS_Settings::get('rolodex', 'use_categories')) { if ($this->get_categories(true)) { $tpl['CATEGORY_LINKS'] = implode(', ', $this->get_categories(true)); *************** *** 1448,1452 **** } ! if (PHPWS_Settings::get('rolodex', 'list_locations')) { if ($this->get_locations(true)) { $tpl['LOCATION_LINKS'] = implode(', ', $this->get_locations(true)); --- 1448,1452 ---- } ! if (PHPWS_Settings::get('rolodex', 'list_locations') && PHPWS_Settings::get('rolodex', 'use_locations')) { if ($this->get_locations(true)) { $tpl['LOCATION_LINKS'] = implode(', ', $this->get_locations(true)); *************** *** 1455,1459 **** } ! if (PHPWS_Settings::get('rolodex', 'list_features')) { if ($this->get_features(true)) { $tpl['FEATURE_LINKS'] = implode(', ', $this->get_features(true)); --- 1455,1459 ---- } ! if (PHPWS_Settings::get('rolodex', 'list_features') && PHPWS_Settings::get('rolodex', 'use_features')) { if ($this->get_features(true)) { $tpl['FEATURE_LINKS'] = implode(', ', $this->get_features(true)); |
|
From: Verdon V. <ve...@us...> - 2008-07-25 12:28:36
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6454/boost Modified Files: update.php Log Message: category, location, feature switches Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** update.php 24 Jul 2008 12:40:13 -0000 1.12 --- update.php 25 Jul 2008 12:28:11 -0000 1.13 *************** *** 163,167 **** ---------------- + Added support for email/contact link privacy at user level ! + Various minor layout tweaks + Fixed bug in post settings that wasn\'t clearning custom field labels --- 163,167 ---- ---------------- + Added support for email/contact link privacy at user level ! + Minor layout tweaks + Fixed bug in post settings that wasn\'t clearning custom field labels *************** *** 169,172 **** --- 169,176 ---- perms can edit internal custom field data + Added categories to dependency.xml and check file + + Re-organized some control panel tabs into sub-tabs + + Added settings to enable or disable categories, locations, + and features + </pre>'; |
|
From: Verdon V. <ve...@us...> - 2008-07-25 12:28:12
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6454/templates Modified Files: edit_member.tpl edit_settings.tpl Log Message: category, location, feature switches Index: edit_member.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_member.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** edit_member.tpl 24 Jul 2008 12:40:21 -0000 1.9 --- edit_member.tpl 25 Jul 2008 12:28:19 -0000 1.10 *************** *** 52,59 **** <fieldset> <legend><strong>{SETTINGS_GROUP_LABEL}</strong></legend> ! <p>{SELECT_LIST_TIP}</p> ! <p>{CATEGORIES_LABEL}<br />{CATEGORIES}</p> ! <p>{LOCATIONS_LABEL}<br />{LOCATIONS}</p> ! <p>{FEATURES_LABEL}<br />{FEATURES}</p> <p>{ALLOW_COMMENTS} {ALLOW_COMMENTS_LABEL}</p> <p>{ALLOW_ANON} {ALLOW_ANON_LABEL}</p> --- 52,59 ---- <fieldset> <legend><strong>{SETTINGS_GROUP_LABEL}</strong></legend> ! <!-- BEGIN select_list_tip --><p>{SELECT_LIST_TIP}</p><!-- END select_list_tip --> ! <!-- BEGIN categories_label --><p>{CATEGORIES_LABEL}<br />{CATEGORIES}</p><!-- END categories_label --> ! <!-- BEGIN locations_label --><p>{LOCATIONS_LABEL}<br />{LOCATIONS}</p><!-- END locations_label --> ! <!-- BEGIN features_label --><p>{FEATURES_LABEL}<br />{FEATURES}</p><!-- END features_label --> <p>{ALLOW_COMMENTS} {ALLOW_COMMENTS_LABEL}</p> <p>{ALLOW_ANON} {ALLOW_ANON_LABEL}</p> Index: edit_settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_settings.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** edit_settings.tpl 7 Jul 2008 13:30:19 -0000 1.7 --- edit_settings.tpl 25 Jul 2008 12:28:19 -0000 1.8 *************** *** 14,17 **** --- 14,23 ---- </fieldset> <fieldset> + <legend><strong>{OPTIONS_GROUP_LABEL}</strong></legend> + <p>{USE_CATEGORIES} {USE_CATEGORIES_LABEL}</p> + <p>{USE_LOCATIONS} {USE_LOCATIONS_LABEL}</p> + <p>{USE_FEATURES} {USE_FEATURES_LABEL}</p> + </fieldset> + <fieldset> <legend><strong>{COMMENTS_GROUP_LABEL}</strong></legend> <p>{COMMENTS_ENABLE} {COMMENTS_ENABLE_LABEL}</p> |
|
From: Verdon V. <ve...@us...> - 2008-07-25 12:28:10
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6454/inc Modified Files: settings.php Log Message: category, location, feature switches Index: settings.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/inc/settings.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** settings.php 7 Jul 2008 13:30:18 -0000 1.7 --- settings.php 25 Jul 2008 12:28:17 -0000 1.8 *************** *** 76,79 **** --- 76,82 ---- $settings['custom7_list'] = 0; $settings['custom8_list'] = 0; + $settings['use_categories'] = 1; + $settings['use_locations'] = 1; + $settings['use_features'] = 1; ?> \ No newline at end of file |
|
From: Verdon V. <ve...@us...> - 2008-07-24 20:08:54
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26985/docs Modified Files: CHANGELOG TODO Log Message: tweaks to control panel Index: TODO =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/TODO,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TODO 25 Jun 2008 12:32:09 -0000 1.13 --- TODO 24 Jul 2008 20:09:00 -0000 1.14 *************** *** 14,15 **** --- 14,19 ---- do a final update of language file + + CHECK combination of settings perms and unrestricted only, in all locations + + Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CHANGELOG 24 Jul 2008 12:40:19 -0000 1.9 --- CHANGELOG 24 Jul 2008 20:09:00 -0000 1.10 *************** *** 66,69 **** --- 66,70 ---- perms can edit internal custom field data + Added categories to dependency.xml and check file + + Re-organized some control panel tabs into sub-tabs |
|
From: Verdon V. <ve...@us...> - 2008-07-24 20:08:53
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26985/class Modified Files: RDX_Forms.php Rolodex.php Log Message: tweaks to control panel Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** RDX_Forms.php 24 Jul 2008 12:40:18 -0000 1.20 --- RDX_Forms.php 24 Jul 2008 20:08:51 -0000 1.21 *************** *** 136,139 **** --- 136,164 ---- + function settingsPanel() + { + PHPWS_Core::initModClass('controlpanel', 'Panel.php'); + $link = 'index.php?module=rolodex&aop=menu'; + + if (Current_User::allow('rolodex', 'settings')){ + $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings'), + 'link'=>$link); + $tags['locations'] = array('title'=>dgettext('rolodex', 'Locations'), + 'link'=>$link); + $tags['features'] = array('title'=>dgettext('rolodex', 'Features'), + 'link'=>$link); + } + + if (Current_User::isUnrestricted('rolodex')) { + $tags['utilities'] = array('title'=>dgettext('rolodex', 'Utilities'), 'link'=>$link); + } + + $panel = new PHPWS_Panel('rolodex-settings-panel'); + $panel->quickSetTabs($tags); + $panel->setModule('rolodex'); + return $panel; + } + + function listMembers($approved=null, $expired=false, $location=null, $feature=null, $category=null) { Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Rolodex.php 24 Jul 2008 12:40:18 -0000 1.17 --- Rolodex.php 24 Jul 2008 20:08:52 -0000 1.18 *************** *** 50,53 **** --- 50,88 ---- $this->loadMessage(); + /* This switch determines if 'settings' panel needs creating */ + switch($_REQUEST['aop']) { + case 'post_settings': + case 'reset_expired': + case 'delete_expired': + case 'search_index_all': + case 'search_remove_all': + case 'all_comments_yes': + case 'all_comments_no': + case 'all_anon_yes': + case 'all_anon_no': + case 'new_location': + case 'edit_location': + case 'post_location': + case 'delete_location': + case 'new_feature': + case 'edit_feature': + case 'post_feature': + case 'delete_feature': + PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php'); + $settingsPanel = Rolodex_Forms::settingsPanel(); + $settingsPanel->enableSecure(); + break; + case 'menu': + if (isset($_GET['tab'])) { + if ($_GET['tab'] == 'settings' || $_GET['tab'] == 'utilities' || $_GET['tab'] == 'locations' || $_GET['tab'] == 'features') { + PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php'); + $settingsPanel = Rolodex_Forms::settingsPanel(); + $settingsPanel->enableSecure(); + } + } + + } + + /* This switch dumps the content in */ switch($_REQUEST['aop']) { *************** *** 61,64 **** --- 96,100 ---- case 'post_settings': + $settingsPanel->setCurrentTab('settings'); if (!Current_User::authorized('rolodex', 'settings')) { Current_User::disallow(); *************** *** 129,132 **** --- 165,169 ---- case 'reset_expired': + $settingsPanel->setCurrentTab('utilities'); $interval = PHPWS_Settings::get('rolodex', 'expiry_interval'); $this->resetExpired($interval); *************** *** 136,139 **** --- 173,177 ---- case 'delete_expired': + $settingsPanel->setCurrentTab('utilities'); $num = $this->deleteExpired(); if ($num > 0) { *************** *** 146,149 **** --- 184,188 ---- case 'search_index_all': + $settingsPanel->setCurrentTab('utilities'); if (PHPWS_Settings::get('rolodex', 'privacy_use_search')) { $this->search_index_all(); *************** *** 156,159 **** --- 195,199 ---- case 'search_remove_all': + $settingsPanel->setCurrentTab('utilities'); if (PHPWS_Settings::get('rolodex', 'privacy_use_search')) { $this->message = dgettext('rolodex', 'Search indexing is enabled in Rolodex settings. You must disable it there before you may perform this action.'); *************** *** 166,169 **** --- 206,210 ---- case 'all_comments_yes': + $settingsPanel->setCurrentTab('utilities'); $this->setAllComments(1); $this->message = dgettext('rolodex', 'Allow comments has been set to yes on all members.'); *************** *** 172,175 **** --- 213,217 ---- case 'all_comments_no': + $settingsPanel->setCurrentTab('utilities'); $this->setAllComments(0); $this->message = dgettext('rolodex', 'Allow comments has been set to no on all members.'); *************** *** 178,181 **** --- 220,224 ---- case 'all_anon_yes': + $settingsPanel->setCurrentTab('utilities'); $this->setAllComments_annon(1); $this->message = dgettext('rolodex', 'Allow anonymous comments has been set to yes on all members.'); *************** *** 184,187 **** --- 227,231 ---- case 'all_anon_no': + $settingsPanel->setCurrentTab('utilities'); $this->setAllComments_annon(0); $this->message = dgettext('rolodex', 'Allow anonymous comments has been set to no on all members.'); *************** *** 198,205 **** --- 242,251 ---- case 'new_location': case 'edit_location': + $settingsPanel->setCurrentTab('locations'); $this->loadForm('edit_location'); break; case 'post_location': + $settingsPanel->setCurrentTab('locations'); if ($this->postLocation()) { if (PHPWS_Error::logIfError($this->location->save())) { *************** *** 216,219 **** --- 262,266 ---- case 'delete_location': + $settingsPanel->setCurrentTab('locations'); $this->loadLocation(); $this->location->delete(); *************** *** 224,231 **** --- 271,280 ---- case 'new_feature': case 'edit_feature': + $settingsPanel->setCurrentTab('features'); $this->loadForm('edit_feature'); break; case 'post_feature': + $settingsPanel->setCurrentTab('features'); if ($this->postFeature()) { if (PHPWS_Error::logIfError($this->feature->save())) { *************** *** 242,245 **** --- 291,295 ---- case 'delete_feature': + $settingsPanel->setCurrentTab('features'); $this->loadFeature(); $this->feature->delete(); *************** *** 250,253 **** --- 300,333 ---- } + /* This switch creates the 'settings' panel when needed */ + switch($_REQUEST['aop']) { + case 'post_settings': + case 'reset_expired': + case 'delete_expired': + case 'search_index_all': + case 'search_remove_all': + case 'all_comments_yes': + case 'all_comments_no': + case 'all_anon_yes': + case 'all_anon_no': + case 'new_location': + case 'edit_location': + case 'post_location': + case 'delete_location': + case 'new_feature': + case 'edit_feature': + case 'post_feature': + case 'delete_feature': + $settingsPanel->setContent($this->content); + $this->content = $settingsPanel->display(); + case 'menu': + if (isset($_GET['tab'])) { + if ($_GET['tab'] == 'settings' || $_GET['tab'] == 'utilities' || $_GET['tab'] == 'locations' || $_GET['tab'] == 'features') { + $settingsPanel->setContent($this->content); + $this->content = $settingsPanel->display(); + } + } + } + $tpl['TITLE'] = $this->title; $tpl['CONTENT'] = $this->content; *************** *** 532,539 **** $this->forms->listMembers(1, false, null, null, $id); } ! break; ! ! // function listMembers($approved=null, $expired=false, $location=null, $feature=null, $category=null) ! --- 612,616 ---- $this->forms->listMembers(1, false, null, null, $id); } ! break; *************** *** 655,670 **** $tags['expired'] = array('title'=>sprintf(dgettext('rolodex', 'Expired (%s)'), $expired), 'link'=>$link); } - $tags['utilities'] = array('title'=>dgettext('rolodex', 'Utilities'), 'link'=>$link); } if (Current_User::allow('rolodex', 'settings')){ ! $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings'), 'link'=>$link); } ! $tags['locations'] = array('title'=>dgettext('rolodex', 'Locations'), ! 'link'=>$link); ! $tags['features'] = array('title'=>dgettext('rolodex', 'Features'), ! 'link'=>$link); ! if (Current_User::allow('rolodex', 'edit_member')){ $tags['info'] = array('title'=>dgettext('rolodex', 'Read me'), 'link'=>$link); --- 732,743 ---- $tags['expired'] = array('title'=>sprintf(dgettext('rolodex', 'Expired (%s)'), $expired), 'link'=>$link); } } if (Current_User::allow('rolodex', 'settings')){ ! $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings & Utilities'), 'link'=>$link); } ! ! if (Current_User::allow('rolodex', 'settings')){ $tags['info'] = array('title'=>dgettext('rolodex', 'Read me'), 'link'=>$link); |
|
From: Verdon V. <ve...@us...> - 2008-07-24 14:14:18
|
Update of /cvsroot/phpwebsite-comm/modules/whatsnew/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18245/docs Modified Files: CHANGELOG Log Message: added cache reset to post_settings Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/docs/CHANGELOG,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CHANGELOG 22 Jul 2008 15:18:41 -0000 1.2 --- CHANGELOG 24 Jul 2008 14:14:25 -0000 1.3 *************** *** 13,14 **** --- 13,18 ---- + Implimented text parsing to title and text settings + Added English language file + + Version 0.3.0 -- July 2008 + ------------------------------------------------------------------ + + Added cache_reset to post_settings (thanks Greg) |
|
From: Verdon V. <ve...@us...> - 2008-07-24 14:14:16
|
Update of /cvsroot/phpwebsite-comm/modules/whatsnew/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18245/class Modified Files: Whatsnew.php Log Message: added cache reset to post_settings Index: Whatsnew.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/whatsnew/class/Whatsnew.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Whatsnew.php 22 Jul 2008 15:18:39 -0000 1.2 --- Whatsnew.php 24 Jul 2008 14:14:22 -0000 1.3 *************** *** 204,211 **** return false; } else { if (PHPWS_Settings::save('whatsnew')) { return true; } else { ! return falsel; } } --- 204,212 ---- return false; } else { + PHPWS_Cache::remove('whatsnew_cache_key'); if (PHPWS_Settings::save('whatsnew')) { return true; } else { ! return false; } } |
|
From: Verdon V. <ve...@us...> - 2008-07-24 12:40:41
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15010/class Modified Files: RDX_Forms.php RDX_Member.php Rolodex.php Log Message: steps toward 1.1.0 Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** RDX_Forms.php 17 Jul 2008 13:50:21 -0000 1.19 --- RDX_Forms.php 24 Jul 2008 12:40:18 -0000 1.20 *************** *** 870,874 **** $form->addText('business_name', $member->business_name); $form->setSize('business_name', 40); ! $form->setLabel('business_name', dgettext('rolodex', 'Business/Organization name')); $form->addText('department', $member->department); --- 870,874 ---- $form->addText('business_name', $member->business_name); $form->setSize('business_name', 40); ! $form->setLabel('business_name', dgettext('rolodex', 'Business/Organization')); $form->addText('department', $member->department); *************** *** 1033,1037 **** } ! if (PHPWS_Settings::get('rolodex', 'custom5_name')) { $form->addText('custom5', $member->custom5); $form->setSize('custom5', 40); --- 1033,1037 ---- } ! if (PHPWS_Settings::get('rolodex', 'custom5_name') && Current_User::allow('rolodex', 'edit_member')) { $form->addText('custom5', $member->custom5); $form->setSize('custom5', 40); *************** *** 1039,1043 **** } ! if (PHPWS_Settings::get('rolodex', 'custom6_name')) { $form->addText('custom6', $member->custom6); $form->setSize('custom6', 40); --- 1039,1043 ---- } ! if (PHPWS_Settings::get('rolodex', 'custom6_name') && Current_User::allow('rolodex', 'edit_member')) { $form->addText('custom6', $member->custom6); $form->setSize('custom6', 40); *************** *** 1045,1049 **** } ! if (PHPWS_Settings::get('rolodex', 'custom7_name')) { $form->addText('custom7', $member->custom7); $form->setSize('custom7', 40); --- 1045,1049 ---- } ! if (PHPWS_Settings::get('rolodex', 'custom7_name') && Current_User::allow('rolodex', 'edit_member')) { $form->addText('custom7', $member->custom7); $form->setSize('custom7', 40); *************** *** 1051,1055 **** } ! if (PHPWS_Settings::get('rolodex', 'custom8_name')) { $form->addText('custom8', $member->custom8); $form->setSize('custom8', 40); --- 1051,1055 ---- } ! if (PHPWS_Settings::get('rolodex', 'custom8_name') && Current_User::allow('rolodex', 'edit_member')) { $form->addText('custom8', $member->custom8); $form->setSize('custom8', 40); *************** *** 1081,1085 **** $tpl['SETTINGS_GROUP_LABEL'] = dgettext('rolodex', 'Settings'); $tpl['SELECT_LIST_TIP'] = dgettext('rolodex', 'To use the category, location, or feature lists, select an item from the list and click on the "+" symbool to add the selection to this profile. To remove a selection, click on the name of the item in the box below the select menu.'); ! if (PHPWS_Settings::get('rolodex', 'custom1_name') || PHPWS_Settings::get('rolodex', 'custom2_name') || PHPWS_Settings::get('rolodex', 'custom3_name') || PHPWS_Settings::get('rolodex', 'custom4_name') || PHPWS_Settings::get('rolodex', 'custom5_name') || PHPWS_Settings::get('rolodex', 'custom6_name') || PHPWS_Settings::get('rolodex', 'custom7_name') || PHPWS_Settings::get('rolodex', 'custom8_name')) { $tpl['META_GROUP_LABEL'] = dgettext('rolodex', 'Extra'); } --- 1081,1093 ---- $tpl['SETTINGS_GROUP_LABEL'] = dgettext('rolodex', 'Settings'); $tpl['SELECT_LIST_TIP'] = dgettext('rolodex', 'To use the category, location, or feature lists, select an item from the list and click on the "+" symbool to add the selection to this profile. To remove a selection, click on the name of the item in the box below the select menu.'); ! if (PHPWS_Settings::get('rolodex', 'custom1_name') || ! PHPWS_Settings::get('rolodex', 'custom2_name') || ! PHPWS_Settings::get('rolodex', 'custom3_name') || ! PHPWS_Settings::get('rolodex', 'custom4_name') || ! (PHPWS_Settings::get('rolodex', 'custom5_name') && Current_User::allow('rolodex', 'edit_member')) || ! (PHPWS_Settings::get('rolodex', 'custom6_name') && Current_User::allow('rolodex', 'edit_member')) || ! (PHPWS_Settings::get('rolodex', 'custom7_name') && Current_User::allow('rolodex', 'edit_member')) || ! (PHPWS_Settings::get('rolodex', 'custom8_name') && Current_User::allow('rolodex', 'edit_member')) ! ) { $tpl['META_GROUP_LABEL'] = dgettext('rolodex', 'Extra'); } Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Rolodex.php 17 Jul 2008 13:50:21 -0000 1.16 --- Rolodex.php 24 Jul 2008 12:40:18 -0000 1.17 *************** *** 835,866 **** --- 835,882 ---- if (!empty($_POST['custom1_name'])) { PHPWS_Settings::set('rolodex', 'custom1_name', PHPWS_Text::parseInput(strip_tags($_POST['custom1_name']))); + } else { + PHPWS_Settings::set('rolodex', 'custom1_name', null); } if (!empty($_POST['custom2_name'])) { PHPWS_Settings::set('rolodex', 'custom2_name', PHPWS_Text::parseInput(strip_tags($_POST['custom2_name']))); + } else { + PHPWS_Settings::set('rolodex', 'custom2_name', null); } if (!empty($_POST['custom3_name'])) { PHPWS_Settings::set('rolodex', 'custom3_name', PHPWS_Text::parseInput(strip_tags($_POST['custom3_name']))); + } else { + PHPWS_Settings::set('rolodex', 'custom3_name', null); } if (!empty($_POST['custom4_name'])) { PHPWS_Settings::set('rolodex', 'custom4_name', PHPWS_Text::parseInput(strip_tags($_POST['custom4_name']))); + } else { + PHPWS_Settings::set('rolodex', 'custom4_name', null); } if (!empty($_POST['custom5_name'])) { PHPWS_Settings::set('rolodex', 'custom5_name', PHPWS_Text::parseInput(strip_tags($_POST['custom5_name']))); + } else { + PHPWS_Settings::reset('rolodex', 'custom5_name'); } if (!empty($_POST['custom6_name'])) { PHPWS_Settings::set('rolodex', 'custom6_name', PHPWS_Text::parseInput(strip_tags($_POST['custom6_name']))); + } else { + PHPWS_Settings::set('rolodex', 'custom6_name', null); } if (!empty($_POST['custom7_name'])) { PHPWS_Settings::set('rolodex', 'custom7_name', PHPWS_Text::parseInput(strip_tags($_POST['custom7_name']))); + } else { + PHPWS_Settings::set('rolodex', 'custom7_name', null); } if (!empty($_POST['custom8_name'])) { PHPWS_Settings::set('rolodex', 'custom8_name', PHPWS_Text::parseInput(strip_tags($_POST['custom8_name']))); + } else { + PHPWS_Settings::set('rolodex', 'custom8_name', null); } *************** *** 1048,1052 **** $this->member->setPrivacy($_POST['privacy']); ! $this->member->setEmail_privacy($_POST['email_privacy']); if (isset($_POST['custom1'])) { --- 1064,1072 ---- $this->member->setPrivacy($_POST['privacy']); ! if (isset($_POST['email_privacy'])) { ! $this->member->setEmail_privacy(1); ! } else { ! $this->member->setEmail_privacy(0); ! } if (isset($_POST['custom1'])) { Index: RDX_Member.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** RDX_Member.php 17 Jul 2008 13:50:21 -0000 1.15 --- RDX_Member.php 24 Jul 2008 12:40:18 -0000 1.16 *************** *** 1371,1375 **** $tpl['TITLE'] = $this->viewLink(true); $tpl['DATE_UPDATED'] = $this->getDate_updated(true, '%a %b %e %Y'); ! $tpl['DESCRIPTION'] = $this->getListDescription(180); $tpl['THUMBNAIL'] = $this->getThumbnail(true, true); if ($this->isDataVisible('privacy_contact')) { --- 1371,1377 ---- $tpl['TITLE'] = $this->viewLink(true); $tpl['DATE_UPDATED'] = $this->getDate_updated(true, '%a %b %e %Y'); ! if ($this->description) { ! $tpl['DESCRIPTION'] = $this->getListDescription(180); ! } $tpl['THUMBNAIL'] = $this->getThumbnail(true, true); if ($this->isDataVisible('privacy_contact')) { |
|
From: Verdon V. <ve...@us...> - 2008-07-24 12:40:41
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15010/boost Modified Files: boost.php dependency.xml update.php Log Message: steps toward 1.1.0 Index: dependency.xml =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/dependency.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dependency.xml 31 Mar 2008 19:42:44 -0000 1.3 --- dependency.xml 24 Jul 2008 12:40:13 -0000 1.4 *************** *** 19,21 **** --- 19,27 ---- <url>http://phpwebsite.appstate.edu/downloads/modules/demographics/</url> </module> + <module> + <title>categories</title> + <properName>Categories</properName> + <version>2.2.1</version> + <url>http://phpwebsite.appstate.edu/downloads/modules/categories/</url> + </module> </dependency> Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/boost.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** boost.php 17 Jul 2008 13:50:16 -0000 1.6 --- boost.php 24 Jul 2008 12:40:13 -0000 1.7 *************** *** 24,28 **** $proper_name = 'Rolodex'; ! $version = '1.0.1'; $image_dir = true; $import_sql = true; --- 24,28 ---- $proper_name = 'Rolodex'; ! $version = '1.1.0'; $image_dir = true; $import_sql = true; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** update.php 17 Jul 2008 13:50:16 -0000 1.11 --- update.php 24 Jul 2008 12:40:13 -0000 1.12 *************** *** 142,146 **** ! case version_compare($currentVersion, '1.0.1', '<'): $content[] = '<pre>'; $db = new PHPWS_DB('rolodex_member'); --- 142,146 ---- ! case version_compare($currentVersion, '1.1.0', '<'): $content[] = '<pre>'; $db = new PHPWS_DB('rolodex_member'); *************** *** 154,158 **** } ! $files = array('templates/edit_member.tpl'); rolodexUpdateFiles($files, $content); --- 154,161 ---- } ! $files = array('templates/edit_member.tpl', ! 'templates/view_member.tpl', ! 'templates/list_member.tpl' ! ); rolodexUpdateFiles($files, $content); *************** *** 160,164 **** ---------------- + Added support for email/contact link privacy at user level ! + Minor layout tweaks </pre>'; --- 163,172 ---- ---------------- + Added support for email/contact link privacy at user level ! + Various minor layout tweaks ! + Fixed bug in post settings that wasn\'t clearning custom field ! labels ! + Added security check so that only users with edit_member ! perms can edit internal custom field data ! + Added categories to dependency.xml and check file </pre>'; |
|
From: Verdon V. <ve...@us...> - 2008-07-24 12:40:15
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15010/docs Modified Files: CHANGELOG Log Message: steps toward 1.1.0 Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CHANGELOG 17 Jul 2008 13:50:22 -0000 1.8 --- CHANGELOG 24 Jul 2008 12:40:19 -0000 1.9 *************** *** 57,64 **** + Template tweaks ! Version 1.0.1 -- July 2008 ------------------------------------------------------------------ + Added support for email/contact link privacy at user level + Minor layout tweaks --- 57,69 ---- + Template tweaks ! Version 1.1.0 -- July 2008 ------------------------------------------------------------------ + Added support for email/contact link privacy at user level + Minor layout tweaks + + Fixed bug in post settings that wasn't clearning custom field + labels + + Added security check so that only users with edit_member + perms can edit internal custom field data + + Added categories to dependency.xml and check file |
