Peter M. Groen / knowledgetree

Commit 11aa320c3b85793a9be557ba1aa8937bd282d9bb

Authored by Neil Blakey-Milner
1 parent d1e8ad59

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
Inline Side-by-side
Showing 16 changed files with 40 additions and 47 deletions
templates/kt3/document/edit.smarty
  View file @11aa320
... ... @@ -13,7 +13,7 @@
13 13  
14 14 <h2>{i18n}Editing{/i18n}: {$document->getName()}</h2>
15 15  
16   -<p class="descriptiveText">{i18n}Change the <strong><a href="{$smarty.server.PHP_SELF}?action=selectType&fDocumentId={$document->getId()}">document type</a></strong>{/i18n}</p>
  16 +<p class="descriptiveText">{i18n}Change the <strong><a href="{addQS}action=selectType&fDocumentId={$document->getId()}{/addQS}">document type</a></strong>{/i18n}</p>
17 17  
18 18 <p class="descriptiveText">{i18n}The following document metadata is available for editing.{/i18n}</p>
19 19  
... ...
templates/kt3/document/metadata_history.smarty
  View file @11aa320
... ... @@ -27,10 +27,10 @@
27 27 {if ($document->getMetadataVersion() == $oVersion->getMetadataVersion())}
28 28 <strong>{i18n}current version{/i18n}</strong>
29 29 {else}
30   - <a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fBaseVersion={$oVersion->getMetadataVersionId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare with current{/i18n}</a></td>
  30 + <a href="{addQS}action=viewComparison&fDocumentId={$document->getId()}&fBaseVersion={$oVersion->getMetadataVersionId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}{/addQS}">{i18n}compare with current{/i18n}</a></td>
31 31 {/if}
32 32 </td>
33   - <td><a href="{$smarty.server.PHP_SELF}?action=startComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare with other version{/i18n}</a></td>
  33 + <td><a href="{addQS}action=startComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}{/addQS}">{i18n}compare with other version{/i18n}</a></td>
34 34 </tr>
35 35 {/foreach}
36 36 </tbody>
... ...
templates/kt3/fieldsets/generic.smarty
  View file @11aa320
... ... @@ -27,8 +27,8 @@
27 27 {else}
28 28 {i18n}No workflow{/i18n}
29 29 {/if}
30   -(<a
31   -href="{$rootUrl}/action.php/ktcore.actions.document.workflow?fDocumentId={$document->getId()}">{i18n}manage workflow{/i18n}</a>)
  30 +{assign var=iDocumentId value=$document->getId()}
  31 + (<a href="{ktLink base="action.php" subpath="/ktcore.actions.document.workflow" query="fDocumentId=`$iDocumentId`"}">{i18n}manage workflow{/i18n}</a>)
32 32 </dd>
33 33 </dl>
34 34 <div class="floatClear"><!-- --> </div>
... ...
templates/ktcore/document/admin/linktypesadmin.smarty
  View file @11aa320
... ... @@ -74,8 +74,8 @@ links of that type within the system.{/i18n}&lt;/p&gt;
74 74 <tr class="{cycle values=even,odd}">
75 75 <td>{$oLinkType->getName()}</td>
76 76 <td class="descriptiveText">{$oLinkType->getDescription()}</td>
77   - <td><a href="{$smarty.server.PHP_SELF}?action=edit&fLinkTypeId={$oLinkType->iId}" class="ktAction ktEdit">{i18n}edit link type{/i18n}</a></td>
78   - <td><a href="{$smarty.server.PHP_SELF}?action=delete&fLinksToDelete[]={$oLinkType->iId}" class="ktAction ktDelete">{i18n}edit link type{/i18n}</a></td>
  77 + <td><a href="{addQS}action=edit&fLinkTypeId={$oLinkType->iId}{/addQS}" class="ktAction ktEdit">{i18n}edit link type{/i18n}</a></td>
  78 + <td><a href="{addQS}action=delete&fLinksToDelete[]={$oLinkType->iId}{/addQS}" class="ktAction ktDelete">{i18n}edit link type{/i18n}</a></td>
79 79 </tr>
80 80 {/foreach}
81 81 </tbody>
... ...
templates/ktcore/document/comparison_version_select.smarty
  View file @11aa320
... ... @@ -20,7 +20,7 @@
20 20 {if ($document->getCurrentMetadataVersionId() == $oVersion->getCurrentMetadataVersionId())}
21 21 <strong>{i18n}comparing against this version{/i18n}</strong>
22 22 {else}
23   - <a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fBaseVersion={$document->getCurrentMetadataVersionId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare{/i18n}</a>
  23 + <a href="{addQS}action=viewComparison&fDocumentId={$document->getId()}&fBaseVersion={$document->getCurrentMetadataVersionId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}{/addQS}">{i18n}compare{/i18n}</a>
24 24 {/if}
25 25 </td>
26 26 </tr>
... ...
templates/ktcore/document/document_permissions.smarty
  View file @11aa320
... ... @@ -97,12 +97,10 @@ td.false { background-color: #ffaaaa; text-align: centre }
97 97 padding: 2px; padding-right: 1em; padding-left: 1em">
98 98 { if $inherited }
99 99 {i18n}Inherited from{/i18n}: {$inherited}
100   -{* [<a
101   -href="{$smarty.server.PHP_SELF}?action=copyPermissions&fDocumentID={$iDocumentID}">{i18n}Copy{/i18n}</a>]
102   -*}
  100 +{* [<a href="{addQS}action=copyPermissions&fDocumentID={$iDocumentID}{/addQS}">{i18n}Copy{/i18n}</a>] *}
103 101 { else }
104 102 [<a
105   -href="{$smarty.server.PHP_SELF}?action=inheritPermissions&fDocumentID={$iDocumentID}">{i18n}Use
  103 +href="{addQS}action=inheritPermissions&fDocumentID={$iDocumentID}{/addQS}">{i18n}Use
106 104 parent's permissions{/i18n}</a>]
107 105 { /if }
108 106 </span>
... ...
templates/ktcore/folder/permissions.smarty
  View file @11aa320
... ... @@ -174,11 +174,9 @@ value=&quot;{$iRoleId}&quot;&gt;&lt;/td&gt;
174 174 padding: 2px; padding-right: 1em; padding-left: 1em">
175 175 { if $inherited }
176 176 {i18n}Inherited from:{/i18n} {$inherited}
177   -[<a
178   -href="{$smarty.server.PHP_SELF}?action=copyPermissions&fFolderId={$iFolderId}">{i18n}Copy{/i18n}</a>]
  177 +[<a href="{addQS}action=copyPermissions&fFolderId={$iFolderId}{/addQS}">{i18n}Copy{/i18n}</a>]
179 178 { else }
180   -[<a
181   -href="{$smarty.server.PHP_SELF}?action=inheritPermissions&fFolderId={$iFolderId}">{i18n}Use
  179 +[<a href="{addQS}action=inheritPermissions&fFolderId={$iFolderId}{/addQS}">{i18n}Use
182 180 parent's permissions{/i18n}</a>]
183 181 { /if }
184 182 </span>
... ...
templates/ktcore/folder/roles.smarty
  View file @11aa320
... ... @@ -36,11 +36,11 @@ role allocations may take a some time, depending on the number of folders below
36 36 {/if}
37 37 </td>
38 38 {if ($aRole.allocation_id === null)}
39   - <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>
  39 + <td colspan="2"><a href="{addQS}action=overrideParent&role_id={$role_id}&fFolderId={$context->oFolder->getId()}{/addQS}">{i18n}Override Parent Allocation{/i18n}</a></td>
40 40 {else}
41   -<!-- <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> -->
42   - <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>
43   - <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>
  41 +<!-- <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> -->
  42 + <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>
  43 + <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>
44 44 {/if}
45 45 </tr>
46 46 {/foreach}
... ...
templates/ktcore/help_with_edit.smarty
  View file @11aa320
... ... @@ -5,5 +5,5 @@
5 5 {/if}
6 6  
7 7 <hr />
8   -<p><a href="{$rootUrl}/admin.php/misc/helpmanagement?action=customise&name={$target_name}" class="ktAction ktEdit" style="float:
9   -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>
10 8 \ No newline at end of file
  9 +<p><a href="{ktLink base="admin.php" subpath="/misc/helpmanagement" query="?action=customise&name=`$target_name`"}" class="ktAction ktEdit" style="float:
  10 +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>
... ...
templates/ktcore/manage_fieldsets.smarty
  View file @11aa320
... ... @@ -17,13 +17,11 @@
17 17 </td>
18 18  
19 19 <td>
20   - <a
21   - href="{$smarty.server.PHP_SELF}?action=editFieldset&id={$oFieldSet->getId()}">{i18n}Edit{/i18n}</a>
  20 + <a href="{addQS}action=editFieldset&id={$oFieldSet->getId()}{/addQS}">{i18n}Edit{/i18n}</a>
22 21 </td>
23 22 <td>
24 23 {if $oFieldSet->bMandatory == false}
25   - <a
26   - href="{$smarty.server.PHP_SELF}?action=deleteFieldset&id={$oFieldSet->getId()}">{i18n}Delete{/i18n}</a>
  24 + <a href="{addQS}action=deleteFieldset&id={$oFieldSet->getId()}{/addQS}">{i18n}Delete{/i18n}</a>
27 25 {else}
28 26 {i18n}Built-in set.{/i18n}
29 27 {/if}
... ...
templates/ktcore/manage_help.smarty
  View file @11aa320
... ... @@ -16,10 +16,10 @@ via the help system and click on &lt;strong&gt;customise this help file&lt;/strong&gt;.{/i18
16 16 { foreach item=oHelpReplacement from=$helpreplacements }
17 17 <tr class="{cycle values="odd,even"}">
18 18 <td>
19   -<a href="{$smarty.server.PHP_SELF}?action=editReplacement&id={$oHelpReplacement->iId}">{ $oHelpReplacement->sName }</a>
  19 +<a href="{addQS}action=editReplacement&id={$oHelpReplacement->iId}{/addQS}">{ $oHelpReplacement->sName }</a>
20 20 </td>
21 21 <td>
22   -<a href="{$smarty.server.PHP_SELF}?action=deleteReplacement&id={$oHelpReplacement->iId}">Delete</a>
  22 +<a href="{addQS}action=deleteReplacement&id={$oHelpReplacement->iId}{/addQS}">Delete</a>
23 23 </td>
24 24 </tr>
25 25 { /foreach }
... ...
templates/ktcore/metadata/editFieldset.smarty
  View file @11aa320
... ... @@ -126,8 +126,7 @@ field can depend on the user&#39;s selections for the others.{/i18n}
126 126 <li><input type="checkbox" name="fields[]"
127 127 value="{$oField->getId()}" />
128 128 {$oField->getName()|escape}
129   -(<a
130   -href="{$smarty.server.PHP_SELF}?action=editField&fFieldId={$oField->getId()}&fFieldsetId={$oFieldset->getId()}">{i18n}edit{/i18n}</a>)
  129 +(<a href="{addQS}action=editField&fFieldId={$oField->getId()}&fFieldsetId={$oFieldset->getId()}{/addQS}">{i18n}edit{/i18n}</a>)
131 130 </li>
132 131 {/foreach}
133 132 </ul>
... ...
templates/ktcore/search/administration/savedsearches.smarty
  View file @11aa320
... ... @@ -31,8 +31,8 @@ newsletters, etc.) based on a category or fieldset value.{/i18n}&lt;/p&gt;
31 31 {foreach item=oSearch from=$saved_searches}
32 32 <tr>
33 33 <td>{$oSearch->getName()}</td>
34   - <td><a href="{$smarty.server.PHP_SELF}?action=edit&fSavedSearchId={$oSearch->getId()}" class="ktAction ktEdit">Edit</a></td>
35   - <td><a href="{$smarty.server.PHP_SELF}?action=delete&fSavedSearchId={$oSearch->getId()}" class="ktAction ktDelete">Edit</a></td>
  34 + <td><a href="{addQS}action=edit&fSavedSearchId={$oSearch->getId()}{/addQS}" class="ktAction ktEdit">Edit</a></td>
  35 + <td><a href="{addQS}action=delete&fSavedSearchId={$oSearch->getId()}{/addQS}" class="ktAction ktDelete">Edit</a></td>
36 36 <td><a href="{"booleanSearch"|generateControllerUrl}&qs[action]=performSearch&qs[fSavedSearchId]={$oSearch->getId()}">Run Search</a></td>
37 37 </tr>
38 38 {/foreach}
... ...
templates/ktcore/workflow/editWorkflow.smarty
  View file @11aa320
... ... @@ -28,7 +28,7 @@ Workflow menu (on the left) to create new states.&lt;/p&gt;&lt;/div&gt;
28 28 {else}
29 29 <ul id="workflow-states-list">
30 30 {foreach item=oState from=$aStates}
31   - <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>
  31 + <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>
32 32 <ul>
33 33 <li>{i18n}Notified groups &amp; roles:{/i18n}
34 34 {$context->getNotificationStringForState($oState)}
... ... @@ -48,4 +48,4 @@ Workflow menu (on the left) to create new states.&lt;/p&gt;&lt;/div&gt;
48 48 </li>
49 49 {/foreach}
50 50 </ul>
51   -{/if}
52 51 \ No newline at end of file
  52 +{/if}
... ...
templates/ktcore/workflow/manageStates.smarty
  View file @11aa320
... ... @@ -13,9 +13,9 @@ while the workflow has no documents or document-versions assigned to the workflo
13 13 <legend>Create a new state</legend>
14 14 <p class="descriptiveText">A critical part of workflow is the creation of
15 15 various different states for documents.</p>
16   -<a href="{$smarty.server.PHP_SELF}?action=createState&fWorkflowId={$oWorkflow->getId()}"
  16 +<a href="{addQS}action=createState&fWorkflowId={$oWorkflow->getId()}{/addQS}"
17 17 class="ktAction ktInline ktAdd">{i18n}Create a new state{/i18n}</a>
18   -<a href="{$smarty.server.PHP_SELF}?action=createState&fWorkflowId={$oWorkflow->getId()}">{i18n}Create a new state{/i18n}</a>
  18 +<a href="{addQS}action=createState&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Create a new state{/i18n}</a>
19 19  
20 20 </fieldset>
21 21  
... ... @@ -25,17 +25,17 @@ various different states for documents.&lt;/p&gt;
25 25 {else}
26 26 <ul id="workflow-states-list">
27 27 {foreach item=oState from=$workflow_info.states}
28   - <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>
29   - {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}
  28 + <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>
  29 + {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}
30 30 <ul>
31   - <li><a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}">{i18n}Notified groups & roles:{/i18n}</a>
  31 + <li><a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Notified groups & roles:{/i18n}</a>
32 32 {$context->getNotificationStringForState($oState)}
33 33 </li>
34   - <li><a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}">{i18n}Controlled Actions available: {/i18n}</a>
  34 + <li><a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Controlled Actions available: {/i18n}</a>
35 35 {$context->getActionStringForState($oState)}
36 36 </li>
37 37  
38   - <li><a href="{$smarty.server.PHP_SELF}?action=editTransitions&fWorkflowId={$oWorkflow->getId()}">{i18n}Transitions available: {/i18n}</a>
  38 + <li><a href="{addQS}action=editTransitions&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Transitions available: {/i18n}</a>
39 39 {$context->getTransitionFromStringForState($oState)}
40 40 </li>
41 41  
... ... @@ -46,4 +46,4 @@ various different states for documents.&lt;/p&gt;
46 46 </li>
47 47 {/foreach}
48 48 </ul>
49   -{/if}
50 49 \ No newline at end of file
  50 +{/if}
... ...
templates/ktcore/workflow/manageTransitions.smarty
  View file @11aa320
... ... @@ -13,9 +13,9 @@ while the workflow has no documents or document-versions assigned to the workflo
13 13 <fieldset>
14 14 <legend>{i18n}Create a new transition{/i18n}</legend>
15 15  
16   -<a href="{$smarty.server.PHP_SELF}?action=createTransition&fWorkflowId={$oWorkflow->getId()}"
  16 +<a href="{addQS}action=createTransition&fWorkflowId={$oWorkflow->getId()}{/addQS}"
17 17 class="ktAction ktAdd ktInline">{i18n}Create a new transition{/i18n}</a>
18   -<a href="{$smarty.server.PHP_SELF}?action=createTransition&fWorkflowId={$oWorkflow->getId()}"
  18 +<a href="{addQS}action=createTransition&fWorkflowId={$oWorkflow->getId()}{/addQS}"
19 19 >{i18n}Create a new transition{/i18n}</a>
20 20  
21 21 </fieldset>
... ... @@ -46,8 +46,8 @@ or use the checkboxes to assign which states the transition is available from.&lt;/
46 46 {foreach item=oTransition from=$workflow_info.transitions}
47 47 <tr class='{cycle values="odd,even"}'>
48 48 <td>
49   - <a href="{$smarty.server.PHP_SELF}?action=editTransition&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}">{$oTransition->getName()}</a>
50   - {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}
  49 + <a href="{addQS}action=editTransition&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}{/addQS}">{$oTransition->getName()}</a>
  50 + {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}
51 51 </td>
52 52 {foreach item=oState from=$workflow_info.states}
53 53 <td>
... ... @@ -65,4 +65,4 @@ or use the checkboxes to assign which states the transition is available from.&lt;/
65 65 <input type="submit" value="{i18n}Assign Transition Availability{/i18n}" />
66 66 </div>
67 67  
68   -</form>
69 68 \ No newline at end of file
  69 +</form>
... ...