Use addQS to generate correct URLs.

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

Use addQS to generate correct URLs.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4783 c91229c3-7414-0410-bfa2-8a42b809f60b
Neil Blakey-Milner
1 parent d1e8ad59
Showing 16 changed files with 40 additions and 47 deletions
templates/kt3/document/edit.smarty
templates/kt3/document/metadata_history.smarty
templates/kt3/fieldsets/generic.smarty
templates/ktcore/document/admin/linktypesadmin.smarty
templates/ktcore/document/comparison_version_select.smarty
templates/ktcore/document/document_permissions.smarty
templates/ktcore/folder/permissions.smarty
templates/ktcore/folder/roles.smarty
templates/ktcore/help_with_edit.smarty
templates/ktcore/manage_fieldsets.smarty
templates/ktcore/manage_help.smarty
templates/ktcore/metadata/editFieldset.smarty
templates/ktcore/search/administration/savedsearches.smarty
templates/ktcore/workflow/editWorkflow.smarty
templates/ktcore/workflow/manageStates.smarty
templates/ktcore/workflow/manageTransitions.smarty
@@ -13,7 +13,7 @@
 <h2>{i18n}Editing{/i18n}: {$document->getName()}</h2>
-<p class="descriptiveText">{i18n}Change the <strong><a href="{$smarty.server.PHP_SELF}?action=selectType&fDocumentId={$document->getId()}">document type</a></strong>{/i18n}</p>
+<p class="descriptiveText">{i18n}Change the <strong><a href="{addQS}action=selectType&fDocumentId={$document->getId()}{/addQS}">document type</a></strong>{/i18n}</p>
 <p class="descriptiveText">{i18n}The following document metadata is available for editing.{/i18n}</p>
@@ -27,10 +27,10 @@
                 {if ($document->getMetadataVersion() == $oVersion->getMetadataVersion())}
                    <strong>{i18n}current version{/i18n}</strong>
                 {else}
