From 1c746268f8f7c7048a35c40aaaa73582c0d37707 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Thu, 2 Feb 2006 09:52:47 +0000
Subject: [PATCH] Generate path-info-lacking friendly URLs.

---
 templates/ktcore/authentication/manage.smarty                  | 2 +-
 templates/ktcore/authentication/viewsource.smarty              | 4 ++--
 templates/ktcore/document/admin/checkoutlisting.smarty         | 2 +-
 templates/ktcore/document/admin/force_checkin_confirm.smarty   | 2 +-
 templates/ktcore/documenttypes/list.smarty                     | 6 +++---
 templates/ktcore/fields/list.smarty                            | 4 ++--
 templates/ktcore/metadata/editField.smarty                     | 4 +---
 templates/ktcore/metadata/listFieldsets.smarty                 | 4 ++--
 templates/ktcore/workflow/editState.smarty                     | 2 +-
 templates/ktcore/workflow/listWorkflows.smarty                 | 4 ++--
 templates/ktstandard/action/discussion_thread_list_item.smarty | 2 +-
 templates/ktstandard/action/document_links.smarty              | 6 +++---
 templates/ktstandard/authentication/ldapadduser.smarty         | 2 +-
 13 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/templates/ktcore/authentication/manage.smarty b/templates/ktcore/authentication/manage.smarty
index 43cd6db..2de06d2 100644
--- a/templates/ktcore/authentication/manage.smarty
+++ b/templates/ktcore/authentication/manage.smarty
@@ -32,7 +32,7 @@ ensure that the Plugin is enabled.{/i18n}<p></div>
 
 <ul>
 {foreach from=$sources item=oSource}
-  <li><a href="?action=viewsource&source_id={$oSource->getId()}">{$oSource->getName()}</a></li>
+  <li><a href="{addQS}action=viewsource&source_id={$oSource->getId()}">{$oSource->getName()}{/addQS}</a></li>
 {/foreach}
 </ul>
 {else}
diff --git a/templates/ktcore/authentication/viewsource.smarty b/templates/ktcore/authentication/viewsource.smarty
index 49eca06..1779532 100644
--- a/templates/ktcore/authentication/viewsource.smarty
+++ b/templates/ktcore/authentication/viewsource.smarty
@@ -8,13 +8,13 @@
   <dt>{i18n}Provider{/i18n}</dt>
   <dd>{$provider->getName()}</dd>
 </dl>
-<a href="?action=editsource&source_id={$source->getId()}">{i18n}Edit standard configuration{/i18n}</a>
+<a href="{addQS}action=editsource&source_id={$source->getId()}{/addQS}">{i18n}Edit standard configuration{/i18n}</a>
 </fieldset>
 
 {assign var=provider_stuff value=$provider->showSource($source)}
 {if $provider_stuff}
 <fieldset><legend>{i18n}Provider configuration{/i18n}</legend>
 {$provider_stuff}
-<a href="?action=editsourceprovider&source_id={$source->getId()}">{i18n}Edit provider configuration{/i18n}</a>
+<a href="{addQS}action=editsourceprovider&source_id={$source->getId()}{/addQS}">{i18n}Edit provider configuration{/i18n}</a>
 </fieldset>
 {/if}
diff --git a/templates/ktcore/document/admin/checkoutlisting.smarty b/templates/ktcore/document/admin/checkoutlisting.smarty
index 6dd400e..f11765a 100644
--- a/templates/ktcore/document/admin/checkoutlisting.smarty
+++ b/templates/ktcore/document/admin/checkoutlisting.smarty
@@ -27,7 +27,7 @@ value=$oDocument->getCheckedOutUserId()}{php}$oUser =
 User::get($this->_tpl_vars['iUserId']);  if ($oUser) { print
 $oUser->getName(); }{/php}</td>
             <td class="descriptiveText">{$oDocument->getDisplayPath()}</td>
-            <td><a href="?action=confirm&fDocumentId={$oDocument->getId()}">{i18n}force checkin{/i18n}</a></td>
+            <td><a href="{addQS}action=confirm&fDocumentId={$oDocument->getId()}{/addQS}">{i18n}force checkin{/i18n}</a></td>
         </tr>
       {/foreach}
     </tbody>
diff --git a/templates/ktcore/document/admin/force_checkin_confirm.smarty b/templates/ktcore/document/admin/force_checkin_confirm.smarty
index 688c9bb..e3643cb 100644
--- a/templates/ktcore/document/admin/force_checkin_confirm.smarty
+++ b/templates/ktcore/document/admin/force_checkin_confirm.smarty
@@ -30,6 +30,6 @@
   <div class="form_actions">
       <input type="submit" value="{i18n}Force Checkin{/i18n}" />
       <!-- FIXME separate this even further. -->
