Menu
▾
▴
phpwebsite-comm-cvs-commits
|
From: Verdon V. <ve...@us...> - 2008-07-24 20:08:53
|
Update of /cvsroot/phpwebsite-comm/modules/rolodex/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26985/class Modified Files: RDX_Forms.php Rolodex.php Log Message: tweaks to control panel Index: RDX_Forms.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/RDX_Forms.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** RDX_Forms.php 24 Jul 2008 12:40:18 -0000 1.20 --- RDX_Forms.php 24 Jul 2008 20:08:51 -0000 1.21 *************** *** 136,139 **** --- 136,164 ---- + function settingsPanel() + { + PHPWS_Core::initModClass('controlpanel', 'Panel.php'); + $link = 'index.php?module=rolodex&aop=menu'; + + if (Current_User::allow('rolodex', 'settings')){ + $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings'), + 'link'=>$link); + $tags['locations'] = array('title'=>dgettext('rolodex', 'Locations'), + 'link'=>$link); + $tags['features'] = array('title'=>dgettext('rolodex', 'Features'), + 'link'=>$link); + } + + if (Current_User::isUnrestricted('rolodex')) { + $tags['utilities'] = array('title'=>dgettext('rolodex', 'Utilities'), 'link'=>$link); + } + + $panel = new PHPWS_Panel('rolodex-settings-panel'); + $panel->quickSetTabs($tags); + $panel->setModule('rolodex'); + return $panel; + } + + function listMembers($approved=null, $expired=false, $location=null, $feature=null, $category=null) { Index: Rolodex.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/rolodex/class/Rolodex.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Rolodex.php 24 Jul 2008 12:40:18 -0000 1.17 --- Rolodex.php 24 Jul 2008 20:08:52 -0000 1.18 *************** *** 50,53 **** --- 50,88 ---- $this->loadMessage(); + /* This switch determines if 'settings' panel needs creating */ + switch($_REQUEST['aop']) { + case 'post_settings': + case 'reset_expired': + case 'delete_expired': + case 'search_index_all': + case 'search_remove_all': + case 'all_comments_yes': + case 'all_comments_no': + case 'all_anon_yes': + case 'all_anon_no': + case 'new_location': + case 'edit_location': + case 'post_location': + case 'delete_location': + case 'new_feature': + case 'edit_feature': + case 'post_feature': + case 'delete_feature': + PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php'); + $settingsPanel = Rolodex_Forms::settingsPanel(); + $settingsPanel->enableSecure(); + break; + case 'menu': + if (isset($_GET['tab'])) { + if ($_GET['tab'] == 'settings' || $_GET['tab'] == 'utilities' || $_GET['tab'] == 'locations' || $_GET['tab'] == 'features') { + PHPWS_Core::initModClass('rolodex', 'RDX_Forms.php'); + $settingsPanel = Rolodex_Forms::settingsPanel(); + $settingsPanel->enableSecure(); + } + } + + } + + /* This switch dumps the content in */ switch($_REQUEST['aop']) { *************** *** 61,64 **** --- 96,100 ---- case 'post_settings': + $settingsPanel->setCurrentTab('settings'); if (!Current_User::authorized('rolodex', 'settings')) { Current_User::disallow(); *************** *** 129,132 **** --- 165,169 ---- case 'reset_expired': + $settingsPanel->setCurrentTab('utilities'); $interval = PHPWS_Settings::get('rolodex', 'expiry_interval'); $this->resetExpired($interval); *************** *** 136,139 **** --- 173,177 ---- case 'delete_expired': + $settingsPanel->setCurrentTab('utilities'); $num = $this->deleteExpired(); if ($num > 0) { *************** *** 146,149 **** --- 184,188 ---- case 'search_index_all': + $settingsPanel->setCurrentTab('utilities'); if (PHPWS_Settings::get('rolodex', 'privacy_use_search')) { $this->search_index_all(); *************** *** 156,159 **** --- 195,199 ---- case 'search_remove_all': + $settingsPanel->setCurrentTab('utilities'); if (PHPWS_Settings::get('rolodex', 'privacy_use_search')) { $this->message = dgettext('rolodex', 'Search indexing is enabled in Rolodex settings. You must disable it there before you may perform this action.'); *************** *** 166,169 **** --- 206,210 ---- case 'all_comments_yes': + $settingsPanel->setCurrentTab('utilities'); $this->setAllComments(1); $this->message = dgettext('rolodex', 'Allow comments has been set to yes on all members.'); *************** *** 172,175 **** --- 213,217 ---- case 'all_comments_no': + $settingsPanel->setCurrentTab('utilities'); $this->setAllComments(0); $this->message = dgettext('rolodex', 'Allow comments has been set to no on all members.'); *************** *** 178,181 **** --- 220,224 ---- case 'all_anon_yes': + $settingsPanel->setCurrentTab('utilities'); $this->setAllComments_annon(1); $this->message = dgettext('rolodex', 'Allow anonymous comments has been set to yes on all members.'); *************** *** 184,187 **** --- 227,231 ---- case 'all_anon_no': + $settingsPanel->setCurrentTab('utilities'); $this->setAllComments_annon(0); $this->message = dgettext('rolodex', 'Allow anonymous comments has been set to no on all members.'); *************** *** 198,205 **** --- 242,251 ---- case 'new_location': case 'edit_location': + $settingsPanel->setCurrentTab('locations'); $this->loadForm('edit_location'); break; case 'post_location': + $settingsPanel->setCurrentTab('locations'); if ($this->postLocation()) { if (PHPWS_Error::logIfError($this->location->save())) { *************** *** 216,219 **** --- 262,266 ---- case 'delete_location': + $settingsPanel->setCurrentTab('locations'); $this->loadLocation(); $this->location->delete(); *************** *** 224,231 **** --- 271,280 ---- case 'new_feature': case 'edit_feature': + $settingsPanel->setCurrentTab('features'); $this->loadForm('edit_feature'); break; case 'post_feature': + $settingsPanel->setCurrentTab('features'); if ($this->postFeature()) { if (PHPWS_Error::logIfError($this->feature->save())) { *************** *** 242,245 **** --- 291,295 ---- case 'delete_feature': + $settingsPanel->setCurrentTab('features'); $this->loadFeature(); $this->feature->delete(); *************** *** 250,253 **** --- 300,333 ---- } + /* This switch creates the 'settings' panel when needed */ + switch($_REQUEST['aop']) { + case 'post_settings': + case 'reset_expired': + case 'delete_expired': + case 'search_index_all': + case 'search_remove_all': + case 'all_comments_yes': + case 'all_comments_no': + case 'all_anon_yes': + case 'all_anon_no': + case 'new_location': + case 'edit_location': + case 'post_location': + case 'delete_location': + case 'new_feature': + case 'edit_feature': + case 'post_feature': + case 'delete_feature': + $settingsPanel->setContent($this->content); + $this->content = $settingsPanel->display(); + case 'menu': + if (isset($_GET['tab'])) { + if ($_GET['tab'] == 'settings' || $_GET['tab'] == 'utilities' || $_GET['tab'] == 'locations' || $_GET['tab'] == 'features') { + $settingsPanel->setContent($this->content); + $this->content = $settingsPanel->display(); + } + } + } + $tpl['TITLE'] = $this->title; $tpl['CONTENT'] = $this->content; *************** *** 532,539 **** $this->forms->listMembers(1, false, null, null, $id); } ! break; ! ! // function listMembers($approved=null, $expired=false, $location=null, $feature=null, $category=null) ! --- 612,616 ---- $this->forms->listMembers(1, false, null, null, $id); } ! break; *************** *** 655,670 **** $tags['expired'] = array('title'=>sprintf(dgettext('rolodex', 'Expired (%s)'), $expired), 'link'=>$link); } - $tags['utilities'] = array('title'=>dgettext('rolodex', 'Utilities'), 'link'=>$link); } if (Current_User::allow('rolodex', 'settings')){ ! $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings'), 'link'=>$link); } ! $tags['locations'] = array('title'=>dgettext('rolodex', 'Locations'), ! 'link'=>$link); ! $tags['features'] = array('title'=>dgettext('rolodex', 'Features'), ! 'link'=>$link); ! if (Current_User::allow('rolodex', 'edit_member')){ $tags['info'] = array('title'=>dgettext('rolodex', 'Read me'), 'link'=>$link); --- 732,743 ---- $tags['expired'] = array('title'=>sprintf(dgettext('rolodex', 'Expired (%s)'), $expired), 'link'=>$link); } } if (Current_User::allow('rolodex', 'settings')){ ! $tags['settings'] = array('title'=>dgettext('rolodex', 'Settings & Utilities'), 'link'=>$link); } ! ! if (Current_User::allow('rolodex', 'settings')){ $tags['info'] = array('title'=>dgettext('rolodex', 'Read me'), 'link'=>$link); |
Thanks for helping keep SourceForge clean.
X