correct path_info irregularities.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4774 c91229c3-7414-0410-bfa2-8a42b809f60b

correct path_info irregularities.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4774 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 5e6ae707
Showing 24 changed files with 86 additions and 40 deletions
admin.php
config/dmsDefaults.php
docs/INSTALL.txt
lib/templating/smartytemplate.inc.php
lib/util/ktutil.inc
plugins/ktcore/admin/workflows.php
templates/kt3/admin_categories.smarty
templates/kt3/admin_items.smarty
templates/ktcore/manage_permissions.smarty
templates/ktcore/metadata/conditional/manageConditional.smarty
templates/ktcore/principals/addgroup.smarty
templates/ktcore/principals/adduser.smarty
templates/ktcore/principals/editgroup.smarty
templates/ktcore/principals/edituser.smarty
templates/ktcore/principals/groupadmin.smarty
templates/ktcore/principals/groups_managesubgroups.smarty
templates/ktcore/principals/groups_manageusers.smarty
templates/ktcore/principals/orgadmin.smarty
templates/ktcore/principals/password.smarty
templates/ktcore/principals/preferences.smarty
@@ -13,7 +13,7 @@ class AdminSplashDispatcher extends KTAdminDispatcher {
     function AdminSplashDispatcher() {
         $this->aBreadcrumbs = array(
-            array('url' => KTUtil::getRequestScriptName($_SERVER), 'name' => 'Administration'),
+            array('url' => $_SERVER['PHP_SELF'], 'name' => 'Administration'),
         );
         parent::KTAdminDispatcher();
@@ -37,7 +37,7 @@ class AdminSplashDispatcher extends KTAdminDispatcher {
         $aTemplateData = array(
               "context" => $this,
               "categories" => $categories,
-              "baseurl" => KTUtil::getRequestScriptName($_SERVER),
+              "baseurl" => $_SERVER['PHP_SELF'],
         );
         return $oTemplate->render($aTemplateData);				
     }
@@ -51,7 +51,7 @@ class AdminSplashDispatcher extends KTAdminDispatcher {
         $aCategory = $oRegistry->getCategory($category);		
         $aItems = $oRegistry->getItemsForCategory($category);
-        $this->aBreadcrumbs[] = array("name" => $aCategory["title"]);
+        $this->aBreadcrumbs[] = array("name" => $aCategory["title"], "url" => KTUtil::ktLink('admin.php',$category));
         $this->oPage->title = _("DMS Administration") . ": " . $aCategory["title"];
@@ -61,13 +61,14 @@ class AdminSplashDispatcher extends KTAdminDispatcher {
               "context" => $this,
               "category" => $aCategory,
               "items" => $aItems, 
-              "baseurl" => KTUtil::getRequestScriptName($_SERVER),
+              "baseurl" =>  $_SERVER['PHP_SELF'],
         );
         return $oTemplate->render($aTemplateData);				
     }
 }
 $sub_url = KTUtil::arrayGet($_SERVER, 'PATH_INFO');
+
 $sub_url = trim($sub_url);
 $sub_url= trim($sub_url, "/");
@@ -84,8 +85,8 @@ if (empty($sub_url)) {
        $aCategory = $oRegistry->getCategory($aParts[0]);			   
        $oDispatcher->aBreadcrumbs = array();
-       $oDispatcher->aBreadcrumbs[] = array('url' => KTUtil::getRequestScriptName($_SERVER), 'name' => 'Administration');
-       $oDispatcher->aBreadcrumbs[] = array("name" => $aCategory['title'], "url" => KTUtil::getRequestScriptName($_SERVER) . '/' . $aParts[0]);
+       $oDispatcher->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => 'Administration');
+       $oDispatcher->aBreadcrumbs[] = array("name" => $aCategory['title'], "url" => KTUtil::ktLink('admin.php',$aParts[0]));
     } else {
        // FIXME (minor) redirect to no-suburl?
        $oDispatcher = new AdminSplashDispatcher();
@@ -371,7 +371,7 @@ if (array_key_exists(&#39;HTTPS&#39;, $_SERVER)) {
 }
 $oKTConfig->setdefaultns("KnowledgeTree", "rootUrl", $KTInit->guessRootUrl());
 $oKTConfig->setdefaultns("KnowledgeTree", "execSearchPath", $_SERVER['PATH']);
-$oKTConfig->setdefaultns("KnowledgeTree", "pathInfoSupport", true);
+$oKTConfig->setdefaultns("KnowledgeTree", "pathInfoSupport", false);
 $oKTConfig->setdefaultns("storage", "manager", 'KTOnDiskPathStorageManager');
 $oKTConfig->setdefaultns("config", "useDatabaseConfiguration", false);
 $oKTConfig->setdefaultns("tweaks", "browseToRoot", false);
@@ -121,6 +121,11 @@ Installing this package is beyond the scope of this document - please
 consult the KnowledgeTree Wiki at http://support.ktdms.com/confluence/
 to see how others have approached this on your platform. 
+NOTE:  if you install the packages outside of the path normally searched
+by your operating system (e.g. in c:\antiword or /usr/local/bin) you will
+need to specify the _full_ path to the actual applications (e.g. 
+/usr/local/bin/pdftotext).
+
 Troubleshooting
 ---------------
@@ -77,6 +77,7 @@ class KTSmartyTemplate extends KTTemplate {
         $smarty->register_function('entity_radios', array('KTSmartyTemplate', 'entity_radios'));
         $smarty->register_block('i18n', array('KTSmartyTemplate', 'i18n_block'), false);
         $smarty->register_modifier('addQueryString', array('KTSmartyTemplate', 'addQueryString'));
+        $smarty->register_function('ktLink', array('KTSmartyTemplate', 'ktLink'));
         $smarty->register_modifier('addQS', array('KTSmartyTemplate', 'addQueryString'));
         $smarty->register_modifier('addQueryStringSelf', array('KTSmartyTemplate', 'addQueryStringSelf'));
         $smarty->register_modifier('addQSSelf', array('KTSmartyTemplate', 'addQueryStringSelf'));
@@ -240,9 +241,29 @@ class KTSmartyTemplate extends KTTemplate {
         return KTUtil::addQueryString($url, $qs);
     }
+    
+    /* 
+     * ktLink generates a fully prepared link for KT.
+     *
+     * It takes into account kt_path_info requirements,
+     * rootUrl requirements, etc.
+     *
+     * To do this effectively, you need three things:
+     *
+     *   @param base              e.g. /admin.php
+     *   @param subpath           e.g. /security/permissions/
+     *   @param query             e.g. fFolder=1&fMyVar=2
+     *
+     */
+    function ktLink($params, &$smarty) {
+        return KTUtil::ktLink($params['base'], $params['subpath'], $params['query']);
+    }
+
+
     function addQueryStringSelf($qs) {
         return KTUtil::addQueryStringSelf($qs);
     }
+
 }
 ?>
@@ -450,6 +450,27 @@ class KTUtil {
     }
     // }}}
+    // {{{ ktLink
+    function ktLink($base, $subpath='', $qs='') {
+        $KTConfig =& KTConfig::getSingleton();
+        $root = $KTConfig->get("KnowledgeTree/rootUrl");
+        $url = $root . '/' . $base;
+        $query = '';
+        
+        $hasPathInfo = $KTConfig->get("KnowledgeTree/pathInfoSupport");
+        if ($hasPathInfo) {
+            $url .= $subpath;
+        } else {
+            $query = 'kt_path_info=' . $subpath;
+            if (!empty($qs)) {
+               $query .= '&';
+            }
+        }
+        $query .= $qs;
+        return KTUtil::addQueryString($url, $query);
+    }
+    // }}}
+
     // {{{ addQueryStringSelf
     function addQueryStringSelf($qs) {
         return KTUtil::addQueryString($_SERVER['PHP_SELF'], $qs);
@@ -36,7 +36,7 @@ class WorkflowNavigationPortlet extends KTPortlet {
         if (is_null($this->oWorkflow)) { return _('No Workflow Selected.'); }
         $aAdminPages = array();
-        $aAdminPages[] = array('name' => _('Overview'), 'url' => $_SERVER['PHP_SELF'] . '?action=editWorkflow&fWorkflowId=' . $this->oWorkflow->getId());
+        $aAdminPages[] = array('name' => _('Overview'), 'url' => KTUtil::addQueryString($_SERVER['PHP_SELF'], '?action=editWorkflow&fWorkflowId=' . $this->oWorkflow->getId()));
         $aAdminPages[] = array('name' => _('States'), 'url' => $_SERVER['PHP_SELF'] . '?action=manageStates&fWorkflowId=' . $this->oWorkflow->getId());
         $aAdminPages[] = array('name' => _('Transitions'), 'url' => $_SERVER['PHP_SELF'] . '?action=manageTransitions&fWorkflowId=' . $this->oWorkflow->getId());
         $aAdminPages[] = array('name' => _('Actions'), 'url' => $_SERVER['PHP_SELF'] . '?action=manageActions&fWorkflowId=' . $this->oWorkflow->getId());
 <dl class="panel_menu">
    {foreach item=aCategory from=$categories}
-   <dt><a href="{$smarty.server.PHP_SELF}?action=viewCategory&fCategory={$aCategory.name}">{$aCategory.title}</a></dt>
+   <dt>{capture assign="cat_id"}{$aCategory.name}{/capture}<a href="{$smarty.server.PHP_SELF|addQueryString:"action=viewCategory&fCategory=$cat_id"}">{$aCategory.title}</a></dt>
    <dd class="descriptiveText">{$aCategory.description}</dd>
    {/foreach}
 </dl>
 \ No newline at end of file
@@ -5,7 +5,7 @@
 {else}
 <dl class="panel_menu">
    {foreach item=aItem from=$items}
-   <dt><a href="{$baseurl}/{$aItem.fullname}">{$aItem.title}</a></dt>
+   <dt><a href="{ktLink base="admin.php" subpath="`$aItem.fullname`"}">{$aItem.title}</a></dt>
    <dd class="descriptiveText">{$aItem.description}</dd>
    {/foreach}
 </dl>
@@ -47,7 +47,7 @@
             </td> -->
             <td>
                <a
-href="{$smarty.server.PHP_SELF}?action=deletePermission&id={$oPerm->getId()}"
+href="{addQS}action=deletePermission&id={$oPerm->getId()}{/addQS}"
 class="ktAction ktDelete">{i18n}Delete Permission{/i18n}</a>
             </td>
           { /if }
-<h2>{i18n}Manage conditional fieldset{/i18n}<h2>
+<h2>{i18n}Manage conditional fieldset{/i18n}</h2>
 {if $sIncomplete || !$oFieldset->getIsComplete()}
 <div class="ktError">
@@ -27,9 +27,9 @@ to complete{/i18n}: {$sIncomplete|escape}&lt;/p&gt;
 <h2>{i18n}Conditional type{/i18n}</h2>
 {if $oFieldset->getIsComplex()}
-{i18n}Complex{/i18n}: <a
+<p>{i18n}Complex{/i18n}: <a
 href="{$rootUrl}/plugins/ktcore/admin/manageConditionals.php?action=editComplexFieldset&fieldset_id={$oFieldset->getId()}">{i18n}Manage
-complex conditional{/i18n}</a>
+complex conditional{/i18n}</a></p>
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <input type="hidden" name="action" value="changeToSimple" />
@@ -39,8 +39,9 @@ complex conditional{/i18n}&lt;/a&gt;
 {else}
-{i18n}Simple{/i18n}: <a
+<p>{i18n}Simple{/i18n}: <a
 href="{$rootUrl}/plugins/ktcore/admin/manageConditionals.php?action=editFieldset&fieldset_id={$oFieldset->getId()}">{i18n}Manage simple conditional{/i18n}</a>
+</p>
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <input type="hidden" name="action" value="changeToComplex" />
@@ -13,7 +13,7 @@
       {/foreach}
       <div class="form_actions">
          <input type="submit" value="{i18n}create group{/i18n}" />
-         <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
       </div>
    </fieldset>
    </form>
@@ -36,7 +36,7 @@ within KnowledgeTree below.{/i18n}&lt;/p&gt;
       {/foreach}
       <div class="form_actions">
          <input type="submit" value="{i18n}create user{/i18n}" />
-         <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
       </div>
    </fieldset>
    </form>
@@ -14,7 +14,7 @@ the system&#39;s information about group &lt;strong&gt;#name&lt;/strong&gt;{/i18n}&lt;/p&gt;
       {/foreach}
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes to group{/i18n}" />
-         <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
       </div>
    </fieldset>
    </form>
@@ -12,7 +12,7 @@
       {/foreach}
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes{/i18n}" />
-         <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
       </div>
    </fieldset>
    </form>
@@ -4,7 +4,7 @@
 <legend>Add New Group</legend>
 <p class="descriptiveText">{i18n}Groups allow you to assign permissions and roles to a 
 number of different users at once.{/i18n}</p>
-<p><a href="?action=addGroup" class="ktAction ktAddGroup" style="float: left; padding-right: 0.5em;">Add Group</a><a href="?action=addGroup">Add a new group</a>.</p>
+<p><a href="{addQS}action=addGroup{/addQS}" class="ktAction ktAddGroup ktInline">Add Group</a><a href="{addQS}action=addGroup{/addQS}">Add a new group</a>.</p>
 </fieldset>
 <!-- we roll both in here. -->
 <form action="{$smarty.server.PHP_SELF}" method="POST">
@@ -12,7 +12,7 @@ number of different users at once.{/i18n}&lt;/p&gt;
 <legend>{i18n}Search for groups{/i18n}</legend>
 <p class="descriptiveText">{i18n}Since there may be many groups in the
 system, please type a few letters from the group's name to begin.
-Alternatively, <a href="?show_all=1">view all groups</a> (note that this
+Alternatively, <a href="{addQS}show_all=1{/addQS}">view all groups</a> (note that this
 action may take some time if you have many groups).{/i18n}</p>
 {foreach item=oWidget from=$search_fields}
@@ -53,13 +53,13 @@ action may take some time if you have many groups).{/i18n}&lt;/p&gt;
 {$context->_getUnitName($oGroup)}
 {/if}
 	</td>
-        <td><a href="?action=editGroup&group_id={$oGroup->getId()}"
+        <td><a href="{addQS}action=editGroup&group_id={$oGroup->getId()}{/addQS}"
 class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
         <td><a
-href="?action=manageUsers&group_id={$oGroup->getId()}">{i18n}Manage Users{/i18n}</a></td>  
+href="{addQS}action=manageUsers&group_id={$oGroup->getId()}{/addQS}">{i18n}Manage Users{/i18n}</a></td>  
         <td><a
-href="?action=manageSubgroups&group_id={$oGroup->getId()}">{i18n}Manage sub-groups{/i18n}</a></td>
-        <td><a href="?action=deleteGroup&group_id={$oGroup->getId()}"
+href="{addQS}action=manageSubgroups&group_id={$oGroup->getId()}{/addQS}">{i18n}Manage sub-groups{/i18n}</a></td>
+        <td><a href="{addQS}action=deleteGroup&group_id={$oGroup->getId()}{/addQS}"
 class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
      </tr>   
      {/foreach}
@@ -63,7 +63,7 @@
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes{/i18n}" />
-         <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
       </div>
    </fieldset>
    </form>
@@ -62,7 +62,7 @@
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes{/i18n}" />
-         <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
       </div>
    </fieldset>
    </form>
@@ -36,7 +36,7 @@ asd
      {foreach item=oOrg from=$org_list}
      <tr>
         <td>{$oOrg->getName()}</td>
-        <td><a href="?org_id={$oOrg->getId()}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
+        <td><a href="{addQS}org_id={$oOrg->getId()}{/addQS}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
      </tr>   
      {/foreach}
@@ -15,9 +15,6 @@
     <div class="form_actions">
         <input type="submit" value="{i18n}Change your password{/i18n}" />
-        <!-- FIXME add CSS for secondary actions. -->
-        <!-- Commenting this out due to redundancy. Why is it here? 
-             <p><a href="?action=setPassword">{i18n}Change your password.{/i18n}</a></p> -->
     </div>
 </fieldset>
@@ -15,7 +15,7 @@
     <div class="form_actions">
         <input type="submit" value="{i18n}Update your details{/i18n}" />
         <!-- FIXME add CSS for secondary actions. -->
-        <p><a href="?action=setPassword">{i18n}Change your password.{/i18n}</a></p>
+        <p><a href="{addQS}action=setPassword{/addQS}">{i18n}Change your password.{/i18n}</a></p>
     </div>
 </fieldset>
@@ -35,7 +35,7 @@
    <div class="form_actions">
       <input type="submit" value="{i18n}update role information{/i18n}" />
-      <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+      <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
    </div class="form_actions">
 </fieldset>
 </form>
@@ -55,8 +55,8 @@
      {foreach item=oRole from=$roles}
      <tr>
         <td>{$oRole->getName()}</td>
-        <td><a href="?action=editRole&role_id={$oRole->getId()}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
-        <td><a href="?action=deleteRole&role_id={$oRole->getId()}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
+        <td><a href="{addQS}action=editRole&role_id={$oRole->getId()}{/addQS}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
+        <td><a href="{addQS}action=deleteRole&role_id={$oRole->getId()}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
      </tr>   
      {/foreach}
      {else}
@@ -9,7 +9,7 @@ of the document management system to a particular part of your
 organisation.  Unit administrators have additional right within that
 portion of the document management system, and they can also adjust the
 membership of groups that belong to the unit.{/i18n}</p>
-<p><a href="?action=addGroup" class="ktAction ktAddGroup ktInline">Add Unit</a><a href="?action=addUnit">Add a new unit</a>.</p>
+<p><a href="{addQS}action=addGroup{/addQS}" class="ktAction ktAddGroup ktInline">Add Unit</a><a href="{addQS}action=addUnit{/addQS}">Add a new unit</a>.</p>
 </fieldset>
 <table class="listing">
@@ -24,8 +24,8 @@ membership of groups that belong to the unit.{/i18n}&lt;/p&gt;
      {foreach item=oUnit from=$unit_list}
      <tr>
         <td>{$oUnit->getName()}</td>
-        <td><a href="?action=editUnit&unit_id={$oUnit->getId()}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
-        <td><a href="?action=deleteUnit&unit_id={$oUnit->getId()}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
+        <td><a href="{addQS}action=editUnit&unit_id={$oUnit->getId()}{/addQS}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
+        <td><a href="{addQS}action=deleteUnit&unit_id={$oUnit->getId()}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
      </tr>   
      {/foreach}
 </tbody>
@@ -12,7 +12,7 @@
       <div class="form_actions">
          <input type="submit" value="{i18n}change password{/i18n}" />
-         <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
       </div>
    </fieldset>
 </form>
@@ -64,7 +64,7 @@
       <div class="form_actions">
          <input type="submit" value="{i18n}save changes{/i18n}" />
-         <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <a href="{addQS}action=main{/addQS}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
       </div>
    </fieldset>
    </form>