Clean up admin pages - remove commented-out require of dmsDefaults and

dispatcher logic, and replace use of 'action' breadcrumbs with url-based ones. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4444 c91229c3-7414-0410-bfa2-8a42b809f60b

Clean up admin pages - remove commented-out require of dmsDefaults and
dispatcher logic, and replace use of 'action' breadcrumbs with url-based ones. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4444 c91229c3-7414-0410-bfa2-8a42b809f60b
nbm
1 parent 5c684c1a
Showing 15 changed files with 31 additions and 92 deletions
plugins/ktcore/admin/archivedDocuments.php
plugins/ktcore/admin/conditions.php
plugins/ktcore/admin/deletedDocuments.php
plugins/ktcore/admin/documentFields.php
plugins/ktcore/admin/documentLinks.php
plugins/ktcore/admin/documentTypes.php
plugins/ktcore/admin/groupManagement.php
plugins/ktcore/admin/manageCleanup.php
plugins/ktcore/admin/managePermissions.php
plugins/ktcore/admin/orgManagement.php
plugins/ktcore/admin/roleManagement.php
plugins/ktcore/admin/savedSearch.php
plugins/ktcore/admin/unitManagement.php
plugins/ktcore/admin/userManagement.php
plugins/ktcore/admin/workflows.php
 <?php
-//require_once('../../../../../config/dmsDefaults.php');
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
 require_once(KT_LIB_DIR . '/templating/templating.inc.php');