-                   <a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fBaseVersion={$oVersion->getMetadataVersionId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare with current{/i18n}</a></td>                
+                   <a href="{addQS}action=viewComparison&fDocumentId={$document->getId()}&fBaseVersion={$oVersion->getMetadataVersionId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}{/addQS}">{i18n}compare with current{/i18n}</a></td>                
                 {/if}
                 </td>     
-                <td><a href="{$smarty.server.PHP_SELF}?action=startComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare with other version{/i18n}</a></td>
+                <td><a href="{addQS}action=startComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}{/addQS}">{i18n}compare with other version{/i18n}</a></td>
             </tr>
             {/foreach}
         </tbody>
@@ -27,8 +27,8 @@
 {else}
 {i18n}No workflow{/i18n}
 {/if}
-(<a
-href="{$rootUrl}/action.php/ktcore.actions.document.workflow?fDocumentId={$document->getId()}">{i18n}manage workflow{/i18n}</a>)
+{assign var=iDocumentId value=$document->getId()}
+ (<a href="{ktLink base="action.php" subpath="/ktcore.actions.document.workflow" query="fDocumentId=`$iDocumentId`"}">{i18n}manage workflow{/i18n}</a>)
 </dd>
     </dl>
     <div class="floatClear"><!-- --> </div>
@@ -74,8 +74,8 @@ links of that type within the system.{/i18n}&lt;/p&gt;
   <tr class="{cycle values=even,odd}">
     <td>{$oLinkType->getName()}</td>
     <td class="descriptiveText">{$oLinkType->getDescription()}</td>
-    <td><a href="{$smarty.server.PHP_SELF}?action=edit&fLinkTypeId={$oLinkType->iId}" class="ktAction ktEdit">{i18n}edit link type{/i18n}</a></td>
-    <td><a href="{$smarty.server.PHP_SELF}?action=delete&fLinksToDelete[]={$oLinkType->iId}" class="ktAction ktDelete">{i18n}edit link type{/i18n}</a></td>
+    <td><a href="{addQS}action=edit&fLinkTypeId={$oLinkType->iId}{/addQS}" class="ktAction ktEdit">{i18n}edit link type{/i18n}</a></td>
+    <td><a href="{addQS}action=delete&fLinksToDelete[]={$oLinkType->iId}{/addQS}" class="ktAction ktDelete">{i18n}edit link type{/i18n}</a></td>
   </tr>
   {/foreach}
 </tbody>
@@ -20,7 +20,7 @@
                 {if ($document->getCurrentMetadataVersionId() == $oVersion->getCurrentMetadataVersionId())}
                    <strong>{i18n}comparing against this version{/i18n}</strong>
                 {else}
-                   <a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fBaseVersion={$document->getCurrentMetadataVersionId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare{/i18n}</a>
+                   <a href="{addQS}action=viewComparison&fDocumentId={$document->getId()}&fBaseVersion={$document->getCurrentMetadataVersionId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}{/addQS}">{i18n}compare{/i18n}</a>
                 {/if}
                 </td>
             </tr>
@@ -97,12 +97,10 @@ td.false { background-color: #ffaaaa; text-align: centre }
 padding: 2px; padding-right: 1em; padding-left: 1em">
 { if $inherited }
 {i18n}Inherited from{/i18n}: {$inherited}
-{* [<a
-href="{$smarty.server.PHP_SELF}?action=copyPermissions&fDocumentID={$iDocumentID}">{i18n}Copy{/i18n}</a>]
-*}
+{* [<a href="{addQS}action=copyPermissions&fDocumentID={$iDocumentID}{/addQS}">{i18n}Copy{/i18n}</a>] *}
 { else }
 [<a
-href="{$smarty.server.PHP_SELF}?action=inheritPermissions&fDocumentID={$iDocumentID}">{i18n}Use
+href="{addQS}action=inheritPermissions&fDocumentID={$iDocumentID}{/addQS}">{i18n}Use
 parent's permissions{/i18n}</a>]
 { /if }
 </span>
@@ -174,11 +174,9 @@ value=&quot;{$iRoleId}&quot;&gt;&lt;/td&gt;
 padding: 2px; padding-right: 1em; padding-left: 1em">
 { if $inherited }
 {i18n}Inherited from:{/i18n} {$inherited}
-[<a
-href="{$smarty.server.PHP_SELF}?action=copyPermissions&fFolderId={$iFolderId}">{i18n}Copy{/i18n}</a>]
+[<a href="{addQS}action=copyPermissions&fFolderId={$iFolderId}{/addQS}">{i18n}Copy{/i18n}</a>]
 { else }
-[<a
-href="{$smarty.server.PHP_SELF}?action=inheritPermissions&fFolderId={$iFolderId}">{i18n}Use
+[<a href="{addQS}action=inheritPermissions&fFolderId={$iFolderId}{/addQS}">{i18n}Use
 parent's permissions{/i18n}</a>]
 { /if }
 </span>
@@ -36,11 +36,11 @@ role allocations may take a some time, depending on the number of folders below 
            {/if}
         </td>
         {if ($aRole.allocation_id === null)}
-        <td colspan="2"><a href="{$smarty.server.PHP_SELF}?action=overrideParent&role_id={$role_id}&fFolderId={$context->oFolder->getId()}">{i18n}Override Parent Allocation{/i18n}</a></td>
+        <td colspan="2"><a href="{addQS}action=overrideParent&role_id={$role_id}&fFolderId={$context->oFolder->getId()}{/addQS}">{i18n}Override Parent Allocation{/i18n}</a></td>
         {else}
-<!--        <td><a href="{$smarty.server.PHP_SELF}?action=editRoleUsers&alloc_id={$aRole.allocation_id}&fFolderId={$context->oFolder->getId()}" class="ktAction ktEdit" title="{i18n}Edit{/i18n}">Edit</a></td> -->
-        <td><a href="{$smarty.server.PHP_SELF}?action=editRoleGroups&alloc_id={$aRole.allocation_id}&fFolderId={$context->oFolder->getId()}" class="ktAction ktEdit" title="{i18n}Edit{/i18n}">Edit</a></td>
-        <td><a href="{$smarty.server.PHP_SELF}?action=useParent&role_id={$role_id}&fFolderId={$context->oFolder->getId()}" class="ktAction ktDelete" title="{i18n}Use parent's allocation{/i18n}">{i18n}Use parent's allocation{/i18n}</a></td>
+<!--        <td><a href="{addQS}action=editRoleUsers&alloc_id={$aRole.allocation_id}&fFolderId={$context->oFolder->getId()}{/addQS}" class="ktAction ktEdit" title="{i18n}Edit{/i18n}">Edit</a></td> -->
+        <td><a href="{addQS}action=editRoleGroups&alloc_id={$aRole.allocation_id}&fFolderId={$context->oFolder->getId()}{/addQS}" class="ktAction ktEdit" title="{i18n}Edit{/i18n}">Edit</a></td>
+        <td><a href="{addQS}action=useParent&role_id={$role_id}&fFolderId={$context->oFolder->getId()}{/addQS}" class="ktAction ktDelete" title="{i18n}Use parent's allocation{/i18n}">{i18n}Use parent's allocation{/i18n}</a></td>
         {/if}
     </tr>
 {/foreach}
@@ -5,5 +5,5 @@
 {/if}
 <hr />
-<p><a href="{$rootUrl}/admin.php/misc/helpmanagement?action=customise&name={$target_name}" class="ktAction ktEdit" style="float:
-left; padding-right: 0.5em;">{i18n}Edit this help page.{/i18n}</a><a href="{$rootUrl}/admin.php/misc/helpmanagement?action=customise&name={$target_name}">{i18n}Edit this help page.{/i18n}</a></p>
 \ No newline at end of file
+<p><a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="?action=customise&name=`$target_name`"}" class="ktAction ktEdit" style="float:
+left; padding-right: 0.5em;">{i18n}Edit this help page.{/i18n}</a><a href="{$rootUrl}/admin.php/misc/helpmanagement?action=customise&name={$target_name}">{i18n}Edit this help page.{/i18n}</a></p>
@@ -17,13 +17,11 @@
      </td>
      <td>
-       <a
-           href="{$smarty.server.PHP_SELF}?action=editFieldset&id={$oFieldSet->getId()}">{i18n}Edit{/i18n}</a>
+       <a href="{addQS}action=editFieldset&id={$oFieldSet->getId()}{/addQS}">{i18n}Edit{/i18n}</a>
      </td>
      <td>
        {if $oFieldSet->bMandatory == false}
-       <a
-           href="{$smarty.server.PHP_SELF}?action=deleteFieldset&id={$oFieldSet->getId()}">{i18n}Delete{/i18n}</a>
+       <a href="{addQS}action=deleteFieldset&id={$oFieldSet->getId()}{/addQS}">{i18n}Delete{/i18n}</a>
        {else}
        {i18n}Built-in set.{/i18n}
        {/if}
@@ -16,10 +16,10 @@ via the help system and click on &lt;strong&gt;customise this help file&lt;/strong&gt;.{/i18
 { foreach item=oHelpReplacement from=$helpreplacements }
 <tr class="{cycle values="odd,even"}">
 <td>
-<a href="{$smarty.server.PHP_SELF}?action=editReplacement&id={$oHelpReplacement->iId}">{ $oHelpReplacement->sName }</a>
+<a href="{addQS}action=editReplacement&id={$oHelpReplacement->iId}{/addQS}">{ $oHelpReplacement->sName }</a>
 </td>
 <td>
-<a href="{$smarty.server.PHP_SELF}?action=deleteReplacement&id={$oHelpReplacement->iId}">Delete</a>
+<a href="{addQS}action=deleteReplacement&id={$oHelpReplacement->iId}{/addQS}">Delete</a>
 </td>
 </tr>
 { /foreach }
@@ -126,8 +126,7 @@ field can depend on the user&#39;s selections for the others.{/i18n}
   <li><input type="checkbox" name="fields[]"
 value="{$oField->getId()}" />
 {$oField->getName()|escape}
-(<a
-href="{$smarty.server.PHP_SELF}?action=editField&fFieldId={$oField->getId()}&fFieldsetId={$oFieldset->getId()}">{i18n}edit{/i18n}</a>)
+(<a href="{addQS}action=editField&fFieldId={$oField->getId()}&fFieldsetId={$oFieldset->getId()}{/addQS}">{i18n}edit{/i18n}</a>)
 </li>
 {/foreach}
 </ul>
@@ -31,8 +31,8 @@ newsletters, etc.) based on a category or fieldset value.{/i18n}&lt;/p&gt;
 {foreach item=oSearch from=$saved_searches}
     <tr>
         <td>{$oSearch->getName()}</td>
-        <td><a href="{$smarty.server.PHP_SELF}?action=edit&fSavedSearchId={$oSearch->getId()}" class="ktAction ktEdit">Edit</a></td>
-        <td><a href="{$smarty.server.PHP_SELF}?action=delete&fSavedSearchId={$oSearch->getId()}" class="ktAction ktDelete">Edit</a></td>
+        <td><a href="{addQS}action=edit&fSavedSearchId={$oSearch->getId()}{/addQS}" class="ktAction ktEdit">Edit</a></td>
+        <td><a href="{addQS}action=delete&fSavedSearchId={$oSearch->getId()}{/addQS}" class="ktAction ktDelete">Edit</a></td>
         <td><a href="{"booleanSearch"|generateControllerUrl}&qs[action]=performSearch&qs[fSavedSearchId]={$oSearch->getId()}">Run Search</a></td>
     </tr>
 {/foreach}
@@ -28,7 +28,7 @@ Workflow menu (on the left) to create new states.&lt;/p&gt;&lt;/div&gt;
 {else}
 <ul id="workflow-states-list">
 {foreach item=oState from=$aStates}
-    <li><span class="workflow_element">State:</span> <a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}" class="workflow_label">{$oState->getName()}</a>
+    <li><span class="workflow_element">State:</span> <a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" class="workflow_label">{$oState->getName()}</a>
     <ul>
         <li>{i18n}Notified groups &amp; roles:{/i18n}
         {$context->getNotificationStringForState($oState)}
@@ -48,4 +48,4 @@ Workflow menu (on the left) to create new states.&lt;/p&gt;&lt;/div&gt;
     </li>
 {/foreach}
 </ul>
-{/if}
 \ No newline at end of file
+{/if}
@@ -13,9 +13,9 @@ while the workflow has no documents or document-versions assigned to the workflo
 <legend>Create a new state</legend>
 <p class="descriptiveText">A critical part of workflow is the creation of
 various different states for documents.</p>
-<a href="{$smarty.server.PHP_SELF}?action=createState&fWorkflowId={$oWorkflow->getId()}"
+<a href="{addQS}action=createState&fWorkflowId={$oWorkflow->getId()}{/addQS}"
    class="ktAction ktInline ktAdd">{i18n}Create a new state{/i18n}</a>
-<a href="{$smarty.server.PHP_SELF}?action=createState&fWorkflowId={$oWorkflow->getId()}">{i18n}Create a new state{/i18n}</a>
+<a href="{addQS}action=createState&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Create a new state{/i18n}</a>
 </fieldset>
@@ -25,17 +25,17 @@ various different states for documents.&lt;/p&gt;
 {else}
 <ul id="workflow-states-list">
 {foreach item=oState from=$workflow_info.states}
-    <li><span class="workflow_element">State:</span> <a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}" class="workflow_label">{$oState->getName()}</a>
-        {if ($workflow_info.can_delete)} | <span class="ktActionLink ktDelete"><a href="{$smarty.server.PHP_SELF}?action=deleteState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}" >{i18n}Delete{/i18n}</a></span>{/if}
+    <li><span class="workflow_element">State:</span> <a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" class="workflow_label">{$oState->getName()}</a>
+        {if ($workflow_info.can_delete)} | <span class="ktActionLink ktDelete"><a href="{addQS}action=deleteState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" >{i18n}Delete{/i18n}</a></span>{/if}
     <ul>
-        <li><a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}">{i18n}Notified groups & roles:{/i18n}</a>
+        <li><a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Notified groups & roles:{/i18n}</a>
         {$context->getNotificationStringForState($oState)}
         </li>
-        <li><a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}">{i18n}Controlled Actions available: {/i18n}</a>
+        <li><a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Controlled Actions available: {/i18n}</a>
         {$context->getActionStringForState($oState)}
         </li>
-        <li><a href="{$smarty.server.PHP_SELF}?action=editTransitions&fWorkflowId={$oWorkflow->getId()}">{i18n}Transitions available: {/i18n}</a>
+        <li><a href="{addQS}action=editTransitions&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Transitions available: {/i18n}</a>
         {$context->getTransitionFromStringForState($oState)}
         </li>
@@ -46,4 +46,4 @@ various different states for documents.&lt;/p&gt;
     </li>
 {/foreach}
 </ul>
-{/if}
 \ No newline at end of file
+{/if}
@@ -13,9 +13,9 @@ while the workflow has no documents or document-versions assigned to the workflo
 <fieldset>
 <legend>{i18n}Create a new transition{/i18n}</legend>
-<a href="{$smarty.server.PHP_SELF}?action=createTransition&fWorkflowId={$oWorkflow->getId()}"
+<a href="{addQS}action=createTransition&fWorkflowId={$oWorkflow->getId()}{/addQS}"
    class="ktAction ktAdd ktInline">{i18n}Create a new transition{/i18n}</a>
-<a href="{$smarty.server.PHP_SELF}?action=createTransition&fWorkflowId={$oWorkflow->getId()}"
+<a href="{addQS}action=createTransition&fWorkflowId={$oWorkflow->getId()}{/addQS}"
    >{i18n}Create a new transition{/i18n}</a>
 </fieldset>
@@ -46,8 +46,8 @@ or use the checkboxes to assign which states the transition is available from.&lt;/
   {foreach item=oTransition from=$workflow_info.transitions}
   <tr class='{cycle values="odd,even"}'>
     <td>
-      <a href="{$smarty.server.PHP_SELF}?action=editTransition&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}">{$oTransition->getName()}</a>
-      {if ($workflow_info.can_delete)} | <span class="ktActionLink ktDelete"><a href="{$smarty.server.PHP_SELF}?action=deleteTransition&fTransitionId={$oTransition->getId()}&fWorkflowId={$oWorkflow->getId()}" >{i18n}Delete{/i18n}</a></span>{/if}
+      <a href="{addQS}action=editTransition&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}{/addQS}">{$oTransition->getName()}</a>
+      {if ($workflow_info.can_delete)} | <span class="ktActionLink ktDelete"><a href="{addQS}action=deleteTransition&fTransitionId={$oTransition->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" >{i18n}Delete{/i18n}</a></span>{/if}
     </td>
     {foreach item=oState from=$workflow_info.states}
       <td>
@@ -65,4 +65,4 @@ or use the checkboxes to assign which states the transition is available from.&lt;/
   <input type="submit" value="{i18n}Assign Transition Availability{/i18n}" />
 </div>
-</form>
 \ No newline at end of file
+</form>