Commit 5157de8f0113213d64a2065f2da0f1a474c6281c
1 parent
41d5f05a
KTS-1687
"Double quote to single quote conversion" Fixed. Reviewed by: Kevin Fourie git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6213 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
24 additions
and
24 deletions
admin.php
| @@ -23,12 +23,12 @@ | @@ -23,12 +23,12 @@ | ||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | -require_once("config/dmsDefaults.php"); | ||
| 27 | -require_once(KT_LIB_DIR . "/templating/kt3template.inc.php"); | ||
| 28 | -require_once(KT_LIB_DIR . "/dispatcher.inc.php"); | ||
| 29 | -require_once(KT_LIB_DIR . "/widgets/portlet.inc.php"); | 26 | +require_once('config/dmsDefaults.php'); |
| 27 | +require_once(KT_LIB_DIR . '/templating/kt3template.inc.php'); | ||
| 28 | +require_once(KT_LIB_DIR . '/dispatcher.inc.php'); | ||
| 29 | +require_once(KT_LIB_DIR . '/widgets/portlet.inc.php'); | ||
| 30 | 30 | ||
| 31 | -require_once(KT_LIB_DIR . "/plugins/KTAdminNavigation.php"); | 31 | +require_once(KT_LIB_DIR . '/plugins/KTAdminNavigation.php'); |
| 32 | 32 | ||
| 33 | class AdminSplashDispatcher extends KTAdminDispatcher { | 33 | class AdminSplashDispatcher extends KTAdminDispatcher { |
| 34 | var $category = ''; | 34 | var $category = ''; |
| @@ -52,7 +52,7 @@ class AdminSplashDispatcher extends KTAdminDispatcher { | @@ -52,7 +52,7 @@ class AdminSplashDispatcher extends KTAdminDispatcher { | ||
| 52 | $oRegistry =& KTAdminNavigationRegistry::getSingleton(); | 52 | $oRegistry =& KTAdminNavigationRegistry::getSingleton(); |
| 53 | $categories = $oRegistry->getCategories(); | 53 | $categories = $oRegistry->getCategories(); |
| 54 | $KTConfig =& KTConfig::getSingleton(); | 54 | $KTConfig =& KTConfig::getSingleton(); |
| 55 | - $condensed_admin = $KTConfig->get("condensedAdminUI"); | 55 | + $condensed_admin = $KTConfig->get('condensedAdminUI'); |
| 56 | 56 | ||
| 57 | $aAllItems = array(); | 57 | $aAllItems = array(); |
| 58 | // we need to investigate sub_url solutions. | 58 | // we need to investigate sub_url solutions. |
| @@ -63,20 +63,20 @@ class AdminSplashDispatcher extends KTAdminDispatcher { | @@ -63,20 +63,20 @@ class AdminSplashDispatcher extends KTAdminDispatcher { | ||
| 63 | } | 63 | } |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | - $this->oPage->title = _kt("DMS Administration") . ": "; | 66 | + $this->oPage->title = _kt('DMS Administration') . ': '; |
| 67 | $oTemplating =& KTTemplating::getSingleton(); | 67 | $oTemplating =& KTTemplating::getSingleton(); |
| 68 | 68 | ||
| 69 | if ($condensed_admin) { | 69 | if ($condensed_admin) { |
| 70 | - $oTemplate = $oTemplating->loadTemplate("kt3/admin_fulllist"); | 70 | + $oTemplate = $oTemplating->loadTemplate('kt3/admin_fulllist'); |
| 71 | } else { | 71 | } else { |
| 72 | - $oTemplate = $oTemplating->loadTemplate("kt3/admin_categories"); | 72 | + $oTemplate = $oTemplating->loadTemplate('kt3/admin_categories'); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | $aTemplateData = array( | 75 | $aTemplateData = array( |
| 76 | - "context" => $this, | ||
| 77 | - "categories" => $categories, | ||
| 78 | - "all_items" => $aAllItems, | ||
| 79 | - "baseurl" => $_SERVER['PHP_SELF'], | 76 | + 'context' => $this, |
| 77 | + 'categories' => $categories, | ||
| 78 | + 'all_items' => $aAllItems, | ||
| 79 | + 'baseurl' => $_SERVER['PHP_SELF'], | ||
| 80 | ); | 80 | ); |
| 81 | return $oTemplate->render($aTemplateData); | 81 | return $oTemplate->render($aTemplateData); |
| 82 | } | 82 | } |
| @@ -84,23 +84,23 @@ class AdminSplashDispatcher extends KTAdminDispatcher { | @@ -84,23 +84,23 @@ class AdminSplashDispatcher extends KTAdminDispatcher { | ||
| 84 | function do_viewCategory() { | 84 | function do_viewCategory() { |
| 85 | // are we categorised, or not? | 85 | // are we categorised, or not? |
| 86 | 86 | ||
| 87 | - $category = KTUtil::arrayGet($_REQUEST, "fCategory", $this->category); | 87 | + $category = KTUtil::arrayGet($_REQUEST, 'fCategory', $this->category); |
| 88 | 88 | ||
| 89 | $oRegistry =& KTAdminNavigationRegistry::getSingleton(); | 89 | $oRegistry =& KTAdminNavigationRegistry::getSingleton(); |
| 90 | $aCategory = $oRegistry->getCategory($category); | 90 | $aCategory = $oRegistry->getCategory($category); |
| 91 | 91 | ||
| 92 | $aItems = $oRegistry->getItemsForCategory($category); | 92 | $aItems = $oRegistry->getItemsForCategory($category); |
| 93 | - $this->aBreadcrumbs[] = array("name" => $aCategory["title"], "url" => KTUtil::ktLink('admin.php',$category)); | 93 | + $this->aBreadcrumbs[] = array('name' => $aCategory['title'], 'url' => KTUtil::ktLink('admin.php',$category)); |
| 94 | 94 | ||
| 95 | 95 | ||
| 96 | - $this->oPage->title = _kt("DMS Administration") . ": " . $aCategory["title"]; | 96 | + $this->oPage->title = _kt('DMS Administration') . ': ' . $aCategory['title']; |
| 97 | $oTemplating =& KTTemplating::getSingleton(); | 97 | $oTemplating =& KTTemplating::getSingleton(); |
| 98 | - $oTemplate = $oTemplating->loadTemplate("kt3/admin_items"); | 98 | + $oTemplate = $oTemplating->loadTemplate('kt3/admin_items'); |
| 99 | $aTemplateData = array( | 99 | $aTemplateData = array( |
| 100 | - "context" => $this, | ||
| 101 | - "category" => $aCategory, | ||
| 102 | - "items" => $aItems, | ||
| 103 | - "baseurl" => $_SERVER['PHP_SELF'], | 100 | + 'context' => $this, |
| 101 | + 'category' => $aCategory, | ||
| 102 | + 'items' => $aItems, | ||
| 103 | + 'baseurl' => $_SERVER['PHP_SELF'], | ||
| 104 | ); | 104 | ); |
| 105 | return $oTemplate->render($aTemplateData); | 105 | return $oTemplate->render($aTemplateData); |
| 106 | } | 106 | } |
| @@ -109,7 +109,7 @@ class AdminSplashDispatcher extends KTAdminDispatcher { | @@ -109,7 +109,7 @@ class AdminSplashDispatcher extends KTAdminDispatcher { | ||
| 109 | $sub_url = KTUtil::arrayGet($_SERVER, 'PATH_INFO'); | 109 | $sub_url = KTUtil::arrayGet($_SERVER, 'PATH_INFO'); |
| 110 | 110 | ||
| 111 | $sub_url = trim($sub_url); | 111 | $sub_url = trim($sub_url); |
| 112 | -$sub_url= trim($sub_url, "/"); | 112 | +$sub_url= trim($sub_url, '/'); |
| 113 | 113 | ||
| 114 | if (empty($sub_url)) { | 114 | if (empty($sub_url)) { |
| 115 | $oDispatcher = new AdminSplashDispatcher(); | 115 | $oDispatcher = new AdminSplashDispatcher(); |
| @@ -124,8 +124,8 @@ if (empty($sub_url)) { | @@ -124,8 +124,8 @@ if (empty($sub_url)) { | ||
| 124 | $aCategory = $oRegistry->getCategory($aParts[0]); | 124 | $aCategory = $oRegistry->getCategory($aParts[0]); |
| 125 | 125 | ||
| 126 | $oDispatcher->aBreadcrumbs = array(); | 126 | $oDispatcher->aBreadcrumbs = array(); |
| 127 | - $oDispatcher->aBreadcrumbs[] = array('action' => "administration", 'name' => _kt('Administration')); | ||
| 128 | - $oDispatcher->aBreadcrumbs[] = array("name" => $aCategory['title'], "url" => KTUtil::ktLink('admin.php',$aParts[0])); | 127 | + $oDispatcher->aBreadcrumbs[] = array('action' => 'administration', 'name' => _kt('Administration')); |
| 128 | + $oDispatcher->aBreadcrumbs[] = array('name' => $aCategory['title'], 'url' => KTUtil::ktLink('admin.php',$aParts[0])); | ||
| 129 | 129 | ||
| 130 | } else { | 130 | } else { |
| 131 | // FIXME (minor) redirect to no-suburl? | 131 | // FIXME (minor) redirect to no-suburl? |