@@ -15,7 +14,7 @@ require_once(KT_LIB_DIR . &quot;/templating/kt3template.inc.php&quot;);
 class ArchivedDocumentsDispatcher extends KTAdminDispatcher {
     function do_main () {
-        $this->aBreadcrumbs[] = array('action' => 'archivedDocuments', 'name' => _('Archived Documents'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Archived Documents'));
         $this->oPage->setBreadcrumbDetails(_('list'));
@@ -32,7 +31,7 @@ class ArchivedDocumentsDispatcher extends KTAdminDispatcher {
     }
     function do_confirm_restore() {
-        $this->aBreadcrumbs[] = array('action' => 'archivedDocuments', 'name' => _('Archived Documents'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Archived Documents'));
         $selected_docs = KTUtil::arrayGet($_REQUEST, 'selected_docs', array()); 
@@ -95,7 +94,4 @@ class ArchivedDocumentsDispatcher extends KTAdminDispatcher {
     }
 }
-//$d =& new DeletedDocumentsDispatcher;
-//$d->dispatch();
-
 ?>
 <?php
-// boilerplate includes
-require_once("../../../../../config/dmsDefaults.php");
-require_once(KT_DIR . "/presentation/Html.inc");
 require_once(KT_LIB_DIR . "/templating/templating.inc.php");
 require_once(KT_LIB_DIR . "/dispatcher.inc.php");
 require_once(KT_LIB_DIR . "/browse/Criteria.inc");
 require_once(KT_LIB_DIR . "/search/savedsearch.inc.php");
-// specific includes
-
-$sectionName = "General";
-require_once(KT_DIR . "/presentation/webpageTemplate.inc");
-
 class KTConditionDispatcher extends KTStandardDispatcher {
     var $bAutomaticTransaction = true;
@@ -74,7 +66,4 @@ class KTConditionDispatcher extends KTStandardDispatcher {
     }
 }
-$oDispatcher = new KTConditionDispatcher();
-$oDispatcher->dispatch();
-
 ?>
 <?php
-//require_once('../../../../../config/dmsDefaults.php');
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
 require_once(KT_LIB_DIR . '/templating/templating.inc.php');
@@ -12,7 +11,7 @@ require_once(KT_LIB_DIR . &quot;/templating/kt3template.inc.php&quot;);
 class DeletedDocumentsDispatcher extends KTAdminDispatcher {
     function do_main () {
-        $this->aBreadcrumbs[] = array('action' => 'deletedDocuments', 'name' => _('Deleted Documents'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Deleted Documents'));
         $this->oPage->setBreadcrumbDetails(_('view'));
@@ -29,7 +28,7 @@ class DeletedDocumentsDispatcher extends KTAdminDispatcher {
     }
     function do_confirm_expunge() {
-        $this->aBreadcrumbs[] = array('action' => 'deletedDocuments', 'name' => _('Deleted Documents'));
+        $this->aBreadcrumbs[] = array('url' =>  $_SERVER['PHP_SELF'], 'name' => _('Deleted Documents'));
         $selected_docs = KTUtil::arrayGet($_REQUEST, 'selected_docs', array()); 
@@ -102,7 +101,4 @@ class DeletedDocumentsDispatcher extends KTAdminDispatcher {
     }
 }
-//$d =& new DeletedDocumentsDispatcher;
-//$d->dispatch();
-
 ?>
 <?php
-//require_once('../../../../../config/dmsDefaults.php');
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
 require_once(KT_LIB_DIR . '/templating/templating.inc.php');
 require_once(KT_LIB_DIR . '/templating/kt3template.inc.php');
@@ -16,9 +15,13 @@ require_once(KT_LIB_DIR . &#39;/widgets/fieldWidgets.php&#39;);
 class KTDocumentFieldDispatcher extends KTStandardDispatcher {
     var $bAutomaticTransaction = true;
+    function check() {
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Document Field Management'));
+        return true;
+    }
+
     // {{{ do_main
     function do_main () {
-        $this->aBreadcrumbs[] = array('action' => 'docfield', 'name' => _('Document Field Management'));
         $this->oPage->setBreadcrumbDetails(_("view fieldsets"));
         // function KTBaseWidget($sLabel, $sDescription, $sName, $value, $oPage, $bRequired = false, $sId = null, $aErrors = null, $aOptions = null) {
@@ -68,7 +71,7 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
         $this->aBreadcrumbs[] = array(
-            'action' => 'docfield',
+            'url' => $_SERVER['PHP_SELF'],
             'query' => 'action=edit&fFieldsetId=' . $_REQUEST['fFieldsetId'],
             'name' => 'Fieldset ' . $oFieldset->getName()
         );
@@ -176,7 +179,7 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
         $oField =& DocumentField::get($_REQUEST['fFieldId']);
         $this->aBreadcrumbs[] = array(
-            'action' => 'docfield',
+            'url' => $_SERVER['PHP_SELF'],
             'query' => 'action=edit&fFieldsetId=' . $_REQUEST['fFieldsetId'],
             'name' => $oFieldset->getName()
         );
@@ -406,12 +409,12 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
             $sIncomplete = null;
         }
         $this->aBreadcrumbs[] = array(
-            'action' => 'docfield',
+            'url' => $_SERVER['PHP_SELF'],
             'query' => 'action=edit&fFieldsetId=' . $_REQUEST['fFieldsetId'],
             'name' => $oFieldset->getName()
         );
         $this->aBreadcrumbs[] = array(
-            'action' => 'docfield',
+            'url' => $_SERVER['PHP_SELF'],
             'query' => 'action=manageConditional&fFieldsetId=' . $_REQUEST['fFieldsetId'],
             'name' => _('Manage conditional field'),
         );
@@ -530,8 +533,4 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
     // }}}
 }
-// use the admin dispatch mechanisms.
-//$d =& new KTDocumentFieldDispatcher;
-//$d->dispatch();
-
 ?>
@@ -24,9 +24,6 @@
  * @package documentmanagement
  */
-/* boilerplate */
-//require_once('../../../../../config/dmsDefaults.php');
-
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
 require_once(KT_LIB_DIR . '/templating/kt3template.inc.php');
@@ -154,8 +151,4 @@ class KTDocLinkAdminDispatcher extends KTAdminDispatcher {
 }
-// use the new admin framework.
-//$d = new KTDocLinkAdminDispatcher();
-//$d->dispatch();
-
 ?>
 <?php
-//require_once('../../../../../config/dmsDefaults.php');
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
 require_once(KT_LIB_DIR . '/templating/templating.inc.php');
@@ -16,7 +15,7 @@ class KTDocumentTypeDispatcher extends KTAdminDispatcher {
    // Breadcrumbs base - added to in methods
     function do_main () {
-        $this->aBreadcrumbs[] = array('action' => 'doctype', 'name' => _('Document Type Management'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Document Type Management'));
         $this->oPage->setBreadcrumbDetails('view types');
@@ -66,7 +65,7 @@ class KTDocumentTypeDispatcher extends KTAdminDispatcher {
     function do_edit() {
-        $this->aBreadcrumbs[] = array('action' => 'doctype', 'name' => _('Document Type Management'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Document Type Management'));
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate = $oTemplating->loadTemplate('ktcore/documenttypes/edit');
@@ -140,7 +139,4 @@ class KTDocumentTypeDispatcher extends KTAdminDispatcher {
     }
 }
-//$d =& new KTDocumentTypeDispatcher;
-//$d->dispatch();
-
 ?>
 <?php
-//require_once('../../../../../config/dmsDefaults.php');
-
 require_once(KT_LIB_DIR . '/users/User.inc');
 require_once(KT_LIB_DIR . '/groups/GroupUtil.php');
 require_once(KT_LIB_DIR . '/groups/Group.inc');
@@ -14,7 +12,7 @@ require_once(KT_LIB_DIR . &quot;/widgets/fieldWidgets.php&quot;);
 class KTGroupAdminDispatcher extends KTAdminDispatcher {
     function do_main() {
-		$this->aBreadcrumbs[] = array('action' => 'groupManagement', 'name' => _('Group Management'));
+		$this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Group Management'));
 		$this->oPage->setBreadcrumbDetails(_('select a group'));
 		$this->oPage->setTitle(_("Group Management"));
@@ -47,7 +45,7 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher {
     function do_editGroup() {
-		$this->aBreadcrumbs[] = array('action' => 'groupManagement', 'name' => _('Group Management'));
+		$this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Group Management'));
 		$this->oPage->setBreadcrumbDetails(_('edit group'));
 		$group_id = KTUtil::arrayGet($_REQUEST, 'group_id');
@@ -331,7 +329,7 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher {
     function do_addGroup() {
-		$this->aBreadcrumbs[] = array('action' => 'groupManagement', 'name' => _('Group Management'));
+		$this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Group Management'));
 		$this->oPage->setBreadcrumbDetails(_('create new group'));
 <?php
-require_once("../../../../../config/dmsDefaults.php");
-
 require_once(KT_DIR . "/presentation/Html.inc");
 require_once(KT_LIB_DIR . "/templating/templating.inc.php");
@@ -160,7 +158,4 @@ class ManageCleanupDispatcher extends KTAdminDispatcher {
     }
 }
-$oDispatcher = new ManageCleanupDispatcher();
-$oDispatcher->dispatch();
-
 ?>
 <?php
-//require_once("../../../../../config/dmsDefaults.php");
 require_once(KT_LIB_DIR . "/templating/templating.inc.php");
 require_once(KT_LIB_DIR . "/permissions/permission.inc.php");
@@ -9,7 +8,7 @@ require_once(KT_LIB_DIR . &quot;/templating/kt3template.inc.php&quot;);
 class ManagePermissionsDispatcher extends KTAdminDispatcher {
     function do_main() {
         $this->oPage->setTitle(_('Manage Permissions'));
-        $this->aBreadcrumbs[] = array('action' => 'managePermissions', 'name' => _('Manage Permissions'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Manage Permissions'));
         $add_fields = array();
         $add_fields[] = new KTStringWidget(_('System Name'),_('The internal name used for the permission.  This should never be changed.'), 'name', null, $this->oPage, true);
@@ -62,7 +61,4 @@ class ManagePermissionsDispatcher extends KTAdminDispatcher {
     }
 }
-//$oDispatcher = new ManagePermissionsDispatcher();
-//$oDispatcher->dispatch();
-
 ?>
 <?php
-//require_once('../../../../../config/dmsDefaults.php');
-
 require_once(KT_LIB_DIR . '/orgmanagement/Organisation.inc');
 require_once(KT_LIB_DIR . "/templating/templating.inc.php");
@@ -11,7 +9,7 @@ require_once(KT_LIB_DIR . &quot;/widgets/fieldWidgets.php&quot;);
 class KTOrgAdminDispatcher extends KTAdminDispatcher {
     function do_main() {
-		$this->aBreadcrumbs[] = array('action' => 'orgManagement', 'name' => _('Organisation Management'));
+		$this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Organisation Management'));
 		$this->oPage->setBreadcrumbDetails(_('select a organisation'));
 		$this->oPage->setTitle(_("Organisation Management"));
@@ -69,5 +67,4 @@ class KTOrgAdminDispatcher extends KTAdminDispatcher {
 }
-
 ?>
@@ -36,7 +36,7 @@ class RoleAdminDispatcher extends KTAdminDispatcher {
     }
     function do_main() {
-        $this->aBreadcrumbs[] = array('action' => 'roleManagement', 'name' => _('Role Management'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Role Management'));
         $this->oPage->setTitle(_('Role Management'));
 <?php
 // boilerplate includes
-require_once("../../../../../config/dmsDefaults.php");
-require_once(KT_DIR . "/presentation/Html.inc");
 require_once(KT_LIB_DIR . "/templating/templating.inc.php");
 require_once(KT_LIB_DIR . "/dispatcher.inc.php");
 require_once(KT_LIB_DIR . "/browse/Criteria.inc");
 <?php
-//require_once('../../../../../config/dmsDefaults.php');
-
 require_once(KT_LIB_DIR . '/unitmanagement/Unit.inc');
 require_once(KT_LIB_DIR . '/unitmanagement/UnitOrganisationLink.inc');
 require_once(KT_LIB_DIR . '/orgmanagement/Organisation.inc');
@@ -13,7 +11,7 @@ require_once(KT_LIB_DIR . &quot;/widgets/fieldWidgets.php&quot;);
 class KTUnitAdminDispatcher extends KTAdminDispatcher {
     function do_main() {
-		$this->aBreadcrumbs[] = array('action' => 'unitManagement', 'name' => _('Unit Management'));
+		$this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Unit Management'));
 		$this->oPage->setBreadcrumbDetails(_('select a unit'));
 		$this->oPage->setTitle(_("Unit Management"));
@@ -75,5 +73,4 @@ class KTUnitAdminDispatcher extends KTAdminDispatcher {
 }
-
 ?>
 <?php
-//require_once('../../../../../config/dmsDefaults.php');
-
 require_once(KT_LIB_DIR . '/database/dbutil.inc');
 require_once(KT_LIB_DIR . '/users/User.inc');
@@ -19,7 +17,7 @@ require_once(KT_LIB_DIR . &quot;/authentication/builtinauthenticationprovider.inc.php
 class KTUserAdminDispatcher extends KTAdminDispatcher {
     function do_main() {
-        $this->aBreadcrumbs[] = array('action' => 'userManagement', 'name' => _('User Management'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('User Management'));
         $this->oPage->setBreadcrumbDetails(_('select a user'));
         $this->oPage->setTitle(_("User Management"));
@@ -51,7 +49,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
     function do_addUser() {
-        $this->aBreadcrumbs[] = array('action' => 'userManagement', 'name' => _('User Management'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('User Management'));
         $this->oPage->setBreadcrumbDetails(_('add a new user'));
         $this->oPage->setTitle(_("Modify User Details"));
@@ -91,7 +89,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
         $oRegistry =& KTAuthenticationProviderRegistry::getSingleton();
         $oProvider =& $oRegistry->getAuthenticationProvider($sProvider);
-        $this->aBreadcrumbs[] = array('action' => 'userManagement', 'name' => _('User Management'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('User Management'));
         $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'] . '?action=addUser', 'name' => _('add a new user'));
         $oProvider->aBreadcrumbs = $this->aBreadcrumbs;
         $oProvider->oPage->setBreadcrumbDetails($oSource->getName());
@@ -102,7 +100,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
     }
     function do_editUser() {
-        $this->aBreadcrumbs[] = array('action' => 'userManagement', 'name' => _('User Management'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('User Management'));
         $this->oPage->setBreadcrumbDetails(_('modify user details'));
         $this->oPage->setTitle(_("Modify User Details"));
@@ -147,7 +145,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
     function do_setPassword() {
-        $this->aBreadcrumbs[] = array('action' => 'userManagement', 'name' => _('User Management'));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('User Management'));
         $this->oPage->setBreadcrumbDetails(_('change user password'));
         $this->oPage->setTitle(_("Change User Password"));
@@ -436,7 +434,4 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
 }
-//$oDispatcher = new KTUserAdminDispatcher ();
-//$oDispatcher->dispatch();
-
 ?>
 <?php
-//require_once('../../../../../config/dmsDefaults.php');
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
 require_once(KT_LIB_DIR . '/validation/dispatchervalidation.inc.php');
 require_once(KT_LIB_DIR . '/templating/templating.inc.php');
@@ -9,8 +8,6 @@ require_once(KT_LIB_DIR . &#39;/workflow/workflow.inc.php&#39;);
 require_once(KT_LIB_DIR . '/workflow/workflowstate.inc.php');
 require_once(KT_LIB_DIR . '/workflow/workflowtransition.inc.php');
-$sectionName = "Administration";
-
 require_once(KT_LIB_DIR . "/templating/kt3template.inc.php");
 require_once(KT_LIB_DIR . '/permissions/permission.inc.php');
@@ -25,7 +22,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
     // {{{ do_main
     function do_main () {
         $this->aBreadcrumbs[] = array(
-            'action' => 'manageWorkflows',
+            'url' => $_SERVER['PHP_SELF'],
             'name' => _('Workflows'),
         );
@@ -85,7 +82,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
         $add_transition_fields[] = new KTLookupWidget(_('Guard Permission.'), _('Which permission must the user have in order to follow this transition?'), 'fPermissionId', $oWorkflow->getStartStateId(), $this->oPage, true, null, null, $aOptions);
         $this->aBreadcrumbs[] = array(
-            'action' => 'manageWorkflows',
+            'url' => $_SERVER['PHP_SELF'],
             'name' => _('Workflows'),
         );
         $this->aBreadcrumbs[] = array(
@@ -201,7 +198,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
         }
         $aTransitionsSelected = KTWorkflowUtil::getTransitionsFrom($oState, array('ids' => true));
         $this->aBreadcrumbs[] = array(
-            'action' => 'manageWorkflows',
+            'url' => $_SERVER['PHP_SELF'],
             'name' => _('Workflows'),
         );
         $this->aBreadcrumbs[] = array(
@@ -407,7 +404,7 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
         }
         $this->aBreadcrumbs[] = array(
-            'action' => 'manageWorkflows',
+            'url' => $_SERVER['PHP_SELF'],
             'name' => _('Workflows'),
         );
         $this->aBreadcrumbs[] = array(
@@ -486,7 +483,4 @@ class KTWorkflowDispatcher extends KTStandardDispatcher {
 }
-//$d =& new KTWorkflowDispatcher;
-//$d->dispatch();
-
 ?>