-      <p><a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a></p>
+      <p><a href="{$smarty.server.PHP_SELF}" class="ktCancelLink">{i18n}Cancel{/i18n}</a></p>
   </div>
 </form>
diff --git a/templates/ktcore/documenttypes/list.smarty b/templates/ktcore/documenttypes/list.smarty
index 1f50713..64760b1 100644
--- a/templates/ktcore/documenttypes/list.smarty
+++ b/templates/ktcore/documenttypes/list.smarty
@@ -46,14 +46,14 @@ system.{/i18n}</p>
 </td>
 
 <td>
-    <a href="?action=edit&fDocumentTypeId={$oDocumentType->getId()}">Edit</a>
+    <a href="{addQS}action=edit&fDocumentTypeId={$oDocumentType->getId()}{/addQS}">Edit</a>
 </td>
 
 <td>
 {if $oDocumentType->getDisabled()}
-    <a href="?action=enable&fDocumentTypeId={$oDocumentType->getId()}">{i18n}Enable{/i18n}</a>
+    <a href="{addQS}action=enable&fDocumentTypeId={$oDocumentType->getId()}{/addQS}">{i18n}Enable{/i18n}</a>
 {else}
-    <a href="?action=disable&fDocumentTypeId={$oDocumentType->getId()}">{i18n}Disable{/i18n}</a>
+    <a href="{addQS}action=disable&fDocumentTypeId={$oDocumentType->getId()}{/addQS}">{i18n}Disable{/i18n}</a>
 {/if}
 </td>
 
diff --git a/templates/ktcore/fields/list.smarty b/templates/ktcore/fields/list.smarty
index 45a02bb..49a6b3f 100644
--- a/templates/ktcore/fields/list.smarty
+++ b/templates/ktcore/fields/list.smarty
@@ -15,11 +15,11 @@
 {foreach from=$fieldsets item=oFieldset}
     <tr>
 	  <td>
-        <a href="?action=edit&fFieldsetId={$oFieldset->getId()}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a> 	  
+        <a href="{addQS}action=edit&fFieldsetId={$oFieldset->getId()}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a> 	  
 	  </td>
       <td>
         
-		<a href="?action=edit&fFieldsetId={$oFieldset->getId()}">
+		<a href="{addQS}action=edit&fFieldsetId={$oFieldset->getId()}{/addQS}">
 		   { $oFieldset->getName() }
         </a>
       </td>
diff --git a/templates/ktcore/metadata/editField.smarty b/templates/ktcore/metadata/editField.smarty
index 9b047be..21c6171 100644
--- a/templates/ktcore/metadata/editField.smarty
+++ b/templates/ktcore/metadata/editField.smarty
@@ -51,9 +51,7 @@
 
 {if $oField->getHasLookup() and $oField->getHasLookupTree()}
 {assign var=iFieldId value=$oField->getId()}
-<a
-href="?action=editTree&field_id={$iFieldId}">{i18n}Manage
-lookup tree{/i18n}</a>
+<a href="{addQS}action=editTree&field_id={$iFieldId}{/addQS}">{i18n}Manage lookup tree{/i18n}</a>
 {/if}
 
 {if $aEnabledMetadata}
diff --git a/templates/ktcore/metadata/listFieldsets.smarty b/templates/ktcore/metadata/listFieldsets.smarty
index 1fa8e3f..82ab8b1 100644
--- a/templates/ktcore/metadata/listFieldsets.smarty
+++ b/templates/ktcore/metadata/listFieldsets.smarty
@@ -42,10 +42,10 @@
 {/if}
       </td>
 	  <td>
-	     <a href="?action=edit&fFieldsetId={$oFieldset->getId()}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a>
+	     <a href="{addQS}action=edit&fFieldsetId={$oFieldset->getId()}{/addQS}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a>
 	  </td>
 	  <td>
-	     <a href="?action=delete&fFieldsetId={$oFieldset->getId()}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a>
+	     <a href="{addQS}action=delete&fFieldsetId={$oFieldset->getId()}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a>
 	  </td>
 	  
     </tr>
diff --git a/templates/ktcore/workflow/editState.smarty b/templates/ktcore/workflow/editState.smarty
index c672649..97b8036 100644
--- a/templates/ktcore/workflow/editState.smarty
+++ b/templates/ktcore/workflow/editState.smarty
@@ -82,7 +82,7 @@ with a specific <strong>role</strong> (e.g. Manager) or part of a specific group
 <ul>
 {foreach from=$aTransitionsTo item=oTransition}
   <li><a
-href="?action=editTransition&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}"
+href="{addQS}action=editTransition&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}{/addQS}"
 title="Transition
 {$oTransition->getId()}">{$oTransition->getName()|escape}</a></li>
 {/foreach}
