diff --git a/system/autoload/Text.php b/system/autoload/Text.php index e11cfef9..f60b9621 100644 --- a/system/autoload/Text.php +++ b/system/autoload/Text.php @@ -110,6 +110,12 @@ class Text return $result; } + /** + * ...$data means it can take any number of arguments. + * it can url($var1, $var2, $var3) or url($var1) + * and variable will be merge with implode + * @return string the URL with all the arguments combined. + */ public static function url(...$data){ global $config; $url = implode("", $data); @@ -125,4 +131,14 @@ class Text return U . $url; } } + + // this will return & or ? + public static function isQA(){ + global $config; + if ($config['url_canonical'] == 'yes') { + return '?'; + } else { + return '&'; + } + } } diff --git a/ui/ui/admin/customers/add.tpl b/ui/ui/admin/customers/add.tpl index 73618f90..003a496f 100644 --- a/ui/ui/admin/customers/add.tpl +++ b/ui/ui/admin/customers/add.tpl @@ -1,6 +1,6 @@ {include file="sections/header.tpl"} -
+
@@ -207,7 +207,7 @@ -
{Lang::T('Cancel')} +
{Lang::T('Cancel')} {literal} diff --git a/ui/ui/admin/customers/edit.tpl b/ui/ui/admin/customers/edit.tpl index 59b58b45..01612ce4 100644 --- a/ui/ui/admin/customers/edit.tpl +++ b/ui/ui/admin/customers/edit.tpl @@ -1,6 +1,6 @@ {include file="sections/header.tpl"} -
+
@@ -247,7 +247,7 @@ type="submit"> {Lang::T('Save Changes')} -
{Lang::T('Cancel')} +
{Lang::T('Cancel')} @@ -330,7 +330,7 @@ function deletePhoto(id) { if (confirm('Delete photo?')) { if (confirm('Are you sure to delete photo?')) { - window.location.href = '{$_url}customers/edit/'+id+'/deletePhoto' + window.location.href = '{Text::url('')}customers/edit/'+id+'/deletePhoto' } } } diff --git a/ui/ui/admin/customers/list.tpl b/ui/ui/admin/customers/list.tpl index 5feb42ca..9e260443 100644 --- a/ui/ui/admin/customers/list.tpl +++ b/ui/ui/admin/customers/list.tpl @@ -17,15 +17,16 @@
{if in_array($_admin['user_type'],['SuperAdmin','Admin'])} {/if} {Lang::T('Manage Contact')}
-