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-07-07 13:30:43
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15927/docs Modified Files: CHANGELOG Log Message: 1.0 cleanup Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CHANGELOG 6 Jul 2008 13:05:19 -0000 1.6 --- CHANGELOG 7 Jul 2008 13:30:16 -0000 1.7 *************** *** 51,53 **** --- 51,58 ---- + Added View icon to member viewLink(icon=false) + Added option to have admin notification of all member edits + + Added Settings link to navLinks() if not already an admin mode + + Consolidated list by location/feature/category views into + main browse/list function + + Cleaned out a lot of old code from old 'view by' lists + + Template tweaks |
|
From: Verdon V. <ve...@us...> - 2008-07-07 13:30:39
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15927/class Modified Files: RDX_Feature.php RDX_Forms.php RDX_Location.php RDX_Member.php Rolodex.php Log Message: 1.0 cleanup Index: RDX_Feature.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Feature.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RDX_Feature.php 24 Jun 2008 11:23:27 -0000 1.4 --- RDX_Feature.php 7 Jul 2008 13:30:15 -0000 1.5 *************** *** 130,174 **** - function view() - { - if (!$this->id) { - PHPWS_Core::errorPage(404); - } - - Layout::addPageTitle($this->getTitle()); - $template['TITLE'] = $this->getTitle(true); - $template['DESCRIPTION'] = PHPWS_Text::parseTag($this->getDescription(true)); - $template['IMAGE'] = $this->getFile(); - - if (Current_User::allow('rolodex', 'settings')) { - $vars['feature'] = $this->id; - $vars['aop'] = 'edit_feature'; - MiniAdmin::add('rolodex', array(PHPWS_Text::secureLink(dgettext('rolodex', 'Edit feature'), 'rolodex', $vars))); - } - - if (Current_User::allow('rolodex', 'settings')) { - $vars2['aop'] = 'menu'; - $vars2['tab'] = 'features'; - MiniAdmin::add('rolodex', array(PHPWS_Text::secureLink(dgettext('rolodex', 'List all features'), 'rolodex', $vars2))); - } - - $template['FEATURE_LINKS'] = $this->featureLinks(); - - $members = $this->getAllMembers(true); - if (PHPWS_Error::logIfError($members)) { - $this->rolodex->content = dgettext('rolodex', 'An error occurred when accessing this feature\'s members.'); - return; - } - if ($members) { - foreach ($members as $member) { - $template['current-members'][] = $member->viewTpl(); - } - } - - return PHPWS_Template::process($template, 'rolodex', 'view_feature.tpl'); - - } - - function delete() { --- 130,133 ---- *************** *** 187,245 **** - function getAllMembers($limit=false) - { - PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); - - $db = new PHPWS_DB('rolodex_member'); - $db->addColumn('rolodex_feature_items.*'); - $db->addColumn('rolodex_member.*'); - $db->addColumn('demographics.*'); - $db->addWhere('rolodex_member.user_id', 'rolodex_feature_items.member_id'); - $db->addWhere('rolodex_feature_items.feature_id', $this->id); - $db->addWhere('rolodex_member.user_id', 'demographics.user_id'); - - /* approved yes/no */ - if (isset($approved)) { - $addWhere('active', $approved); - } - - /* expired yes/no */ - if (PHPWS_Settings::get('rolodex', 'enable_expiry')) { - if ($expired) { - $addWhere('date_expires', mktime(), '<='); - } else { - $addWhere('date_expires', mktime(), '>='); - } - } - - /* make sure only unrestricted users see inactive members */ - if (!Current_User::isUnrestricted('rolodex')) { - $db->addWhere('active', 1); - } - - /* set the default sort order and title column sort */ - if (PHPWS_Settings::get('rolodex', 'sortby')) { - $sortby = 'demographics.last_name'; - // $db->joinResult('user_id', 'demographics', 'user_id', 'last_name', 'title'); - } else { - $sortby = 'demographics.business_name'; - // $db->joinResult('user_id', 'demographics', 'user_id', 'business_name', 'title'); - } - - /* deal with privacy levels */ - if (!$_SESSION['User']->id) { - $db->addWhere('rolodex_member.privacy', 0); - } elseif (!Current_User::allow('rolodex', 'view_privates')) { - $db->addWhere('rolodex_member.privacy', 1, '<='); - } - - /* the default sort order */ - $db->addOrder($sortby, 'asc', true); - - $result = $db->getObjects('Rolodex_Member'); - return $result; - } - - function rowTag() { --- 146,149 ---- Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** RDX_Forms.php 6 Jul 2008 13:05:17 -0000 1.16 --- RDX_Forms.php 7 Jul 2008 13:30:15 -0000 1.17 *************** *** 352,356 **** // $ptags['CLEAR_FILTERS'] = '<input type="radio" name="clearFilters" value="1" checked="checked" />' . dgettext('rolodex', 'Clear filters or'); // $ptags['CLEAR_FILTERS'] .= ' <input type="radio" name="clearFilters" value="0" />' . dgettext('rolodex', 'Search within results'); ! $ptags['CLEAR_FILTERS'] = dgettext('rolodex', 'Clears filters and searches all records.'); $pager->addPageTags($ptags); --- 352,360 ---- // $ptags['CLEAR_FILTERS'] = '<input type="radio" name="clearFilters" value="1" checked="checked" />' . dgettext('rolodex', 'Clear filters or'); // $ptags['CLEAR_FILTERS'] .= ' <input type="radio" name="clearFilters" value="0" />' . dgettext('rolodex', 'Search within results'); ! if (isset($ptags['ITEM_TITLE'])) { ! $ptags['CLEAR_FILTERS'] = sprintf(dgettext('rolodex', 'Search within %s.'), $ptags['ITEM_TITLE']); ! } else { ! $ptags['CLEAR_FILTERS'] = dgettext('rolodex', 'Clears filters and searches all records.'); ! } $pager->addPageTags($ptags); *************** *** 634,676 **** $form->setLabel('use_captcha', dgettext('rolodex', 'Use graphical confirmation on contact form (CAPTCHA)')); ! $form->addRadio('list_address', array(0, 1, 2)); ! $form->setLabel('list_address', array(dgettext('rolodex', 'None'), dgettext('rolodex', 'Business'), dgettext('rolodex', 'Home'))); $form->setMatch('list_address', PHPWS_Settings::get('rolodex', 'list_address')); - $form->addRadio('browse_address', array(0, 1, 2)); - $form->setLabel('browse_address', array(dgettext('rolodex', 'None'), dgettext('rolodex', 'Business'), dgettext('rolodex', 'Home'))); - $form->setMatch('browse_address', PHPWS_Settings::get('rolodex', 'browse_address')); - $form->addCheckbox('list_phone', 1); $form->setMatch('list_phone', PHPWS_Settings::get('rolodex', 'list_phone')); ! $form->setLabel('list_phone', dgettext('rolodex', 'List')); ! ! $form->addCheckbox('browse_phone', 1); ! $form->setMatch('browse_phone', PHPWS_Settings::get('rolodex', 'browse_phone')); ! $form->setLabel('browse_phone', dgettext('rolodex', 'Browse')); $form->addCheckbox('list_categories', 1); $form->setMatch('list_categories', PHPWS_Settings::get('rolodex', 'list_categories')); ! $form->setLabel('list_categories', dgettext('rolodex', 'List')); ! ! $form->addCheckbox('browse_categories', 1); ! $form->setMatch('browse_categories', PHPWS_Settings::get('rolodex', 'browse_categories')); ! $form->setLabel('browse_categories', dgettext('rolodex', 'Browse')); $form->addCheckbox('list_locations', 1); $form->setMatch('list_locations', PHPWS_Settings::get('rolodex', 'list_locations')); ! $form->setLabel('list_locations', dgettext('rolodex', 'List')); ! ! $form->addCheckbox('browse_locations', 1); ! $form->setMatch('browse_locations', PHPWS_Settings::get('rolodex', 'browse_locations')); ! $form->setLabel('browse_locations', dgettext('rolodex', 'Browse')); $form->addCheckbox('list_features', 1); $form->setMatch('list_features', PHPWS_Settings::get('rolodex', 'list_features')); ! $form->setLabel('list_features', dgettext('rolodex', 'List')); ! ! $form->addCheckbox('browse_features', 1); ! $form->setMatch('browse_features', PHPWS_Settings::get('rolodex', 'browse_features')); ! $form->setLabel('browse_features', dgettext('rolodex', 'Browse')); $form->addTextField('max_img_width', PHPWS_Settings::get('rolodex', 'max_img_width')); --- 638,660 ---- $form->setLabel('use_captcha', dgettext('rolodex', 'Use graphical confirmation on contact form (CAPTCHA)')); ! $form->addRadio('list_address', array(0, 1, 2, 3)); ! $form->setLabel('list_address', array(dgettext('rolodex', 'None'), dgettext('rolodex', 'Business'), dgettext('rolodex', 'Home'), dgettext('rolodex', 'Both'))); $form->setMatch('list_address', PHPWS_Settings::get('rolodex', 'list_address')); $form->addCheckbox('list_phone', 1); $form->setMatch('list_phone', PHPWS_Settings::get('rolodex', 'list_phone')); ! $form->setLabel('list_phone', dgettext('rolodex', 'Display phone numbers')); $form->addCheckbox('list_categories', 1); $form->setMatch('list_categories', PHPWS_Settings::get('rolodex', 'list_categories')); ! $form->setLabel('list_categories', dgettext('rolodex', 'Display categories')); $form->addCheckbox('list_locations', 1); $form->setMatch('list_locations', PHPWS_Settings::get('rolodex', 'list_locations')); ! $form->setLabel('list_locations', dgettext('rolodex', 'Display locations')); $form->addCheckbox('list_features', 1); $form->setMatch('list_features', PHPWS_Settings::get('rolodex', 'list_features')); ! $form->setLabel('list_features', dgettext('rolodex', 'Display features')); $form->addTextField('max_img_width', PHPWS_Settings::get('rolodex', 'max_img_width')); *************** *** 783,792 **** $tpl['PRIVACY_USE_SEARCH_TITLE'] = dgettext('rolodex', 'Register records in search module'); $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 list views'); ! $tpl['BROWSE_ADDRESS_TITLE'] = dgettext('rolodex', 'Address to display on browse views'); ! $tpl['LIST_PHONE_TITLE'] = dgettext('rolodex', 'Display phone numbers'); ! $tpl['LIST_CATEGORIES_TITLE'] = dgettext('rolodex', 'Display categories'); ! $tpl['LIST_LOCATIONS_TITLE'] = dgettext('rolodex', 'Display locations'); ! $tpl['LIST_FEATURES_TITLE'] = dgettext('rolodex', 'Display features'); $tpl['COMMENTS_GROUP_LABEL'] = dgettext('rolodex', 'Comments Settings'); $tpl['PRIVACY_GROUP_LABEL'] = dgettext('rolodex', 'Privacy Settings'); --- 767,771 ---- $tpl['PRIVACY_USE_SEARCH_TITLE'] = dgettext('rolodex', 'Register records in search module'); $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'); *************** *** 795,799 **** $tpl['FIELDS_GROUP_LABEL'] = dgettext('rolodex', 'Custom Fields'); $tpl['FIELDS_NOTE'] = dgettext('rolodex', 'You may use up to 8 custom fields. To add a field to your member profile template, enter a title for it here. Fields 1-4 follow whatever other security/privacy settings are in place. Fields 5-8 are only visible to Rolodex admins. Leave these fields empty if you do not wish to add custom fields to your profiles.'); ! $tpl['FIELDS_LIST_LABEL'] = dgettext('rolodex', 'Select checkbox to also include field in browse view'); $this->rolodex->title = dgettext('rolodex', 'Settings'); --- 774,778 ---- $tpl['FIELDS_GROUP_LABEL'] = dgettext('rolodex', 'Custom Fields'); $tpl['FIELDS_NOTE'] = dgettext('rolodex', 'You may use up to 8 custom fields. To add a field to your member profile template, enter a title for it here. Fields 1-4 follow whatever other security/privacy settings are in place. Fields 5-8 are only visible to Rolodex admins. Leave these fields empty if you do not wish to add custom fields to your profiles.'); ! $tpl['FIELDS_LIST_LABEL'] = dgettext('rolodex', 'Select checkbox to also include field in list view'); $this->rolodex->title = dgettext('rolodex', 'Settings'); *************** *** 1303,1306 **** --- 1282,1286 ---- + /* not in use */ function categories() { Index: RDX_Location.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Location.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RDX_Location.php 24 Jun 2008 11:23:27 -0000 1.4 --- RDX_Location.php 7 Jul 2008 13:30:15 -0000 1.5 *************** *** 129,173 **** - function view() - { - if (!$this->id) { - PHPWS_Core::errorPage(404); - } - - Layout::addPageTitle($this->getTitle()); - $template['TITLE'] = $this->getTitle(true); - $template['DESCRIPTION'] = PHPWS_Text::parseTag($this->getDescription(true)); - $template['IMAGE'] = $this->getFile(); - - if (Current_User::allow('rolodex', 'settings')) { - $vars['location'] = $this->id; - $vars['aop'] = 'edit_location'; - MiniAdmin::add('rolodex', array(PHPWS_Text::secureLink(dgettext('rolodex', 'Edit location'), 'rolodex', $vars))); - } - - if (Current_User::allow('rolodex', 'settings')) { - $vars2['aop'] = 'menu'; - $vars2['tab'] = 'locations'; - MiniAdmin::add('rolodex', array(PHPWS_Text::secureLink(dgettext('rolodex', 'List all locations'), 'rolodex', $vars2))); - } - - $template['LOCATION_LINKS'] = $this->locationLinks(); - - $members = $this->getAllMembers(true); - if (PHPWS_Error::logIfError($members)) { - $this->rolodex->content = dgettext('rolodex', 'An error occurred when accessing this location\'s members.'); - return; - } - if ($members) { - foreach ($members as $member) { - $template['current-members'][] = $member->viewTpl(); - } - } - - return PHPWS_Template::process($template, 'rolodex', 'view_location.tpl'); - - } - - function delete() { --- 129,132 ---- *************** *** 186,244 **** - function getAllMembers($limit=false, $approved=null, $expired=false) - { - PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); - - $db = new PHPWS_DB('rolodex_member'); - $db->addColumn('rolodex_location_items.*'); - $db->addColumn('rolodex_member.*'); - $db->addColumn('demographics.*'); - $db->addWhere('rolodex_member.user_id', 'rolodex_location_items.member_id'); - $db->addWhere('rolodex_location_items.location_id', $this->id); - $db->addWhere('rolodex_member.user_id', 'demographics.user_id'); - - /* approved yes/no */ - if (isset($approved)) { - $addWhere('active', $approved); - } - - /* expired yes/no */ - if (PHPWS_Settings::get('rolodex', 'enable_expiry')) { - if ($expired) { - $addWhere('date_expires', mktime(), '<='); - } else { - $addWhere('date_expires', mktime(), '>='); - } - } - - /* make sure only unrestricted users see inactive members */ - if (!Current_User::isUnrestricted('rolodex')) { - $db->addWhere('active', 1); - } - - /* set the default sort order and title column sort */ - if (PHPWS_Settings::get('rolodex', 'sortby')) { - $sortby = 'demographics.last_name'; - // $db->joinResult('user_id', 'demographics', 'user_id', 'last_name', 'title'); - } else { - $sortby = 'demographics.business_name'; - // $db->joinResult('user_id', 'demographics', 'user_id', 'business_name', 'title'); - } - - /* deal with privacy levels */ - if (!$_SESSION['User']->id) { - $db->addWhere('rolodex_member.privacy', 0); - } elseif (!Current_User::allow('rolodex', 'view_privates')) { - $db->addWhere('rolodex_member.privacy', 1, '<='); - } - - /* the default sort order */ - $db->addOrder($sortby, 'asc', true); - - $result = $db->getObjects('Rolodex_Member'); - return $result; - } - - function rowTag() { --- 145,148 ---- Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Rolodex.php 6 Jul 2008 13:05:17 -0000 1.14 --- Rolodex.php 7 Jul 2008 13:30:15 -0000 1.15 *************** *** 477,500 **** break; - /* old views - case 'view_location': - $this->loadLocation(); - $this->title = $this->location->getTitle(); - $this->content = $this->location->view(); - break; - - case 'view_feature': - $this->loadFeature(); - $this->title = $this->feature->getTitle(); - $this->content = $this->feature->view(); - break; - - case 'view_category': - $this->loadCategory(); - $this->title = $this->category->getTitle(); - $this->content = $this->categoryView(); - break; - */ - case 'view_location': if (!PHPWS_Settings::get('rolodex', 'allow_anon') && !Current_User::getId()) { --- 477,480 ---- *************** *** 769,773 **** PHPWS_Settings::set('rolodex', 'list_address', $_POST['list_address']); - PHPWS_Settings::set('rolodex', 'browse_address', $_POST['browse_address']); isset($_POST['list_phone']) ? --- 749,752 ---- *************** *** 775,806 **** PHPWS_Settings::set('rolodex', 'list_phone', 0); - isset($_POST['browse_phone']) ? - PHPWS_Settings::set('rolodex', 'browse_phone', 1) : - PHPWS_Settings::set('rolodex', 'browse_phone', 0); - isset($_POST['list_categories']) ? PHPWS_Settings::set('rolodex', 'list_categories', 1) : PHPWS_Settings::set('rolodex', 'list_categories', 0); - isset($_POST['browse_categories']) ? - PHPWS_Settings::set('rolodex', 'browse_categories', 1) : - PHPWS_Settings::set('rolodex', 'browse_categories', 0); - isset($_POST['list_locations']) ? PHPWS_Settings::set('rolodex', 'list_locations', 1) : PHPWS_Settings::set('rolodex', 'list_locations', 0); - isset($_POST['browse_locations']) ? - PHPWS_Settings::set('rolodex', 'browse_locations', 1) : - PHPWS_Settings::set('rolodex', 'browse_locations', 0); - isset($_POST['list_features']) ? PHPWS_Settings::set('rolodex', 'list_features', 1) : PHPWS_Settings::set('rolodex', 'list_features', 0); - isset($_POST['browse_features']) ? - PHPWS_Settings::set('rolodex', 'browse_features', 1) : - PHPWS_Settings::set('rolodex', 'browse_features', 0); - isset($_POST['enable_expiry']) ? --- 754,769 ---- *************** *** 1488,1575 **** - function categoryView() - { - if (!$this->category->id) { - PHPWS_Core::errorPage(404); - } - - Layout::addPageTitle($this->category->getTitle()); - $template['TITLE'] = $this->category->getTitle(true); - $template['DESCRIPTION'] = PHPWS_Text::parseTag($this->category->getDescription(true)); - $template['IMAGE'] = $this->category->getIcon(); - - $template['CATEGORY_LINKS'] = implode(' | ', Rolodex::navLinks()); - - $members = $this->getCatMembers(true); - if (PHPWS_Error::logIfError($members)) { - $this->rolodex->content = dgettext('rolodex', 'An error occurred when accessing this location\'s members.'); - return; - } - if ($members) { - foreach ($members as $member) { - $template['current-members'][] = $member->viewTpl(); - } - } - - return PHPWS_Template::process($template, 'rolodex', 'view_category.tpl'); - - } - - - function getCatMembers($limit=false, $approved=null, $expired=false) - { - PHPWS_Core::initModClass('rolodex', 'RDX_Member.php'); - - $db = new PHPWS_DB('rolodex_member'); - $db->addColumn('category_items.*'); - $db->addColumn('rolodex_member.*'); - $db->addColumn('demographics.*'); - $db->addWhere('rolodex_member.key_id', 'category_items.key_id'); - $db->addWhere('category_items.cat_id', $this->category->id); - $db->addWhere('rolodex_member.user_id', 'demographics.user_id'); - - /* approved yes/no */ - if (isset($approved)) { - $addWhere('active', $approved); - } - - /* expired yes/no */ - if (PHPWS_Settings::get('rolodex', 'enable_expiry')) { - if ($expired) { - $addWhere('date_expires', mktime(), '<='); - } else { - $addWhere('date_expires', mktime(), '>='); - } - } - - /* make sure only unrestricted users see inactive members */ - if (!Current_User::isUnrestricted('rolodex')) { - $db->addWhere('active', 1); - } - - /* set the default sort order and title column sort */ - if (PHPWS_Settings::get('rolodex', 'sortby')) { - $sortby = 'demographics.last_name'; - // $db->joinResult('user_id', 'demographics', 'user_id', 'last_name', 'title'); - } else { - $sortby = 'demographics.business_name'; - // $db->joinResult('user_id', 'demographics', 'user_id', 'business_name', 'title'); - } - - /* deal with privacy levels */ - if (!$_SESSION['User']->id) { - $db->addWhere('rolodex_member.privacy', 0); - } elseif (!Current_User::allow('rolodex', 'view_privates')) { - $db->addWhere('rolodex_member.privacy', 1, '<='); - } - - /* the default sort order */ - $db->addOrder($sortby, 'asc', true); - - $result = $db->getObjects('Rolodex_Member'); - return $result; - } - - function navLinks() { --- 1451,1454 ---- *************** *** 1602,1605 **** --- 1481,1488 ---- } + if (Current_User::allow('rolodex', 'settings') && !$_REQUEST['aop']){ + $links[] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Settings'), "rolodex", array('aop'=>'menu', 'tab'=>'settings')); + } + return $links; } Index: RDX_Member.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** RDX_Member.php 6 Jul 2008 13:05:17 -0000 1.13 --- RDX_Member.php 7 Jul 2008 13:30:15 -0000 1.14 *************** *** 1355,1359 **** } ! $tpl['TITLE'] = $this->viewLink(); $tpl['DATE_UPDATED'] = $this->getDate_updated(true, '%a %b %e %Y'); $tpl['DESCRIPTION'] = $this->getListDescription(180); --- 1355,1359 ---- } ! $tpl['TITLE'] = $this->viewLink(true); $tpl['DATE_UPDATED'] = $this->getDate_updated(true, '%a %b %e %Y'); $tpl['DESCRIPTION'] = $this->getListDescription(180); *************** *** 1365,1397 **** $tpl['WEBSITE_LINK'] = $this->getWebsite(true, true); } ! if (PHPWS_Settings::get('rolodex', 'browse_address') == 1) { if ($this->isDataVisible('privacy_business')) { ! $tpl['ADDRESS_1'] = $this->getBusiness_address_1(true); ! $tpl['ADDRESS_2'] = $this->getBusiness_address_2(true); ! $tpl['CITY'] = $this->getBusiness_city(true); ! $tpl['STATE'] = $this->getBusiness_state(true); ! $tpl['COUNTRY'] = $this->getBusiness_country(true); ! $tpl['ZIP_CODE'] = $this->getBusiness_zip_code(true); if ($this->getBusiness_address_1() || $this->getBusiness_address_2() || $this->getBusiness_city() || $this->getBusiness_state() || $this->getBusiness_country() || $this->getBusiness_zip_code()) { ! $tpl['LABEL'] = dgettext('rolodex', 'Business address'); } ! $tpl['GOOGLE_MAP'] = $this->getGoogleMap('business'); } ! } elseif (PHPWS_Settings::get('rolodex', 'browse_address') == 2) { if ($this->isDataVisible('privacy_home')) { ! $tpl['ADDRESS_1'] = $this->getMailing_address_1(true); ! $tpl['ADDRESS_2'] = $this->getMailing_address_2(true); ! $tpl['CITY'] = $this->getMailing_city(true); ! $tpl['STATE'] = $this->getMailing_state(true); ! $tpl['COUNTRY'] = $this->getMailing_country(true); ! $tpl['ZIP_CODE'] = $this->getMailing_zip_code(true); if ($this->getMailing_address_1() || $this->getMailing_address_2() || $this->getMailing_city() || $this->getMailing_state() || $this->getMailing_country() || $this->getMailing_zip_code()) { ! $tpl['LABEL'] = dgettext('rolodex', 'Home address'); } ! $tpl['GOOGLE_MAP'] = $this->getGoogleMap('mailing'); } } ! if (PHPWS_Settings::get('rolodex', 'browse_phone')) { if ($this->isDataVisible('privacy_bus_phone')) { if ($this->getDay_phone()) { --- 1365,1398 ---- $tpl['WEBSITE_LINK'] = $this->getWebsite(true, true); } ! if (PHPWS_Settings::get('rolodex', 'list_address') == 1 || PHPWS_Settings::get('rolodex', 'list_address') == 3) { if ($this->isDataVisible('privacy_business')) { ! $tpl['B_ADDRESS_1'] = $this->getBusiness_address_1(true); ! $tpl['B_ADDRESS_2'] = $this->getBusiness_address_2(true); ! $tpl['B_CITY'] = $this->getBusiness_city(true); ! $tpl['B_STATE'] = $this->getBusiness_state(true); ! $tpl['B_COUNTRY'] = $this->getBusiness_country(true); ! $tpl['B_ZIP_CODE'] = $this->getBusiness_zip_code(true); if ($this->getBusiness_address_1() || $this->getBusiness_address_2() || $this->getBusiness_city() || $this->getBusiness_state() || $this->getBusiness_country() || $this->getBusiness_zip_code()) { ! $tpl['B_LABEL'] = dgettext('rolodex', 'Business address'); } ! $tpl['B_GOOGLE_MAP'] = $this->getGoogleMap('business'); } ! } ! if (PHPWS_Settings::get('rolodex', 'list_address') == 2 || PHPWS_Settings::get('rolodex', 'list_address') == 3) { if ($this->isDataVisible('privacy_home')) { ! $tpl['H_ADDRESS_1'] = $this->getMailing_address_1(true); ! $tpl['H_ADDRESS_2'] = $this->getMailing_address_2(true); ! $tpl['H_CITY'] = $this->getMailing_city(true); ! $tpl['H_STATE'] = $this->getMailing_state(true); ! $tpl['H_COUNTRY'] = $this->getMailing_country(true); ! $tpl['H_ZIP_CODE'] = $this->getMailing_zip_code(true); if ($this->getMailing_address_1() || $this->getMailing_address_2() || $this->getMailing_city() || $this->getMailing_state() || $this->getMailing_country() || $this->getMailing_zip_code()) { ! $tpl['H_LABEL'] = dgettext('rolodex', 'Home address'); } ! $tpl['H_GOOGLE_MAP'] = $this->getGoogleMap('mailing'); } } ! if (PHPWS_Settings::get('rolodex', 'list_phone')) { if ($this->isDataVisible('privacy_bus_phone')) { if ($this->getDay_phone()) { *************** *** 1420,1424 **** } ! if (PHPWS_Settings::get('rolodex', 'browse_categories')) { if ($this->get_categories(true)) { $tpl['CATEGORY_LINKS'] = implode(', ', $this->get_categories(true)); --- 1421,1425 ---- } ! if (PHPWS_Settings::get('rolodex', 'list_categories')) { if ($this->get_categories(true)) { $tpl['CATEGORY_LINKS'] = implode(', ', $this->get_categories(true)); *************** *** 1427,1431 **** } ! if (PHPWS_Settings::get('rolodex', 'browse_locations')) { if ($this->get_locations(true)) { $tpl['LOCATION_LINKS'] = implode(', ', $this->get_locations(true)); --- 1428,1432 ---- } ! if (PHPWS_Settings::get('rolodex', 'list_locations')) { if ($this->get_locations(true)) { $tpl['LOCATION_LINKS'] = implode(', ', $this->get_locations(true)); *************** *** 1434,1438 **** } ! if (PHPWS_Settings::get('rolodex', 'browse_features')) { if ($this->get_features(true)) { $tpl['FEATURE_LINKS'] = implode(', ', $this->get_features(true)); --- 1435,1439 ---- } ! if (PHPWS_Settings::get('rolodex', 'list_features')) { if ($this->get_features(true)) { $tpl['FEATURE_LINKS'] = implode(', ', $this->get_features(true)); *************** *** 1548,1645 **** - function viewTpl() - { - $tpl['MEMBER_TITLE'] = $this->viewLink(true); - $tpl['MEMBER_DESCRIPTION'] = $this->getListDescription(300); - $tpl['MEMBER_LINKS'] = $this->editLink(); - $tpl['THUMBNAIL'] = $this->getThumbnail(true, true); - - if (PHPWS_Settings::get('rolodex', 'list_address') == 1) { - if ($this->isDataVisible('privacy_business')) { - $tpl['ADDRESS_1'] = $this->getBusiness_address_1(true); - $tpl['ADDRESS_2'] = $this->getBusiness_address_2(true); - $tpl['CITY'] = $this->getBusiness_city(true); - $tpl['STATE'] = $this->getBusiness_state(true); - $tpl['COUNTRY'] = $this->getBusiness_country(true); - $tpl['ZIP_CODE'] = $this->getBusiness_zip_code(true); - if ($this->getBusiness_address_1() || $this->getBusiness_address_2() || $this->getBusiness_city() || $this->getBusiness_state() || $this->getBusiness_country() || $this->getBusiness_zip_code()) { - $tpl['LABEL'] = dgettext('rolodex', 'Business address'); - } - $tpl['GOOGLE_MAP'] = $this->getGoogleMap('business'); - } - } elseif (PHPWS_Settings::get('rolodex', 'list_address') == 2) { - if ($this->isDataVisible('privacy_home')) { - $tpl['ADDRESS_1'] = $this->getMailing_address_1(true); - $tpl['ADDRESS_2'] = $this->getMailing_address_2(true); - $tpl['CITY'] = $this->getMailing_city(true); - $tpl['STATE'] = $this->getMailing_state(true); - $tpl['COUNTRY'] = $this->getMailing_country(true); - $tpl['ZIP_CODE'] = $this->getMailing_zip_code(true); - if ($this->getMailing_address_1() || $this->getMailing_address_2() || $this->getMailing_city() || $this->getMailing_state() || $this->getMailing_country() || $this->getMailing_zip_code()) { - $tpl['LABEL'] = dgettext('rolodex', 'Home address'); - } - $tpl['GOOGLE_MAP'] = $this->getGoogleMap('mailing'); - } - } - - if (PHPWS_Settings::get('rolodex', 'list_phone')) { - if ($this->isDataVisible('privacy_bus_phone')) { - if ($this->getDay_phone()) { - $tpl['LIST_DAY_PHONE_LABEL'] = dgettext('rolodex', 'Business phone'); - $tpl['LIST_DAY_PHONE'] = $this->getDay_phone(true); - } - if ($this->getDay_phone_ext()) { - $tpl['LIST_DAY_PHONE_EXT'] = $this->getDay_phone_ext(true); - $tpl['LIST_DAY_PHONE_EXT_LABEL'] = dgettext('rolodex', 'Ext'); - } - if ($this->getFax_number()) { - $tpl['LIST_FAX_NUMBER'] = $this->getFax_number(true); - $tpl['LIST_FAX_NUMBER_LABEL'] = dgettext('rolodex', 'Fax'); - } - if ($this->getTollfree_phone()) { - $tpl['LIST_TOLLFREE_PHONE'] = $this->getTollfree_phone(true); - $tpl['LIST_TOLLFREE_PHONE_LABEL'] = dgettext('rolodex', 'Tollfree'); - } - } - if ($this->isDataVisible('privacy_home_phone')) { - if ($this->getEvening_phone()) { - $tpl['LIST_EVENING_PHONE_LABEL'] = dgettext('rolodex', 'Home phone'); - $tpl['LIST_EVENING_PHONE'] = $this->getEvening_phone(true); - } - } - } - - if (PHPWS_Settings::get('rolodex', 'list_categories')) { - if ($this->get_categories(true)) { - $tpl['CATEGORY_LINKS'] = implode(', ', $this->get_categories(true)); - $tpl['CATEGORY_LINKS_LABEL'] = dgettext('rolodex', 'Category(s)'); - } - } - - if (PHPWS_Settings::get('rolodex', 'list_locations')) { - if ($this->get_locations(true)) { - $tpl['LOCATION_LINKS'] = implode(', ', $this->get_locations(true)); - $tpl['LOCATION_LINKS_LABEL'] = dgettext('rolodex', 'Location(s)'); - } - } - - if (PHPWS_Settings::get('rolodex', 'list_features')) { - if ($this->get_features(true)) { - $tpl['FEATURE_LINKS'] = implode(', ', $this->get_features(true)); - $tpl['FEATURE_LINKS_LABEL'] = dgettext('rolodex', 'Feature(s)'); - } - } - - if ($this->isDataVisible('privacy_contact')) { - $tpl['CONTACT_EMAIL_LINK'] = $this->getDisplay_email(true, true); - } - if ($this->isDataVisible('privacy_web')) { - $tpl['WEBSITE_LINK'] = $this->getWebsite(true, true); - } - - return $tpl; - } - - function getGoogleMap($location='mailing') { --- 1549,1552 ---- |
|
From: Verdon V. <ve...@us...> - 2008-07-07 13:30:37
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15927/boost Modified Files: update.php Log Message: 1.0 cleanup Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** update.php 6 Jul 2008 13:05:14 -0000 1.8 --- update.php 7 Jul 2008 13:30:04 -0000 1.9 *************** *** 45,52 **** 'templates/list_category.tpl', 'templates/list_member.tpl', - 'templates/view_location.tpl', - 'templates/view_feature.tpl', 'templates/view_member.tpl', - 'templates/view_category.tpl', 'templates/adv_search_form.tpl', 'templates/alpha_click.tpl', --- 45,49 ---- *************** *** 92,99 **** $files = array('templates/adv_search_form.tpl', 'templates/list_member.tpl', - 'templates/view_location.tpl', - 'templates/view_feature.tpl', 'templates/view_member.tpl', - 'templates/view_category.tpl', 'templates/message_member.tpl', 'templates/edit_settings.tpl' --- 89,93 ---- *************** *** 122,128 **** 'templates/adv_search_form.tpl', 'templates/list_member.tpl', - 'templates/view_category.tpl', - 'templates/view_feature.tpl', - 'templates/view_location.tpl', 'templates/view_member.tpl', 'img/view.gif', --- 116,119 ---- |
|
From: Verdon V. <ve...@us...> - 2008-07-07 13:30:13
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15927/templates Modified Files: edit_settings.tpl list_member.tpl Removed Files: view_category.tpl view_feature.tpl view_location.tpl Log Message: 1.0 cleanup Index: list_member.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/list_member.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** list_member.tpl 6 Jul 2008 13:05:21 -0000 1.5 --- list_member.tpl 7 Jul 2008 13:30:19 -0000 1.6 *************** *** 42,50 **** {DESCRIPTION} <p> ! <!-- BEGIN address_1 -->{ADDRESS_1}<!-- END address_1 --> ! <!-- BEGIN address_2 --><br />{ADDRESS_2}<!-- END address_2 --> ! <!-- BEGIN city --><br />{CITY},<!-- END city --> <!-- BEGIN state -->{STATE}<!-- END state --> ! <!-- BEGIN country --><br />{COUNTRY}<!-- END country --> <!-- BEGIN zip_code -->{ZIP_CODE}<!-- END zip_code --> ! <!-- BEGIN google_map --><br />{GOOGLE_MAP}<!-- END google_map --> <!-- BEGIN list_day_phone --><br />{LIST_DAY_PHONE_LABEL}: {LIST_DAY_PHONE}<!-- END list_day_phone --> <!-- BEGIN list_day_phone_ext -->{LIST_DAY_PHONE_EXT_LABEL}: {LIST_DAY_PHONE_EXT}<!-- END list_day_phone_ext --> <!-- BEGIN list_fax_number --><br />{LIST_FAX_NUMBER_LABEL}: {LIST_FAX_NUMBER}<!-- END list_fax_number --> --- 42,57 ---- {DESCRIPTION} <p> ! <!-- BEGIN b_label --><br /><strong>{B_LABEL}</strong><!-- END b_label --> ! <!-- BEGIN b_address_1 --><br />{B_ADDRESS_1}<!-- END b_address_1 --> ! <!-- BEGIN b_address_2 --><br />{B_ADDRESS_2}<!-- END b_address_2 --> ! <!-- BEGIN b_city --><br />{B_CITY},<!-- END b_city --> <!-- BEGIN b_state -->{B_STATE}<!-- END b_state --> ! <!-- BEGIN b_country --><br />{B_COUNTRY}<!-- END b_country --> <!-- BEGIN b_zip_code -->{B_ZIP_CODE}<!-- END b_zip_code --> ! <!-- BEGIN b_google_map --><br />{B_GOOGLE_MAP}<br /><!-- END b_google_map --> ! <!-- BEGIN h_label --><br /><strong>{H_LABEL}</strong><!-- END h_label --> ! <!-- BEGIN h_address_1 --><br />{H_ADDRESS_1}<!-- END h_address_1 --> ! <!-- BEGIN h_address_2 --><br />{H_ADDRESS_2}<!-- END h_address_2 --> ! <!-- BEGIN h_city --><br />{H_CITY},<!-- END h_city --> <!-- BEGIN h_state -->{H_STATE}<!-- END h_state --> ! <!-- BEGIN h_country --><br />{H_COUNTRY}<!-- END h_country --> <!-- BEGIN h_zip_code -->{H_ZIP_CODE}<!-- END h_zip_code --> ! <!-- BEGIN h_google_map --><br />{H_GOOGLE_MAP}<br /><!-- END h_google_map --> <!-- BEGIN list_day_phone --><br />{LIST_DAY_PHONE_LABEL}: {LIST_DAY_PHONE}<!-- END list_day_phone --> <!-- BEGIN list_day_phone_ext -->{LIST_DAY_PHONE_EXT_LABEL}: {LIST_DAY_PHONE_EXT}<!-- END list_day_phone_ext --> <!-- BEGIN list_fax_number --><br />{LIST_FAX_NUMBER_LABEL}: {LIST_FAX_NUMBER}<!-- END list_fax_number --> --- view_location.tpl DELETED --- --- view_category.tpl DELETED --- --- view_feature.tpl DELETED --- Index: edit_settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_settings.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** edit_settings.tpl 6 Jul 2008 13:05:21 -0000 1.6 --- edit_settings.tpl 7 Jul 2008 13:30:19 -0000 1.7 *************** *** 35,44 **** <legend><strong>{LIST_GROUP_LABEL}</strong></legend> <div class="smaller">{LIST_SETTINGS_TIP}</div> ! <p>{LIST_ADDRESS_TITLE} - {LIST_ADDRESS_1}{LIST_ADDRESS_1_LABEL} {LIST_ADDRESS_2}{LIST_ADDRESS_2_LABEL} {LIST_ADDRESS_3}{LIST_ADDRESS_3_LABEL}</p> ! <p>{BROWSE_ADDRESS_TITLE} - {BROWSE_ADDRESS_1}{BROWSE_ADDRESS_1_LABEL} {BROWSE_ADDRESS_2}{BROWSE_ADDRESS_2_LABEL} {BROWSE_ADDRESS_3}{BROWSE_ADDRESS_3_LABEL}</p> ! <p>{LIST_PHONE_TITLE} - {LIST_PHONE}{LIST_PHONE_LABEL} {BROWSE_PHONE}{BROWSE_PHONE_LABEL}</p> ! <p>{LIST_CATEGORIES_TITLE} - {LIST_CATEGORIES}{LIST_CATEGORIES_LABEL} {BROWSE_CATEGORIES}{BROWSE_CATEGORIES_LABEL}</p> ! <p>{LIST_LOCATIONS_TITLE} - {LIST_LOCATIONS}{LIST_LOCATIONS_LABEL} {BROWSE_LOCATIONS}{BROWSE_LOCATIONS_LABEL}</p> ! <p>{LIST_FEATURES_TITLE} - {LIST_FEATURES}{LIST_FEATURES_LABEL} {BROWSE_FEATURES}{BROWSE_FEATURES_LABEL}</p> </fieldset> <fieldset> --- 35,43 ---- <legend><strong>{LIST_GROUP_LABEL}</strong></legend> <div class="smaller">{LIST_SETTINGS_TIP}</div> ! <p>{LIST_ADDRESS_TITLE} - {LIST_ADDRESS_1}{LIST_ADDRESS_1_LABEL} {LIST_ADDRESS_2}{LIST_ADDRESS_2_LABEL} {LIST_ADDRESS_3}{LIST_ADDRESS_3_LABEL} {LIST_ADDRESS_4}{LIST_ADDRESS_4_LABEL}</p> ! <p>{LIST_PHONE} {LIST_PHONE_LABEL}</p> ! <p>{LIST_CATEGORIES} {LIST_CATEGORIES_LABEL}</p> ! <p>{LIST_LOCATIONS} {LIST_LOCATIONS_LABEL}</p> ! <p>{LIST_FEATURES} {LIST_FEATURES_LABEL}</p> </fieldset> <fieldset> |
|
From: Verdon V. <ve...@us...> - 2008-07-07 13:30:13
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15927/inc Modified Files: settings.php Log Message: 1.0 cleanup Index: settings.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/inc/settings.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** settings.php 6 Jul 2008 13:05:20 -0000 1.6 --- settings.php 7 Jul 2008 13:30:18 -0000 1.7 *************** *** 47,59 **** $settings['use_captcha'] = 1; $settings['list_address'] = 1; ! $settings['browse_address'] = 0; ! $settings['list_phone'] = 1; ! $settings['browse_phone'] = 0; ! $settings['list_categories'] = 1; ! $settings['browse_categories'] = 0; ! $settings['list_locations'] = 1; ! $settings['browse_locations'] = 0; ! $settings['list_features'] = 1; ! $settings['browse_features'] = 0; $settings['max_img_width'] = 200; $settings['max_img_height'] = 300; --- 47,54 ---- $settings['use_captcha'] = 1; $settings['list_address'] = 1; ! $settings['list_phone'] = 0; ! $settings['list_categories'] = 0; ! $settings['list_locations'] = 0; ! $settings['list_features'] = 0; $settings['max_img_width'] = 200; $settings['max_img_height'] = 300; |
|
From: Verdon V. <ve...@us...> - 2008-07-06 13:09:30
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv382/templates Modified Files: adv_search_form.tpl edit_member.tpl edit_settings.tpl list_member.tpl view_category.tpl view_feature.tpl view_location.tpl view_member.tpl Log Message: closing in on 1.0 Index: adv_search_form.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/adv_search_form.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** adv_search_form.tpl 24 Jun 2008 11:23:33 -0000 1.3 --- adv_search_form.tpl 6 Jul 2008 13:05:21 -0000 1.4 *************** *** 3,7 **** <fieldset> <legend><strong>{CRITERIA_LABEL}</strong></legend> ! <p>{TIP}</p> <p>{LOCATION_LABEL}<br />{LOCATION_SELECT}</p> <p>{FEATURE_LABEL}<br />{FEATURE_SELECT}</p> --- 3,8 ---- <fieldset> <legend><strong>{CRITERIA_LABEL}</strong></legend> ! <p>{TIP_SELECT}</p> ! <p class="smaller">{TIP_MULTI}</p> <p>{LOCATION_LABEL}<br />{LOCATION_SELECT}</p> <p>{FEATURE_LABEL}<br />{FEATURE_SELECT}</p> Index: view_location.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/view_location.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** view_location.tpl 24 Jun 2008 11:23:33 -0000 1.2 --- view_location.tpl 6 Jul 2008 13:05:21 -0000 1.3 *************** *** 19,22 **** --- 19,23 ---- <!-- BEGIN list_fax_number --><br />{LIST_FAX_NUMBER_LABEL}: {LIST_FAX_NUMBER}<!-- END list_fax_number --> <!-- BEGIN list_tollfree_phone --><br />{LIST_TOLLFREE_PHONE_LABEL}: {LIST_TOLLFREE_PHONE}<!-- END list_tollfree_phone --> + <!-- BEGIN list_evening_phone --><br />{LIST_EVENING_PHONE_LABEL}: {LIST_EVENING_PHONE}<!-- END list_evening_phone --> </p> <!-- BEGIN category_links --><div>{CATEGORY_LINKS_LABEL}: {CATEGORY_LINKS}</div><!-- END category_links --> Index: edit_member.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_member.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** edit_member.tpl 3 Jul 2008 14:10:08 -0000 1.6 --- edit_member.tpl 6 Jul 2008 13:05:21 -0000 1.7 *************** *** 29,33 **** <p>{CONTACT_EMAIL} {CONTACT_EMAIL_LABEL}</p> <p>{WEBSITE} {WEBSITE_LABEL}</p> ! <p>{DAY_PHONE} {DAY_PHONE_LABEL} {DAY_PHONE_EXT} {DAY_PHONE_EXT_LABEL} {TOLLFREE_PHONE} {TOLLFREE_PHONE_LABEL} {FAX_NUMBER} {FAX_NUMBER_LABEL}</p> </fieldset> <fieldset> --- 29,37 ---- <p>{CONTACT_EMAIL} {CONTACT_EMAIL_LABEL}</p> <p>{WEBSITE} {WEBSITE_LABEL}</p> ! <p>{DAY_PHONE} {DAY_PHONE_LABEL} {DAY_PHONE_EXT} {DAY_PHONE_EXT_LABEL} <br /> ! {TOLLFREE_PHONE} {TOLLFREE_PHONE_LABEL} <br /> ! {FAX_NUMBER} {FAX_NUMBER_LABEL}<br /> ! {EVENING_PHONE} {EVENING_PHONE_LABEL} ! </p> </fieldset> <fieldset> Index: list_member.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/list_member.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** list_member.tpl 25 Jun 2008 02:48:46 -0000 1.4 --- list_member.tpl 6 Jul 2008 13:05:21 -0000 1.5 *************** *** 1,3 **** --- 1,7 ---- {ALPHA_CLICK} + <!-- BEGIN item_title --><!--<h2>{ITEM_TITLE}</h2>--><!-- END item_title --> + <!-- BEGIN item_image --><div style="float: right; margin: 0.5em 0 0.5em 0.5em;">{ITEM_IMAGE}</div><!-- END item_image --> + <!-- BEGIN item_description --><p>{ITEM_DESCRIPTION}</p><!-- END item_description --> + <!-- BEGIN item_clear_float -->{ITEM_CLEAR_FLOAT}<!-- END item_clear_float --> <table width="99%" cellpadding="4"> <tr> *************** *** 46,49 **** --- 50,54 ---- <!-- BEGIN list_fax_number --><br />{LIST_FAX_NUMBER_LABEL}: {LIST_FAX_NUMBER}<!-- END list_fax_number --> <!-- BEGIN list_tollfree_phone --><br />{LIST_TOLLFREE_PHONE_LABEL}: {LIST_TOLLFREE_PHONE}<!-- END list_tollfree_phone --> + <!-- BEGIN list_evening_phone --><br />{LIST_EVENING_PHONE_LABEL}: {LIST_EVENING_PHONE}<!-- END list_evening_phone --> </p> <!-- BEGIN category_links --><div>{CATEGORY_LINKS_LABEL}: {CATEGORY_LINKS}</div><!-- END category_links --> Index: view_member.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/view_member.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** view_member.tpl 24 Jun 2008 11:23:33 -0000 1.5 --- view_member.tpl 6 Jul 2008 13:05:21 -0000 1.6 *************** *** 20,23 **** --- 20,24 ---- <!-- BEGIN fax_number --><br />{FAX_NUMBER_LABEL}: {FAX_NUMBER}<!-- END fax_number --> <!-- BEGIN tollfree_phone --><br />{TOLLFREE_PHONE_LABEL}: {TOLLFREE_PHONE}<!-- END tollfree_phone --> + <!-- BEGIN evening_phone --><br />{EVENING_PHONE_LABEL}: {EVENING_PHONE}<!-- END evening_phone --> </p> <legend><strong>{HOME_LABEL}</strong></legend> Index: view_category.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/view_category.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** view_category.tpl 24 Jun 2008 11:23:33 -0000 1.2 --- view_category.tpl 6 Jul 2008 13:05:21 -0000 1.3 *************** *** 19,22 **** --- 19,23 ---- <!-- BEGIN list_fax_number --><br />{LIST_FAX_NUMBER_LABEL}: {LIST_FAX_NUMBER}<!-- END list_fax_number --> <!-- BEGIN list_tollfree_phone --><br />{LIST_TOLLFREE_PHONE_LABEL}: {LIST_TOLLFREE_PHONE}<!-- END list_tollfree_phone --> + <!-- BEGIN list_evening_phone --><br />{LIST_EVENING_PHONE_LABEL}: {LIST_EVENING_PHONE}<!-- END list_evening_phone --> </p> <!-- BEGIN category_links --><div>{CATEGORY_LINKS_LABEL}: {CATEGORY_LINKS}</div><!-- END category_links --> Index: view_feature.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/view_feature.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** view_feature.tpl 24 Jun 2008 11:23:33 -0000 1.2 --- view_feature.tpl 6 Jul 2008 13:05:21 -0000 1.3 *************** *** 19,22 **** --- 19,23 ---- <!-- BEGIN list_fax_number --><br />{LIST_FAX_NUMBER_LABEL}: {LIST_FAX_NUMBER}<!-- END list_fax_number --> <!-- BEGIN list_tollfree_phone --><br />{LIST_TOLLFREE_PHONE_LABEL}: {LIST_TOLLFREE_PHONE}<!-- END list_tollfree_phone --> + <!-- BEGIN list_evening_phone --><br />{LIST_EVENING_PHONE_LABEL}: {LIST_EVENING_PHONE}<!-- END list_evening_phone --> </p> <!-- BEGIN category_links --><div>{CATEGORY_LINKS_LABEL}: {CATEGORY_LINKS}</div><!-- END category_links --> Index: edit_settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_settings.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** edit_settings.tpl 24 Jun 2008 11:23:33 -0000 1.5 --- edit_settings.tpl 6 Jul 2008 13:05:21 -0000 1.6 *************** *** 7,10 **** --- 7,11 ---- <p>{REQ_APPROVAL} {REQ_APPROVAL_LABEL}</p> <p>{SEND_NOTIFICATION} {SEND_NOTIFICATION_LABEL}</p> + <p>{NOTIFY_ALL_SAVES} {NOTIFY_ALL_SAVES_LABEL}</p> <p>{ADMIN_CONTACT} {ADMIN_CONTACT_LABEL}</p> <p>{SHOW_BLOCK} {SHOW_BLOCK_LABEL} - {BLOCK_ORDER_BY_RAND_1}{BLOCK_ORDER_BY_RAND_1_LABEL} {BLOCK_ORDER_BY_RAND_2}{BLOCK_ORDER_BY_RAND_2_LABEL} - {BLOCK_ON_HOME_ONLY} {BLOCK_ON_HOME_ONLY_LABEL}</p> *************** *** 24,28 **** <p>{CONTACT_TYPE_TITLE} - {CONTACT_TYPE_1}{CONTACT_TYPE_1_LABEL} {CONTACT_TYPE_2}{CONTACT_TYPE_2_LABEL}</p> <p>{PRIVACY_WEB_TITLE} - {PRIVACY_WEB_1}{PRIVACY_WEB_1_LABEL} {PRIVACY_WEB_2}{PRIVACY_WEB_2_LABEL} {PRIVACY_WEB_3}{PRIVACY_WEB_3_LABEL}</p> ! <p>{PRIVACY_PHONE_TITLE} - {PRIVACY_PHONE_1}{PRIVACY_PHONE_1_LABEL} {PRIVACY_PHONE_2}{PRIVACY_PHONE_2_LABEL} {PRIVACY_PHONE_3}{PRIVACY_PHONE_3_LABEL}</p> <p>{PRIVACY_HOME_TITLE} - {PRIVACY_HOME_1}{PRIVACY_HOME_1_LABEL} {PRIVACY_HOME_2}{PRIVACY_HOME_2_LABEL} {PRIVACY_HOME_3}{PRIVACY_HOME_3_LABEL}</p> <p>{PRIVACY_BUSINESS_TITLE} - {PRIVACY_BUSINESS_1}{PRIVACY_BUSINESS_1_LABEL} {PRIVACY_BUSINESS_2}{PRIVACY_BUSINESS_2_LABEL} {PRIVACY_BUSINESS_3}{PRIVACY_BUSINESS_3_LABEL}</p> --- 25,30 ---- <p>{CONTACT_TYPE_TITLE} - {CONTACT_TYPE_1}{CONTACT_TYPE_1_LABEL} {CONTACT_TYPE_2}{CONTACT_TYPE_2_LABEL}</p> <p>{PRIVACY_WEB_TITLE} - {PRIVACY_WEB_1}{PRIVACY_WEB_1_LABEL} {PRIVACY_WEB_2}{PRIVACY_WEB_2_LABEL} {PRIVACY_WEB_3}{PRIVACY_WEB_3_LABEL}</p> ! <p>{PRIVACY_HOME_PHONE_TITLE} - {PRIVACY_HOME_PHONE_1}{PRIVACY_HOME_PHONE_1_LABEL} {PRIVACY_HOME_PHONE_2}{PRIVACY_HOME_PHONE_2_LABEL} {PRIVACY_HOME_PHONE_3}{PRIVACY_HOME_PHONE_3_LABEL}</p> ! <p>{PRIVACY_BUS_PHONE_TITLE} - {PRIVACY_BUS_PHONE_1}{PRIVACY_BUS_PHONE_1_LABEL} {PRIVACY_BUS_PHONE_2}{PRIVACY_BUS_PHONE_2_LABEL} {PRIVACY_BUS_PHONE_3}{PRIVACY_BUS_PHONE_3_LABEL}</p> <p>{PRIVACY_HOME_TITLE} - {PRIVACY_HOME_1}{PRIVACY_HOME_1_LABEL} {PRIVACY_HOME_2}{PRIVACY_HOME_2_LABEL} {PRIVACY_HOME_3}{PRIVACY_HOME_3_LABEL}</p> <p>{PRIVACY_BUSINESS_TITLE} - {PRIVACY_BUSINESS_1}{PRIVACY_BUSINESS_1_LABEL} {PRIVACY_BUSINESS_2}{PRIVACY_BUSINESS_2_LABEL} {PRIVACY_BUSINESS_3}{PRIVACY_BUSINESS_3_LABEL}</p> |
|
From: Verdon V. <ve...@us...> - 2008-07-06 13:09:30
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv382/class Modified Files: RDX_Forms.php RDX_Member.php RDX_Runtime.php Rolodex.php Log Message: closing in on 1.0 Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** RDX_Forms.php 3 Jul 2008 14:10:04 -0000 1.15 --- RDX_Forms.php 6 Jul 2008 13:05:17 -0000 1.16 *************** *** 136,140 **** ! function listMembers($approved=null, $expired=false) { //print_r($_REQUEST); exit; --- 136,140 ---- ! function listMembers($approved=null, $expired=false, $location=null, $feature=null, $category=null) { //print_r($_REQUEST); exit; *************** *** 262,265 **** --- 262,279 ---- } + /* if it's a list by location */ + if ($location) { + $_REQUEST['locations'] = $location; + PHPWS_Core::initModClass('rolodex', 'RDX_Location.php'); + $item = new Rolodex_Location($location); + Layout::addPageTitle($item->getTitle()); + $ptags['ITEM_TITLE'] = $item->getTitle(true); + $ptags['ITEM_DESCRIPTION'] = PHPWS_Text::parseTag($item->getDescription(true)); + $ptags['ITEM_IMAGE'] = $item->getFile(); + if ($item->getFile()) { + $ptags['ITEM_IMAGE'] = $item->getFile(); + $ptags['ITEM_CLEAR_FLOAT'] = '<br style="clear: right;" />'; + } + } /* search by location */ if (isset($_REQUEST['locations'])) { *************** *** 270,273 **** --- 284,301 ---- } + /* if it's a list by feature */ + if ($feature) { + $_REQUEST['features'] = $feature; + PHPWS_Core::initModClass('rolodex', 'RDX_Feature.php'); + $item = new Rolodex_Feature($feature); + Layout::addPageTitle($item->getTitle()); + $ptags['ITEM_TITLE'] = $item->getTitle(true); + $ptags['ITEM_DESCRIPTION'] = PHPWS_Text::parseTag($item->getDescription(true)); + $ptags['ITEM_IMAGE'] = $item->getFile(); + if ($item->getFile()) { + $ptags['ITEM_IMAGE'] = $item->getFile(); + $ptags['ITEM_CLEAR_FLOAT'] = '<br style="clear: right;" />'; + } + } /* search by feature */ if (isset($_REQUEST['features'])) { *************** *** 278,281 **** --- 306,323 ---- } + /* if it's a list by category */ + if ($category) { + $_REQUEST['categories'] = $category; + PHPWS_Core::initModClass('categories', 'Category.php'); + $item = new Category($category); + Layout::addPageTitle($item->getTitle()); + $ptags['ITEM_TITLE'] = $item->getTitle(); + $ptags['ITEM_DESCRIPTION'] = PHPWS_Text::parseTag($item->getDescription()); + $ptags['ITEM_IMAGE'] = $item->getIcon(); + if ($item->getIcon()) { + $ptags['ITEM_IMAGE'] = $item->getIcon(); + $ptags['ITEM_CLEAR_FLOAT'] = '<br style="clear: right;" />'; + } + } /* search by category */ if (isset($_REQUEST['categories'])) { *************** *** 323,327 **** /* get the final content */ $this->rolodex->content = $pager->get(); ! // $this->rolodex->content .= Categories::getCategoryList('rolodex'); --- 365,370 ---- /* get the final content */ $this->rolodex->content = $pager->get(); ! ! /* don't remember what I was testing/doing with the next line doh! */ // $this->rolodex->content .= Categories::getCategoryList('rolodex'); *************** *** 333,336 **** --- 376,382 ---- } else { $this->rolodex->title = sprintf(dgettext('rolodex', '%s Members'), PHPWS_Settings::get('rolodex', 'module_title')); + if (isset($ptags['ITEM_TITLE'])) { + $this->rolodex->title .= sprintf(dgettext('rolodex', ' - %s'), $ptags['ITEM_TITLE']); + } } } *************** *** 480,484 **** $tpl['CRITERIA_LABEL'] = dgettext('rolodex', 'Criteria'); $tpl['SEARCH_LABEL'] = dgettext('rolodex', 'Search'); ! $tpl['TIP'] = dgettext('rolodex', 'Select one or more of the available options below to filter a list of members. It is possible to get too specific. If your search returns an empty list, try selecting fewer criteria.'); $this->rolodex->title = sprintf(dgettext('rolodex', '%s Advanced Search'), PHPWS_Settings::get('rolodex', 'module_title')); --- 526,531 ---- $tpl['CRITERIA_LABEL'] = dgettext('rolodex', 'Criteria'); $tpl['SEARCH_LABEL'] = dgettext('rolodex', 'Search'); ! $tpl['TIP_SELECT'] = dgettext('rolodex', 'Select one or more of the available options below to filter a list of members. It is possible to get too specific. If your search returns an empty list, try selecting fewer criteria.'); ! $tpl['TIP_MULTI'] = dgettext('rolodex', 'To select more than one itme from any given list, click on the first item then hold your control key and click on the next. Use shift-click to select a range of items. Mac users, use command-click and shift-click.'); $this->rolodex->title = sprintf(dgettext('rolodex', '%s Advanced Search'), PHPWS_Settings::get('rolodex', 'module_title')); *************** *** 515,518 **** --- 562,569 ---- $form->setLabel('send_notification', dgettext('rolodex', 'Send notification of pending applications')); + $form->addCheckbox('notify_all_saves', 1); + $form->setMatch('notify_all_saves', PHPWS_Settings::get('rolodex', 'notify_all_saves')); + $form->setLabel('notify_all_saves', dgettext('rolodex', 'Send notification upon all member edits (not those done by an admin)')); + $form->addText('admin_contact', PHPWS_Settings::get('rolodex', 'admin_contact')); $form->setSize('admin_contact', 30); *************** *** 547,553 **** $form->setMatch('privacy_web', PHPWS_Settings::get('rolodex', 'privacy_web')); ! $form->addRadio('privacy_phone', array(0, 1, 2)); ! $form->setLabel('privacy_phone', array(dgettext('rolodex', 'Public'), dgettext('rolodex', 'Members only'), dgettext('rolodex', 'Restricted users'))); ! $form->setMatch('privacy_phone', PHPWS_Settings::get('rolodex', 'privacy_phone')); $form->addRadio('privacy_home', array(0, 1, 2)); --- 598,608 ---- $form->setMatch('privacy_web', PHPWS_Settings::get('rolodex', 'privacy_web')); ! $form->addRadio('privacy_home_phone', array(0, 1, 2)); ! $form->setLabel('privacy_home_phone', array(dgettext('rolodex', 'Public'), dgettext('rolodex', 'Members only'), dgettext('rolodex', 'Restricted users'))); ! $form->setMatch('privacy_home_phone', PHPWS_Settings::get('rolodex', 'privacy_home_phone')); ! ! $form->addRadio('privacy_bus_phone', array(0, 1, 2)); ! $form->setLabel('privacy_bus_phone', array(dgettext('rolodex', 'Public'), dgettext('rolodex', 'Members only'), dgettext('rolodex', 'Restricted users'))); ! $form->setMatch('privacy_bus_phone', PHPWS_Settings::get('rolodex', 'privacy_bus_phone')); $form->addRadio('privacy_home', array(0, 1, 2)); *************** *** 721,725 **** $tpl['PRIVACY_CONTACT_TITLE'] = dgettext('rolodex', 'Contact link'); $tpl['PRIVACY_WEB_TITLE'] = dgettext('rolodex', 'Website link'); ! $tpl['PRIVACY_PHONE_TITLE'] = dgettext('rolodex', 'Phone numbers'); $tpl['PRIVACY_HOME_TITLE'] = dgettext('rolodex', 'Home address'); $tpl['PRIVACY_BUSINESS_TITLE'] = dgettext('rolodex', 'Business address'); --- 776,781 ---- $tpl['PRIVACY_CONTACT_TITLE'] = dgettext('rolodex', 'Contact link'); $tpl['PRIVACY_WEB_TITLE'] = dgettext('rolodex', 'Website link'); ! $tpl['PRIVACY_HOME_PHONE_TITLE'] = dgettext('rolodex', 'Home phone numbers'); ! $tpl['PRIVACY_BUS_PHONE_TITLE'] = dgettext('rolodex', 'Business phone numbers'); $tpl['PRIVACY_HOME_TITLE'] = dgettext('rolodex', 'Home address'); $tpl['PRIVACY_BUSINESS_TITLE'] = dgettext('rolodex', 'Business address'); *************** *** 867,883 **** $form->addText('day_phone', $member->day_phone); ! $form->setSize('day_phone', 10); ! $form->setLabel('day_phone', dgettext('rolodex', 'Day phone')); $form->addText('day_phone_ext', $member->day_phone_ext); ! $form->setSize('day_phone_ext', 6); $form->setLabel('day_phone_ext', dgettext('rolodex', 'Extension')); $form->addText('fax_number', $member->fax_number); ! $form->setSize('fax_number', 10); $form->setLabel('fax_number', dgettext('rolodex', 'Fax')); $form->addText('tollfree_phone', $member->tollfree_phone); ! $form->setSize('tollfree_phone', 10); $form->setLabel('tollfree_phone', dgettext('rolodex', 'Toll-free phone')); --- 923,943 ---- $form->addText('day_phone', $member->day_phone); ! $form->setSize('day_phone', 15); ! $form->setLabel('day_phone', dgettext('rolodex', 'Business phone')); $form->addText('day_phone_ext', $member->day_phone_ext); ! $form->setSize('day_phone_ext', 4); $form->setLabel('day_phone_ext', dgettext('rolodex', 'Extension')); + $form->addText('evening_phone', $member->evening_phone); + $form->setSize('evening_phone', 15); + $form->setLabel('evening_phone', dgettext('rolodex', 'Home phone')); + $form->addText('fax_number', $member->fax_number); ! $form->setSize('fax_number', 15); $form->setLabel('fax_number', dgettext('rolodex', 'Fax')); $form->addText('tollfree_phone', $member->tollfree_phone); ! $form->setSize('tollfree_phone', 15); $form->setLabel('tollfree_phone', dgettext('rolodex', 'Toll-free phone')); Index: RDX_Runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Runtime.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RDX_Runtime.php 3 Jul 2008 14:10:04 -0000 1.2 --- RDX_Runtime.php 6 Jul 2008 13:05:17 -0000 1.3 *************** *** 60,64 **** $tpl['TITLE'] = PHPWS_Settings::get('rolodex', 'module_title'); if (PHPWS_Settings::get('rolodex', 'block_order_by_rand')) { ! $tpl['MEMBER_LABEL'] = dgettext('rolodex', 'Random Member'); } else { $tpl['MEMBER_LABEL'] = dgettext('rolodex', 'Most Recent Member'); --- 60,64 ---- $tpl['TITLE'] = PHPWS_Settings::get('rolodex', 'module_title'); if (PHPWS_Settings::get('rolodex', 'block_order_by_rand')) { ! $tpl['MEMBER_LABEL'] = dgettext('rolodex', 'Featured Member'); } else { $tpl['MEMBER_LABEL'] = dgettext('rolodex', 'Most Recent Member'); Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Rolodex.php 3 Jul 2008 14:10:04 -0000 1.13 --- Rolodex.php 6 Jul 2008 13:05:17 -0000 1.14 *************** *** 477,480 **** --- 477,481 ---- break; + /* old views case 'view_location': $this->loadLocation(); *************** *** 494,497 **** --- 495,558 ---- $this->content = $this->categoryView(); break; + */ + + case 'view_location': + if (!PHPWS_Settings::get('rolodex', 'allow_anon') && !Current_User::getId()) { + $this->title = PHPWS_Settings::get('rolodex', 'module_title'); + $this->content = dgettext('rolodex', 'Sorry, anonymous member viewing is not allowed. You will need to login to view this directory.'); + } else { + if (isset($_REQUEST['location_id'])) { + $id = $_REQUEST['location_id']; + } elseif (isset($_REQUEST['location'])) { + $id = $_REQUEST['location']; + } elseif (isset($_REQUEST['id'])) { + $id = $_REQUEST['id']; + } + PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php'); + $this->forms = new Rolodex_Forms; + $this->forms->rolodex = & $this; + $this->forms->listMembers(1, false, $id, null, null); + } + break; + + case 'view_feature': + if (!PHPWS_Settings::get('rolodex', 'allow_anon') && !Current_User::getId()) { + $this->title = PHPWS_Settings::get('rolodex', 'module_title'); + $this->content = dgettext('rolodex', 'Sorry, anonymous member viewing is not allowed. You will need to login to view this directory.'); + } else { + if (isset($_REQUEST['feature_id'])) { + $id = $_REQUEST['feature_id']; + } elseif (isset($_REQUEST['feature'])) { + $id = $_REQUEST['feature']; + } elseif (isset($_REQUEST['id'])) { + $id = $_REQUEST['id']; + } + PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php'); + $this->forms = new Rolodex_Forms; + $this->forms->rolodex = & $this; + $this->forms->listMembers(1, false, null, $id, null); + } + break; + + case 'view_category': + if (!PHPWS_Settings::get('rolodex', 'allow_anon') && !Current_User::getId()) { + $this->title = PHPWS_Settings::get('rolodex', 'module_title'); + $this->content = dgettext('rolodex', 'Sorry, anonymous member viewing is not allowed. You will need to login to view this directory.'); + } else { + if (isset($_REQUEST['category_id'])) { + $id = $_REQUEST['category_id']; + } elseif (isset($_REQUEST['category'])) { + $id = $_REQUEST['category']; + } elseif (isset($_REQUEST['id'])) { + $id = $_REQUEST['id']; + } + PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php'); + $this->forms = new Rolodex_Forms; + $this->forms->rolodex = & $this; + $this->forms->listMembers(1, false, null, null, $id); + } + break; + + // function listMembers($approved=null, $expired=false, $location=null, $feature=null, $category=null) *************** *** 656,659 **** --- 717,724 ---- PHPWS_Settings::set('rolodex', 'send_notification', 0); + isset($_POST['notify_all_saves']) ? + PHPWS_Settings::set('rolodex', 'notify_all_saves', 1) : + PHPWS_Settings::set('rolodex', 'notify_all_saves', 0); + if (isset($_POST['admin_contact']) && ($_POST['admin_contact']) !== '') { if (PHPWS_Text::isValidInput($_POST['admin_contact'], 'email')) { *************** *** 696,700 **** PHPWS_Settings::set('rolodex', 'privacy_contact', $_POST['privacy_contact']); PHPWS_Settings::set('rolodex', 'privacy_web', $_POST['privacy_web']); ! PHPWS_Settings::set('rolodex', 'privacy_phone', $_POST['privacy_phone']); PHPWS_Settings::set('rolodex', 'privacy_home', $_POST['privacy_home']); PHPWS_Settings::set('rolodex', 'privacy_business', $_POST['privacy_business']); --- 761,766 ---- PHPWS_Settings::set('rolodex', 'privacy_contact', $_POST['privacy_contact']); PHPWS_Settings::set('rolodex', 'privacy_web', $_POST['privacy_web']); ! PHPWS_Settings::set('rolodex', 'privacy_home_phone', $_POST['privacy_home_phone']); ! PHPWS_Settings::set('rolodex', 'privacy_bus_phone', $_POST['privacy_bus_phone']); PHPWS_Settings::set('rolodex', 'privacy_home', $_POST['privacy_home']); PHPWS_Settings::set('rolodex', 'privacy_business', $_POST['privacy_business']); *************** *** 949,952 **** --- 1015,1022 ---- } + if (isset($_POST['evening_phone'])) { + $this->member->setEvening_phone($_POST['evening_phone']); + } + if (isset($_POST['fax_number'])) { $this->member->setFax_number($_POST['fax_number']); Index: RDX_Member.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** RDX_Member.php 3 Jul 2008 14:10:04 -0000 1.12 --- RDX_Member.php 6 Jul 2008 13:05:17 -0000 1.13 *************** *** 42,45 **** --- 42,46 ---- var $day_phone = null; var $day_phone_ext = null; + var $evening_phone = null; var $fax_number = null; var $contact_email = null; *************** *** 442,445 **** --- 443,465 ---- + function setEvening_phone($evening_phone) + { + $this->evening_phone = PHPWS_Text::parseInput($evening_phone); + } + + function getEvening_phone($print=false) + { + if (empty($this->evening_phone)) { + return null; + } + + if ($print) { + return PHPWS_Text::parseOutput($this->evening_phone); + } else { + return $this->evening_phone; + } + } + + function setFax_number($fax_number) { *************** *** 1164,1170 **** $tpl['CONTACT_GROUP_LABEL'] = dgettext('rolodex', 'Contact information'); ! if ($this->isDataVisible('privacy_phone')) { if ($this->getDay_phone()) { ! $tpl['DAY_PHONE_LABEL'] = dgettext('rolodex', 'Day phone'); $tpl['DAY_PHONE'] = $this->getDay_phone(true); } --- 1184,1190 ---- $tpl['CONTACT_GROUP_LABEL'] = dgettext('rolodex', 'Contact information'); ! if ($this->isDataVisible('privacy_bus_phone')) { if ($this->getDay_phone()) { ! $tpl['DAY_PHONE_LABEL'] = dgettext('rolodex', 'Business phone'); $tpl['DAY_PHONE'] = $this->getDay_phone(true); } *************** *** 1182,1185 **** --- 1202,1211 ---- } } + if ($this->isDataVisible('privacy_home_phone')) { + if ($this->getEvening_phone()) { + $tpl['EVENING_PHONE_LABEL'] = dgettext('rolodex', 'Home phone'); + $tpl['EVENING_PHONE'] = $this->getEvening_phone(true); + } + } if ($this->isDataVisible('privacy_contact')) { *************** *** 1368,1374 **** if (PHPWS_Settings::get('rolodex', 'browse_phone')) { ! if ($this->isDataVisible('privacy_phone')) { if ($this->getDay_phone()) { ! $tpl['LIST_DAY_PHONE_LABEL'] = dgettext('rolodex', 'Day phone'); $tpl['LIST_DAY_PHONE'] = $this->getDay_phone(true); } --- 1394,1400 ---- if (PHPWS_Settings::get('rolodex', 'browse_phone')) { ! if ($this->isDataVisible('privacy_bus_phone')) { if ($this->getDay_phone()) { ! $tpl['LIST_DAY_PHONE_LABEL'] = dgettext('rolodex', 'Business phone'); $tpl['LIST_DAY_PHONE'] = $this->getDay_phone(true); } *************** *** 1386,1389 **** --- 1412,1421 ---- } } + if ($this->isDataVisible('privacy_home_phone')) { + if ($this->getEvening_phone()) { + $tpl['LIST_EVENING_PHONE_LABEL'] = dgettext('rolodex', 'Home phone'); + $tpl['LIST_EVENING_PHONE'] = $this->getEvening_phone(true); + } + } } *************** *** 1488,1494 **** ! function viewLink() { ! return PHPWS_Text::rewriteLink($this->getDisplay_name(), 'rolodex', $this->user_id); } --- 1520,1531 ---- ! function viewLink($icon=false) { ! if ($icon) { ! $name = $this->getDisplay_name() . sprintf(' <img src="images/mod/rolodex/view.gif" alt="%s" title="%s" />', dgettext('rolodex', 'View Details'), dgettext('rolodex', 'View Details')); ! } else { ! $name = $this->getDisplay_name(); ! } ! return PHPWS_Text::rewriteLink($name, 'rolodex', $this->user_id); } *************** *** 1513,1517 **** function viewTpl() { ! $tpl['MEMBER_TITLE'] = $this->viewLink(); $tpl['MEMBER_DESCRIPTION'] = $this->getListDescription(300); $tpl['MEMBER_LINKS'] = $this->editLink(); --- 1550,1554 ---- function viewTpl() { ! $tpl['MEMBER_TITLE'] = $this->viewLink(true); $tpl['MEMBER_DESCRIPTION'] = $this->getListDescription(300); $tpl['MEMBER_LINKS'] = $this->editLink(); *************** *** 1547,1553 **** if (PHPWS_Settings::get('rolodex', 'list_phone')) { ! if ($this->isDataVisible('privacy_phone')) { if ($this->getDay_phone()) { ! $tpl['LIST_DAY_PHONE_LABEL'] = dgettext('rolodex', 'Day phone'); $tpl['LIST_DAY_PHONE'] = $this->getDay_phone(true); } --- 1584,1590 ---- if (PHPWS_Settings::get('rolodex', 'list_phone')) { ! if ($this->isDataVisible('privacy_bus_phone')) { if ($this->getDay_phone()) { ! $tpl['LIST_DAY_PHONE_LABEL'] = dgettext('rolodex', 'Business phone'); $tpl['LIST_DAY_PHONE'] = $this->getDay_phone(true); } *************** *** 1565,1568 **** --- 1602,1611 ---- } } + if ($this->isDataVisible('privacy_home_phone')) { + if ($this->getEvening_phone()) { + $tpl['LIST_EVENING_PHONE_LABEL'] = dgettext('rolodex', 'Home phone'); + $tpl['LIST_EVENING_PHONE'] = $this->getEvening_phone(true); + } + } } *************** *** 1706,1712 **** $this->active = 0; if (PHPWS_Settings::get('rolodex', 'send_notification') && PHPWS_Settings::get('rolodex', 'admin_contact')) { ! $this->sendNotification(); } } } --- 1749,1759 ---- $this->active = 0; if (PHPWS_Settings::get('rolodex', 'send_notification') && PHPWS_Settings::get('rolodex', 'admin_contact')) { ! $this->sendNotification(true); } } + } else { + if (PHPWS_Settings::get('rolodex', 'notify_all_saves') && PHPWS_Settings::get('rolodex', 'admin_contact') && !Current_User::allow('rolodex')) { + $this->sendNotification(false); + } } *************** *** 1923,1928 **** $content .= '"' . dgettext('rolodex', 'E-Mail') . '",'; $content .= '"' . dgettext('rolodex', 'Website') . '",'; ! $content .= '"' . dgettext('rolodex', 'Day phone') . '",'; $content .= '"' . dgettext('rolodex', 'Ext') . '",'; $content .= '"' . dgettext('rolodex', 'Fax') . '",'; $content .= '"' . dgettext('rolodex', 'Toll-free phone') . '",'; --- 1970,1976 ---- $content .= '"' . dgettext('rolodex', 'E-Mail') . '",'; $content .= '"' . dgettext('rolodex', 'Website') . '",'; ! $content .= '"' . dgettext('rolodex', 'Business phone') . '",'; $content .= '"' . dgettext('rolodex', 'Ext') . '",'; + $content .= '"' . dgettext('rolodex', 'Home phone') . '",'; $content .= '"' . dgettext('rolodex', 'Fax') . '",'; $content .= '"' . dgettext('rolodex', 'Toll-free phone') . '",'; *************** *** 1985,1988 **** --- 2033,2037 ---- $content .= '"' . $this->getDay_phone() . '",'; $content .= '"' . $this->getDay_phone_ext() . '",'; + $content .= '"' . $this->getEvening_phone() . '",'; $content .= '"' . $this->getFax_number() . '",'; $content .= '"' . $this->getTollfree_phone() . '",'; *************** *** 2035,2039 **** ! function sendNotification() { --- 2084,2088 ---- ! function sendNotification($new=true) { *************** *** 2041,2050 **** $site_contact = PHPWS_User::getUserSetting('site_contact'); $url = PHPWS_Core::getHomeHttp(); ! $message = sprintf(dgettext('rolodex', 'You have a new %s application from %s waiting for your review at %s.'), PHPWS_Settings::get('rolodex', 'module_title'), $this->getDisplay_name(), $url); PHPWS_Core::initCoreClass('Mail.php'); $mail = new PHPWS_Mail; $mail->addSendTo(PHPWS_Settings::get('rolodex', 'admin_contact')); ! $mail->setSubject(sprintf(dgettext('rolodex', 'Pending %s Application'), PHPWS_Settings::get('rolodex', 'module_title'))); $mail->setFrom(sprintf('%s<%s>', $page_title, $site_contact)); $mail->setMessageBody($message); --- 2090,2105 ---- $site_contact = PHPWS_User::getUserSetting('site_contact'); $url = PHPWS_Core::getHomeHttp(); ! if ($new) { ! $message = sprintf(dgettext('rolodex', 'You have a new %s application from %s waiting for your review at %s.'), PHPWS_Settings::get('rolodex', 'module_title'), $this->getDisplay_name(), $url); ! $subject = sprintf(dgettext('rolodex', 'Pending %s Application'), PHPWS_Settings::get('rolodex', 'module_title')); ! } else { ! $message = sprintf(dgettext('rolodex', 'The %s profile for %s has been modified at %s.'), PHPWS_Settings::get('rolodex', 'module_title'), $this->getDisplay_name(), $url); ! $subject = sprintf(dgettext('rolodex', 'Modified %s Profile'), PHPWS_Settings::get('rolodex', 'module_title')); ! } PHPWS_Core::initCoreClass('Mail.php'); $mail = new PHPWS_Mail; $mail->addSendTo(PHPWS_Settings::get('rolodex', 'admin_contact')); ! $mail->setSubject($subject); $mail->setFrom(sprintf('%s<%s>', $page_title, $site_contact)); $mail->setMessageBody($message); |
|
From: Verdon V. <ve...@us...> - 2008-07-06 13:07:15
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/img In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1301/img Added Files: view.gif Log Message: closing in on 1.0 --- NEW FILE: view.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Verdon V. <ve...@us...> - 2008-07-06 13:05:43
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv382/docs Modified Files: CHANGELOG Log Message: closing in on 1.0 Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CHANGELOG 3 Jul 2008 14:10:06 -0000 1.5 --- CHANGELOG 6 Jul 2008 13:05:19 -0000 1.6 *************** *** 41,48 **** Version 1.0.0 -- July 2008 ------------------------------------------------------------------ + Added thumbnail to side-box view + Minor fix to prevent titles for features/locations/categories showing up in various places for members who have none ! + Minor fix in reportring succes after contact form submit + Added some tip text to edit member form --- 41,53 ---- Version 1.0.0 -- July 2008 ------------------------------------------------------------------ + + Registered evening_phone field with demographics module + + Split phone privacy settings into home and business + Added thumbnail to side-box view + Minor fix to prevent titles for features/locations/categories showing up in various places for members who have none ! + Minor fix in reporting success after contact form submit + Added some tip text to edit member form + + Further verbage improvements + + Added View icon to member viewLink(icon=false) + + Added option to have admin notification of all member edits |
|
From: Verdon V. <ve...@us...> - 2008-07-06 13:05:40
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv382/boost Modified Files: demographics.php update.php Log Message: closing in on 1.0 Index: demographics.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/demographics.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** demographics.php 17 Jun 2008 13:27:27 -0000 1.3 --- demographics.php 6 Jul 2008 13:05:14 -0000 1.4 *************** *** 43,46 **** --- 43,47 ---- $default[] = 'day_phone'; $default[] = 'day_phone_ext'; + $default[] = 'evening_phone'; $default[] = 'fax_number'; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** update.php 3 Jul 2008 14:09:59 -0000 1.7 --- update.php 6 Jul 2008 13:05:14 -0000 1.8 *************** *** 111,117 **** --- 111,130 ---- case version_compare($currentVersion, '1.0.0', '<'): + PHPWS_Core::initModClass('demographics', 'Demographics.php'); + if (PHPWS_Error::logIfError(Demographics::registerDefaultField('evening_phone'))) { + $content[] = 'Could not register evening_phone column in demographics table.</pre>'; + return false; + } $content[] = '<pre>'; $files = array('templates/edit_member.tpl', + 'templates/edit_settings.tpl', + 'templates/adv_search_form.tpl', + 'templates/list_member.tpl', + 'templates/view_category.tpl', + 'templates/view_feature.tpl', + 'templates/view_location.tpl', + 'templates/view_member.tpl', + 'img/view.gif', 'templates/block.tpl' ); *************** *** 120,128 **** $content[] = '1.0.0 changes ---------------- + Added thumbnail to side-box view + Minor fix to prevent titles for features/locations/categories showing up in various places for members who have none ! + Minor fix in reportring succes after contact form submit + Added some tip text to edit member form </pre>'; --- 133,146 ---- $content[] = '1.0.0 changes ---------------- + + Registered evening_phone field with demographics module + + Split phone privacy settings into home and business + Added thumbnail to side-box view + Minor fix to prevent titles for features/locations/categories showing up in various places for members who have none ! + Minor fix in reporting success after contact form submit + Added some tip text to edit member form + + Further verbage improvements + + Added View icon to member viewLink(icon=false) + + Added option to have admin notification of all member edits </pre>'; |
|
From: Verdon V. <ve...@us...> - 2008-07-06 13:05:14
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv382/inc Modified Files: settings.php Log Message: closing in on 1.0 Index: settings.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/inc/settings.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** settings.php 24 Jun 2008 11:23:31 -0000 1.5 --- settings.php 6 Jul 2008 13:05:20 -0000 1.6 *************** *** 28,31 **** --- 28,32 ---- $settings['req_approval'] = 1; $settings['send_notification'] = 0; + $settings['notify_all_saves'] = 0; $settings['admin_contact'] = null; $settings['comments_enable'] = 0; *************** *** 36,40 **** $settings['privacy_contact'] = 1; $settings['privacy_web'] = 0; ! $settings['privacy_phone'] = 0; $settings['privacy_home'] = 1; $settings['privacy_business'] = 0; --- 37,42 ---- $settings['privacy_contact'] = 1; $settings['privacy_web'] = 0; ! $settings['privacy_home_phone'] = 1; ! $settings['privacy_bus_phone'] = 0; $settings['privacy_home'] = 1; $settings['privacy_business'] = 0; |
|
From: Verdon V. <ve...@us...> - 2008-07-03 14:10:31
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30376/class Modified Files: RDX_Forms.php RDX_Member.php RDX_Runtime.php Rolodex.php Log Message: 1.0 updates beginning Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** RDX_Forms.php 25 Jun 2008 02:48:43 -0000 1.14 --- RDX_Forms.php 3 Jul 2008 14:10:04 -0000 1.15 *************** *** 1037,1040 **** --- 1037,1041 ---- $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') || 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'); Index: RDX_Runtime.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Runtime.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** RDX_Runtime.php 4 Feb 2008 03:09:16 -0000 1.1.1.1 --- RDX_Runtime.php 3 Jul 2008 14:10:04 -0000 1.2 *************** *** 67,70 **** --- 67,75 ---- $member = new Rolodex_Member($result[0]['user_id']); $tpl['MEMBER_TITLE'] = $member->viewLink(); + if ($member->getThumbnail()) { + $tpl['MEMBER_THUMBNAIL'] = $member->getThumbnail(true, true); + } else { + $tpl['MEMBER_THUMBNAIL'] = null; + } $tpl['BROWSE_LINK'] = PHPWS_Text::moduleLink(dgettext('rolodex', 'Browse all members'), 'rolodex', array('uop'=>'list')); PHPWS_Core::initModClass('layout', 'Layout.php'); Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Rolodex.php 24 Jun 2008 11:23:27 -0000 1.12 --- Rolodex.php 3 Jul 2008 14:10:04 -0000 1.13 *************** *** 438,442 **** case 'send_message': if ($this->checkMessage()) { ! if (PHPWS_Error::logIfError($this->sendMail())) { $this->forwardMessage(dgettext('rolodex', 'Message sent succesfully.')); PHPWS_Core::reroute('index.php?module=rolodex&id=' . $this->member->user_id); --- 438,442 ---- case 'send_message': if ($this->checkMessage()) { ! if (!PHPWS_Error::logIfError($this->sendMail())) { $this->forwardMessage(dgettext('rolodex', 'Message sent succesfully.')); PHPWS_Core::reroute('index.php?module=rolodex&id=' . $this->member->user_id); Index: RDX_Member.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Member.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** RDX_Member.php 24 Jun 2008 11:23:27 -0000 1.11 --- RDX_Member.php 3 Jul 2008 14:10:04 -0000 1.12 *************** *** 126,130 **** $result = $db->select('col'); } ! return $result; } --- 126,133 ---- $result = $db->select('col'); } ! if (!isset($result[0])) { ! $result = null; ! } ! return $result; } *************** *** 152,155 **** --- 155,161 ---- $result = $link; } + if (!isset($result[0])) { + $result = null; + } return $result; } *************** *** 177,181 **** } $result = $link; ! } return $result; } --- 183,190 ---- } $result = $link; ! } ! if (!isset($result[0])) { ! $result = null; ! } return $result; } |
|
From: Verdon V. <ve...@us...> - 2008-07-03 14:10:27
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30376/boost Modified Files: boost.php update.php Log Message: 1.0 updates beginning Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/boost.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** boost.php 24 Jun 2008 11:31:57 -0000 1.4 --- boost.php 3 Jul 2008 14:09:59 -0000 1.5 *************** *** 24,28 **** $proper_name = 'Rolodex'; ! $version = '0.9.0'; $image_dir = true; $import_sql = true; --- 24,28 ---- $proper_name = 'Rolodex'; ! $version = '1.0.0'; $image_dir = true; $import_sql = true; Index: update.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/boost/update.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** update.php 24 Jun 2008 11:23:25 -0000 1.6 --- update.php 3 Jul 2008 14:09:59 -0000 1.7 *************** *** 110,113 **** --- 110,131 ---- + case version_compare($currentVersion, '1.0.0', '<'): + $content[] = '<pre>'; + + $files = array('templates/edit_member.tpl', + 'templates/block.tpl' + ); + rolodexUpdateFiles($files, $content); + + $content[] = '1.0.0 changes + ---------------- + + Added thumbnail to side-box view + + Minor fix to prevent titles for features/locations/categories + showing up in various places for members who have none + + Minor fix in reportring succes after contact form submit + + Added some tip text to edit member form + </pre>'; + + |
|
From: Verdon V. <ve...@us...> - 2008-07-03 14:10:02
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30376/docs Modified Files: CHANGELOG Log Message: 1.0 updates beginning Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/docs/CHANGELOG,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CHANGELOG 24 Jun 2008 11:23:29 -0000 1.4 --- CHANGELOG 3 Jul 2008 14:10:06 -0000 1.5 *************** *** 38,39 **** --- 38,48 ---- + Added new settings for customizing list views + Added options for including custom fields in lists + + Version 1.0.0 -- July 2008 + ------------------------------------------------------------------ + + Added thumbnail to side-box view + + Minor fix to prevent titles for features/locations/categories + showing up in various places for members who have none + + Minor fix in reportring succes after contact form submit + + Added some tip text to edit member form + |
|
From: Verdon V. <ve...@us...> - 2008-07-03 14:10:02
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30376/templates Modified Files: block.tpl edit_member.tpl Log Message: 1.0 updates beginning Index: block.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/block.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** block.tpl 4 Feb 2008 03:09:18 -0000 1.1.1.1 --- block.tpl 3 Jul 2008 14:10:08 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- <div class="box-content"> {MEMBER_LABEL}<br /> + <!-- BEGIN member_thumbnail -->{MEMBER_THUMBNAIL}<br /><!-- END member_thumbnail --> {MEMBER_TITLE}<br /> <br /> Index: edit_member.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/templates/edit_member.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** edit_member.tpl 17 Jun 2008 13:27:39 -0000 1.5 --- edit_member.tpl 3 Jul 2008 14:10:08 -0000 1.6 *************** *** 48,51 **** --- 48,52 ---- <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> |
|
From: Verdon V. <ve...@us...> - 2008-07-01 11:07:51
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16201/boost Modified Files: boost.php Log Message: added the info tab Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/boost/boost.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** boost.php 1 Jul 2008 03:43:57 -0000 1.2 --- boost.php 1 Jul 2008 11:07:27 -0000 1.3 *************** *** 24,28 **** $proper_name = 'Sitemap'; ! $version = '0.3.0'; $register = false; $import_sql = false; --- 24,28 ---- $proper_name = 'Sitemap'; ! $version = '0.4.0'; $register = false; $import_sql = false; |
|
From: Verdon V. <ve...@us...> - 2008-07-01 11:07:23
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16201/docs Modified Files: CHANGELOG Log Message: added the info tab Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/docs/CHANGELOG,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CHANGELOG 1 Jul 2008 03:44:00 -0000 1.2 --- CHANGELOG 1 Jul 2008 11:07:28 -0000 1.3 *************** *** 21,22 **** --- 21,27 ---- + Added feed switch to settings + Version 0.4.0 -- July 2008 + ------------------------------------------------------------------ + July 01 + + Added missing info tab template + |
|
From: Verdon V. <ve...@us...> - 2008-07-01 11:05:17
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15421/templates Added Files: info.tpl Log Message: added the info tab --- NEW FILE: info.tpl --- <fieldset> <legend><strong>{TITLE}</strong></legend> <!-- BEGIN info_1 --><p><strong>{INFO_1_LABEL}</strong> {INFO_1}</p><!-- END info_1 --> <!-- BEGIN info_2 --><p><strong>{INFO_2_LABEL}</strong> {INFO_2}</p><!-- END info_2 --> <!-- BEGIN info_3 --><p><strong>{INFO_3_LABEL}</strong> {INFO_3}</p><!-- END info_3 --> <!-- BEGIN info_4 --><p><strong>{INFO_4_LABEL}</strong> {INFO_4}</p><!-- END info_4 --> <!-- BEGIN info_5 --><p><strong>{INFO_5_LABEL}</strong> {INFO_5}</p><!-- END info_5 --> <!-- BEGIN donate --><p>{DONATE}</p><!-- END donate --> </fieldset> |
|
From: Verdon V. <ve...@us...> - 2008-07-01 03:44:23
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4182/class Modified Files: SM_Forms.php Sitemap.php Log Message: tweaks and fixes to prepare for release Index: Sitemap.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/class/Sitemap.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Sitemap.php 30 Jun 2008 02:10:34 -0000 1.1.1.1 --- Sitemap.php 1 Jul 2008 03:43:59 -0000 1.2 *************** *** 30,34 **** var $panel = null; var $message = null; ! var $map = null; var $title = null; var $content = null; --- 30,34 ---- var $panel = null; var $message = null; ! var $map = null; var $title = null; var $content = null; *************** *** 50,67 **** } ! if ($this->buildXML()) { ! ! /* ! if (PHPWS_Error::logIfError($this->file->save())) { ! $this->forwardMessage(dgettext('sitemap', 'Error occurred when saving file.')); ! PHPWS_Core::reroute('index.php?module=sitemap&aop=list'); ! } else { ! $this->forwardMessage(dgettext('sitemap', 'File saved successfully.')); ! PHPWS_Core::reroute('index.php?module=sitemap&aop=list'); ! } ! */ ! echo 'success'; } else { ! $this->loadForm('new'); } --- 50,59 ---- } ! if (PHPWS_Error::logIfError($this->buildFile())) { ! $this->forwardMessage(dgettext('sitemap', 'Error occurred when creating file.')); ! PHPWS_Core::reroute('index.php?module=sitemap&aop=menu&tab=new'); } else { ! $this->forwardMessage(dgettext('sitemap', 'File created successfully.')); ! PHPWS_Core::reroute('index.php?module=sitemap&aop=menu&tab=new'); } *************** *** 179,190 **** PHPWS_Settings::set('sitemap', 'use_lastmod', 0); - if (!empty($_POST['lastmod_default'])) { - PHPWS_Settings::set('sitemap', 'lastmod_default', PHPWS_Text::parseInput(strip_tags($_POST['lastmod_default']))); - } - isset($_POST['use_priority']) ? PHPWS_Settings::set('sitemap', 'use_priority', 1) : PHPWS_Settings::set('sitemap', 'use_priority', 0); if (isset($errors)) { $this->message = implode('<br />', $errors); --- 171,189 ---- PHPWS_Settings::set('sitemap', 'use_lastmod', 0); isset($_POST['use_priority']) ? PHPWS_Settings::set('sitemap', 'use_priority', 1) : PHPWS_Settings::set('sitemap', 'use_priority', 0); + isset($_POST['allow_feed']) ? + PHPWS_Settings::set('sitemap', 'allow_feed', 1) : + PHPWS_Settings::set('sitemap', 'allow_feed', 0); + + $cache_timeout = (int)$_POST['cache_timeout']; + if ((int)$cache_timeout <= 7200) { + PHPWS_Settings::set('sitemap', 'cache_timeout', $cache_timeout); + } else { + PHPWS_Settings::reset('sitemap', 'cache_timeout'); + } + if (isset($errors)) { $this->message = implode('<br />', $errors); *************** *** 201,204 **** --- 200,215 ---- + function getMenuIds() + { + $db = new PHPWS_DB('menus'); + $db->addWhere('restricted', 0); + $result = $db->select(); + foreach ($result as $menu) { + $menus[] = $menu['id']; + } + return $menus; + } + + function getMenus($match=null, $select_name='menus', $multiple=true, $count=true) { *************** *** 249,265 **** } ! function buildXML() { $menus = $_REQUEST['menus']; if ($_REQUEST['build_type']) { /* save to server */ ! // print_r(array_filter($template['links'])); exit; ! // print_r($tpl['links']); exit; } else { /* download */ $filename = 'sitemap' . date('Ymd') . '.xml'; - $content = $this->buildMap($menus); Header('Content-Disposition: attachment; filename=' . $filename); Header('Content-Length: ' . strlen($content)); --- 260,315 ---- } + + + function mapIt() + { + if (PHPWS_Settings::get('sitemap', 'allow_feed')) { + /* what menus for auto, all non-restricted */ + $menus = $this->getMenuIds(); + + /* what to do about lastmod, nothing except for keyed items */ + $lastmod = null; + + if (PHPWS_Settings::get('sitemap', 'cache_timeout') > 0) { + $cache_key = 'sitemap_cache_key'; + $content = PHPWS_Cache::get($cache_key, PHPWS_Settings::get('sitemap', 'cache_timeout')); + if (!empty($content)) { + header('Content-type: text/xml'); + echo $content; + exit(); + } + } + + $content = $this->buildXML($menus, $lastmod); + if (PHPWS_Settings::get('sitemap', 'cache_timeout') > 0) { + PHPWS_Cache::save($cache_key, $content); + } + header('Content-type: text/xml'); + echo $content; + exit(); + } else { + PHPWS_Core::reroute(); + } + } ! ! function buildFile() { $menus = $_REQUEST['menus']; + if (isset($_REQUEST['lastmod_default'])) { + $lastmod = $_REQUEST['lastmod_default']; + } else { + $lastmod = null; + } + $content = $this->buildXML($menus, $lastmod); if ($_REQUEST['build_type']) { /* save to server */ ! $filename = 'sitemap.xml'; ! PHPWS_Core::initCoreClass('File.php'); ! return PHPWS_File::writeFile(PHPWS_HOME_DIR.$filename, $content, true); } else { /* download */ $filename = 'sitemap' . date('Ymd') . '.xml'; Header('Content-Disposition: attachment; filename=' . $filename); Header('Content-Length: ' . strlen($content)); *************** *** 271,275 **** } ! function buildMap($menus) { $final = null; --- 321,325 ---- } ! function buildXML($menus, $lastmod=null) { $final = null; *************** *** 365,369 **** $link_tpl['LASTMOD'] = date("Y-m-d", $link['update_date']); } else { ! $link_tpl['LASTMOD'] = PHPWS_Settings::get('sitemap', 'lastmod_default'); } } --- 415,419 ---- $link_tpl['LASTMOD'] = date("Y-m-d", $link['update_date']); } else { ! $link_tpl['LASTMOD'] = $lastmod; } } *************** *** 420,424 **** $pattern = '/^(([\w]+:)?\/\/)?(([\d\w]|%[a-fA-f\d]{2,2})+(:([\d\w]|%[a-fA-f\d]{2,2})+)?@)?([\d\w][-\d\w]{0,253}[\d\w]\.)+[\w]{2,4}(:[\d]+)?(\/([-+_~.\d\w]|%[a-fA-f\d]{2,2})*)*(\?(&?([-+_~.\d\w]|%[a-fA-f\d]{2,2})=?)*)?(#([-+_~.\d\w]|%[a-fA-f\d]{2,2})*)?$/'; preg_match($pattern, $link, $matches); - // print_r($matches); exit; if ($matches[1]) { --- 470,473 ---- *************** *** 430,437 **** - - - - } ?> --- 479,482 ---- Index: SM_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/class/SM_Forms.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SM_Forms.php 30 Jun 2008 02:10:34 -0000 1.1.1.1 --- SM_Forms.php 1 Jul 2008 03:43:59 -0000 1.2 *************** *** 66,73 **** $mMatch = null; } $form->addRadio('build_type', array(0, 1)); ! $form->setLabel('build_type', array(dgettext('sitemap', 'Download'), dgettext('sitemap', 'Save to server'))); $form->setMatch('build_type', $bMatch); $tpl = $form->getTemplate(); --- 66,84 ---- $mMatch = null; } + if ($_REQUEST['lastmod_default']) { + $dMatch = $_REQUEST['lastmod_default']; + } else { + $dMatch = null; + } $form->addRadio('build_type', array(0, 1)); ! $form->setLabel('build_type', array(dgettext('sitemap', 'Download'), sprintf(dgettext('sitemap', 'Save to server (%s)'), PHPWS_Core::getHomeHttp() . 'sitemap.xml'))); $form->setMatch('build_type', $bMatch); + + if (PHPWS_Settings::get('sitemap', 'use_lastmod')) { + $form->addText('lastmod_default', $dMatch); + $form->setLabel('lastmod_default', dgettext('sitemap', 'Lastmod date for non-keyed items (YYYY-MM-DD) or leave empty')); + $form->setSize('lastmod_default', 30); + } $tpl = $form->getTemplate(); *************** *** 98,102 **** $form->addCheckbox('use_change', 1); $form->setMatch('use_change', PHPWS_Settings::get('sitemap', 'use_change')); ! $form->setLabel('use_change', dgettext('sitemap', 'Add change frequency to sitemap')); $freqs= array('1'=>'always', '2'=>'hourly', '3'=>'daily', '4'=>'weekly', '5'=>'monthly', '6'=>'yearly', '7'=>'never'); --- 109,113 ---- $form->addCheckbox('use_change', 1); $form->setMatch('use_change', PHPWS_Settings::get('sitemap', 'use_change')); ! $form->setLabel('use_change', dgettext('sitemap', 'Add optional* change frequency to sitemap')); $freqs= array('1'=>'always', '2'=>'hourly', '3'=>'daily', '4'=>'weekly', '5'=>'monthly', '6'=>'yearly', '7'=>'never'); *************** *** 107,119 **** $form->addCheckbox('use_lastmod', 1); $form->setMatch('use_lastmod', PHPWS_Settings::get('sitemap', 'use_lastmod')); ! $form->setLabel('use_lastmod', dgettext('sitemap', 'Add lastmod date to sitemap')); ! ! $form->addText('lastmod_default', PHPWS_Settings::get('rolodex', 'lastmod_default')); ! $form->setLabel('lastmod_default', dgettext('sitemap', 'Lastmod date for non-keyed items (YYYY-MM-DD) or leave empty')); ! $form->setSize('lastmod_default', 30); $form->addCheckbox('use_priority', 1); $form->setMatch('use_priority', PHPWS_Settings::get('sitemap', 'use_priority')); ! $form->setLabel('use_priority', dgettext('sitemap', 'Add priority to sitemap (calculated on menu level)')); $form->addSubmit('save', dgettext('sitemap', 'Save settings')); --- 118,134 ---- $form->addCheckbox('use_lastmod', 1); $form->setMatch('use_lastmod', PHPWS_Settings::get('sitemap', 'use_lastmod')); ! $form->setLabel('use_lastmod', dgettext('sitemap', 'Add optional* lastmod date to sitemap')); $form->addCheckbox('use_priority', 1); $form->setMatch('use_priority', PHPWS_Settings::get('sitemap', 'use_priority')); ! $form->setLabel('use_priority', dgettext('sitemap', 'Add optional* priority** to sitemap')); ! ! $form->addCheckbox('allow_feed', 1); ! $form->setMatch('allow_feed', PHPWS_Settings::get('sitemap', 'allow_feed')); ! $form->setLabel('allow_feed', dgettext('sitemap', 'Allow live xml feed*** of all non-restricted menus')); ! ! $form->addText('cache_timeout', PHPWS_Settings::get('sitemap', 'cache_timeout')); ! $form->setSize('cache_timeout', 4, 4); ! $form->setLabel('cache_timeout', dgettext('sitemap', 'Cache duration in seconds for xml feed (0-7200, set to 0 to disable cache)')); $form->addSubmit('save', dgettext('sitemap', 'Save settings')); *************** *** 121,124 **** --- 136,142 ---- $tpl = $form->getTemplate(); $tpl['SETTINGS_LABEL'] = dgettext('sitemap', 'General Settings'); + $tpl['FOOTNOTE_1'] = sprintf(dgettext('sitemap', '* More information on the Sitemap protocal is available %s'), '<a href="http://www.sitemaps.org/protocol.php" target="new">'. dgettext('sitemap', 'here') .'</a>'); + $tpl['FOOTNOTE_2'] = dgettext('sitemap', '** I do a rough calculation to achieve this. Everything starts as the average 0.5. I add 0.5 to top-level itmes. I then subtract 0.1 for each step down the menu order. Nothing is scored above 1.0 or below 0.1.'); + $tpl['FOOTNOTE_3'] = dgettext('sitemap', '*** The feed respects the settings above. Lastmod date of non-keyed items will be null.'); $this->sitemap->title = dgettext('sitemap', 'Settings'); *************** *** 132,140 **** $tpl['TITLE'] = dgettext('sitemap', 'Important Information'); $tpl['INFO_1_LABEL'] = dgettext('sitemap', 'About this module:'); ! $tpl['INFO_1'] = dgettext('sitemap', 'This is the first release of sitemap for the new 1.x series phpwebsite. It\'s pretty simple and there may not be any further releases, unless bugs are found. I wrote this for a specific need I had and thought it may be of use to others also.'); ! $tpl['INFO_2_LABEL'] = dgettext('sitemap', 'Caution'); ! $tpl['INFO_2'] = dgettext('sitemap', 'This module could be dangerous. You are expected to have some idea of what you are doing, if you are going to use it. It could be used to do nasty or stupid things. I have intentionally not included file upload abilites to it. If you do not have access to the server, you should not be using this.'); ! $tpl['INFO_3_LABEL'] = null; ! $tpl['INFO_3'] = null; $tpl['INFO_4_LABEL'] = null; $tpl['INFO_4'] = null; --- 150,163 ---- $tpl['TITLE'] = dgettext('sitemap', 'Important Information'); $tpl['INFO_1_LABEL'] = dgettext('sitemap', 'About this module:'); ! $tpl['INFO_1'] = dgettext('sitemap', 'This is the first release of sitemap for the new 1.x series phpwebsite. I wrote this for a specific need I had and thought it may be of use to others also.'); ! $tpl['INFO_2_LABEL'] = dgettext('sitemap', 'What it does:'); ! $tpl['INFO_2'] = sprintf(dgettext('sitemap', 'Sitemap is used to generate a sitmap.xml file, following the standards at %s. These sitemap files are used by google and other popular search engines to help them index your website. Sitemap does this by gathering all the links from one or more of your menus, filtering and preparing according to your settings, and then writing the xml for you.'), '<a href="http://www.sitemaps.org/protocol.php" target="new">sitemaps.org</a>'); ! $tpl['INFO_3_LABEL'] = dgettext('sitemap', 'How to use it:'); ! if (MOD_REWRITE_ENABLED) { ! $modlink = 'sitemap'; ! } else { ! $modlink = 'index.php?module=sitemap'; ! } ! $tpl['INFO_3'] = sprintf(dgettext('sitemap', 'First, review the settings. Then, you can either download a sitemap file for using later, save a sitemap file to the server at %s, or allow a live and dynamic sitemap feed at %s'), PHPWS_Core::getHomeHttp() . 'sitemap.xml', PHPWS_Core::getHomeHttp() . $modlink); $tpl['INFO_4_LABEL'] = null; $tpl['INFO_4'] = null; |
|
From: Verdon V. <ve...@us...> - 2008-07-01 03:44:23
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4182/docs Modified Files: CHANGELOG Log Message: tweaks and fixes to prepare for release Index: CHANGELOG =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/docs/CHANGELOG,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CHANGELOG 30 Jun 2008 12:08:27 -0000 1.1 --- CHANGELOG 1 Jul 2008 03:44:00 -0000 1.2 *************** *** 1,4 **** Version 0.1.0 -- June 2008 ------------------------------------------------------------------ ! JUne 28 - 29 + Initial writing of mod --- 1,22 ---- Version 0.1.0 -- June 2008 ------------------------------------------------------------------ ! June 28 - 29 + Initial writing of mod + + + Version 0.2.0 -- June 2008 + ------------------------------------------------------------------ + June 30 + + Moved default mod date from settings to build map + + Improved text in settings area and provide link to protocal info + + Added the info tab + + General code tidy up + + + Version 0.3.0 -- June 2008 + ------------------------------------------------------------------ + June 30 + + Added live sitemap feed + + Added feed cache to settings + + Added feed switch to settings + |
|
From: Verdon V. <ve...@us...> - 2008-07-01 03:44:21
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/boost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4182/boost Modified Files: boost.php controlpanel.php Log Message: tweaks and fixes to prepare for release Index: controlpanel.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/boost/controlpanel.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** controlpanel.php 30 Jun 2008 02:10:34 -0000 1.1.1.1 --- controlpanel.php 1 Jul 2008 03:43:57 -0000 1.2 *************** *** 23,32 **** */ ! $link[] = array('label' => dgettext('menu', 'Sitemap'), ! 'restricted' => TRUE, ! 'url' => 'index.php?module=sitemap', ! 'description' => dgettext('menu', 'Generates sitemap.xml files for search engines.'), ! 'image' => 'sitemap.png', ! 'tab' => 'admin' ); ?> \ No newline at end of file --- 23,32 ---- */ ! $link[] = array('label' => dgettext('menu', 'Sitemap'), ! 'restricted' => true, ! 'url' => 'index.php?module=sitemap&aop=menu', ! 'description' => dgettext('menu', 'Generates sitemap.xml files for search engines.'), ! 'image' => 'sitemap.png', ! 'tab' => 'admin' ); ?> \ No newline at end of file Index: boost.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/boost/boost.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** boost.php 30 Jun 2008 02:10:33 -0000 1.1.1.1 --- boost.php 1 Jul 2008 03:43:57 -0000 1.2 *************** *** 24,28 **** $proper_name = 'Sitemap'; ! $version = '0.1.0'; $register = false; $import_sql = false; --- 24,28 ---- $proper_name = 'Sitemap'; ! $version = '0.3.0'; $register = false; $import_sql = false; |
|
From: Verdon V. <ve...@us...> - 2008-07-01 03:44:19
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4182 Modified Files: index.php Log Message: tweaks and fixes to prepare for release Index: index.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 30 Jun 2008 02:10:33 -0000 1.1.1.1 --- index.php 1 Jul 2008 03:43:53 -0000 1.2 *************** *** 31,34 **** --- 31,35 ---- $sitemap = new Sitemap; + /* if (isset($_REQUEST['mapit'])) { $sitemap->siteMap(); *************** *** 38,41 **** --- 39,50 ---- PHPWS_Core::errorPage('404'); } + */ + + if (isset($_REQUEST['aop']) && Current_User::allow('sitemap')) { + $sitemap->adminMenu(); + } else { + $sitemap->mapIt(); + } + ?> \ No newline at end of file |
|
From: Verdon V. <ve...@us...> - 2008-07-01 03:43:57
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4182/templates Modified Files: edit_settings.tpl map_settings.tpl Log Message: tweaks and fixes to prepare for release Index: map_settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/templates/map_settings.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** map_settings.tpl 30 Jun 2008 02:10:34 -0000 1.1.1.1 --- map_settings.tpl 1 Jul 2008 03:44:03 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- <legend><strong>{OPTIONS_LABEL}</strong></legend> <p>{MENU_SELECT_LABEL}<br />{MENU_SELECT}</p> + <!-- BEGIN lastmod_default --><p>{LASTMOD_DEFAULT} {LASTMOD_DEFAULT_LABEL}</p><!-- END lastmod_default --> <p>{BUILD_TYPE_1}{BUILD_TYPE_1_LABEL} {BUILD_TYPE_2}{BUILD_TYPE_2_LABEL}</p> </fieldset> Index: edit_settings.tpl =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/templates/edit_settings.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** edit_settings.tpl 30 Jun 2008 02:10:34 -0000 1.1.1.1 --- edit_settings.tpl 1 Jul 2008 03:44:03 -0000 1.2 *************** *** 7,12 **** <p>{CHANGE_FREQ} {CHANGE_FREQ_LABEL}</p> <p>{USE_LASTMOD} {USE_LASTMOD_LABEL}</p> - <p>{LASTMOD_DEFAULT} {LASTMOD_DEFAULT_LABEL}</p> <p>{USE_PRIORITY} {USE_PRIORITY_LABEL}</p> </fieldset> {SAVE} --- 7,16 ---- <p>{CHANGE_FREQ} {CHANGE_FREQ_LABEL}</p> <p>{USE_LASTMOD} {USE_LASTMOD_LABEL}</p> <p>{USE_PRIORITY} {USE_PRIORITY_LABEL}</p> + <p>{ALLOW_FEED} {ALLOW_FEED_LABEL}</p> + <p>{CACHE_TIMEOUT} {CACHE_TIMEOUT_LABEL}</p> + <p class="smaller">{FOOTNOTE_1}</p> + <p class="smaller">{FOOTNOTE_2}</p> + <p class="smaller">{FOOTNOTE_3}</p> </fieldset> {SAVE} |
|
From: Verdon V. <ve...@us...> - 2008-07-01 03:43:56
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4182/inc Modified Files: settings.php Log Message: tweaks and fixes to prepare for release Index: settings.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/sitemap/inc/settings.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** settings.php 30 Jun 2008 02:10:34 -0000 1.1.1.1 --- settings.php 1 Jul 2008 03:44:01 -0000 1.2 *************** *** 28,33 **** $settings['change_freq'] = 5; $settings['use_lastmod'] = 1; - $settings['lastmod_default'] = null; $settings['use_priority'] = 1; ?> \ No newline at end of file --- 28,34 ---- $settings['change_freq'] = 5; $settings['use_lastmod'] = 1; $settings['use_priority'] = 1; + $settings['cache_timeout'] = 3600; + $settings['allow_feed'] = 1; ?> \ No newline at end of file |
|
From: Verdon V. <ve...@us...> - 2008-06-30 12:11:57
|
Update of /cvsroot/phpwebsite-comm/modules/sitemap/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12057/docs Removed Files: .DS_Store Log Message: adding docs --- .DS_Store DELETED --- |