diff --git a/templates/ktcore/workflow/listWorkflows.smarty b/templates/ktcore/workflow/listWorkflows.smarty
index d13c731..d6a42f3 100644
--- a/templates/ktcore/workflow/listWorkflows.smarty
+++ b/templates/ktcore/workflow/listWorkflows.smarty
@@ -46,9 +46,9 @@ lifecycle of the document.{/i18n}</p>
     <tr>
       <td>{$oWorkflow->getName()}</td>
       <td>{if $startId===NULL}Disabled{else}Enabled{/if}</td>
-      <td><a class="ktAction ktEdit" href="?action=editWorkflow&fWorkflowId={$oWorkflow->getId()}" title="Workflow: {$oWorkflow->getId()}">Edit</a></td>
+      <td><a class="ktAction ktEdit" href="{addQS}action=editWorkflow&fWorkflowId={$oWorkflow->getId()}{/addQS}" title="Workflow: {$oWorkflow->getId()}">Edit</a></td>
       <td>
-        {if $startId!==NULL}<a href="?action=disableWorkflow&fWorkflowId={$oWorkflow->getId()}" title="Workflow: {$oWorkflow->getId()}">Disable</a>
+        {if $startId!==NULL}<a href="{addQS}action=disableWorkflow&fWorkflowId={$oWorkflow->getId()}{/addQS}" title="Workflow: {$oWorkflow->getId()}">Disable</a>
         {else}&nbsp;{/if}
       </td>
     </tr>  
diff --git a/templates/ktstandard/action/discussion_thread_list_item.smarty b/templates/ktstandard/action/discussion_thread_list_item.smarty
index 3f203c6..c397634 100644
--- a/templates/ktstandard/action/discussion_thread_list_item.smarty
+++ b/templates/ktstandard/action/discussion_thread_list_item.smarty
@@ -1,5 +1,5 @@
 <tr>
-  <td><a href="?action=viewThread&fDocumentId={$context->oDocument->getId()}&fThreadId={$thread->getId()}">{$first_comment->getSubject()}</a></td>
+  <td><a href="{addQS}action=viewThread&fDocumentId={$context->oDocument->getId()}&fThreadId={$thread->getId()}{/addQS}">{$first_comment->getSubject()}</a></td>
   <td>{$creator->getName()}</td>
   <td>{$thread->getNumberOfViews()}</td>
   <td>{$thread->getNumberOfReplies()}</td>
diff --git a/templates/ktstandard/action/document_links.smarty b/templates/ktstandard/action/document_links.smarty
index 42b4524..bd5ad5a 100644
--- a/templates/ktstandard/action/document_links.smarty
+++ b/templates/ktstandard/action/document_links.smarty
@@ -28,7 +28,7 @@
 {assign var="target" value=$link->getChildDocument()}
 
         <tr>
-            <td><a href="?action=delete&fDocumentId={$context->oDocument->getId()}&fDocumentLinkId={$link->getId()}" class="ktAction ktDelete">Delete</a></td>
+            <td><a href="{addQS}action=delete&fDocumentId={$context->oDocument->getId()}&fDocumentLinkId={$link->getId()}{/addQS}" class="ktAction ktDelete">Delete</a></td>
             <td><a href="{"viewDocument"|generateControllerUrl}&qs[fDocumentId]={$target->getId()}&qs[action]=main">{$target->getName()}</a></td> 
             <td>{$type->getName()}</td>
             <td>Linked <b>from</b> this document</td>
@@ -68,7 +68,7 @@
 
 
 {if $write_permission}
-<a class="ktAction ktAdd ktInline" href="?action=new&fDocumentId={$context->oDocument->getId()}">Add a new link</a>
-<a href="?action=new&fDocumentId={$context->oDocument->getId()}&fFolderId={$context->oDocument->getFolderId()}">Add a new link</a>.
+<a class="ktAction ktAdd ktInline" href="{addQS}action=new&fDocumentId={$context->oDocument->getId()}{/addQS}">Add a new link</a>
+<a href="{addQS}action=new&fDocumentId={$context->oDocument->getId()}&fFolderId={$context->oDocument->getFolderId()}{addQS}">Add a new link</a>.
 {/if}
 
diff --git a/templates/ktstandard/authentication/ldapadduser.smarty b/templates/ktstandard/authentication/ldapadduser.smarty
index 3aaa349..bb7e55e 100644
--- a/templates/ktstandard/authentication/ldapadduser.smarty
+++ b/templates/ktstandard/authentication/ldapadduser.smarty
@@ -10,7 +10,7 @@
       <input type="hidden" name="dn" value="{$dn}" />
       <div class="form_actions">
          <input type="submit" name="submit[create]" value="{i18n}create user{/i18n}" />
-         <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
+         <a href="{$smarty.server.PHP_SELF}" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
       </div>
    </fieldset>
    </form>
--
libgit2 0.21.4