diff --git a/bin/upgrade/pear-upgrade.bat b/bin/upgrade/pear-upgrade.bat deleted file mode 100644 index bb9fa80..0000000 --- a/bin/upgrade/pear-upgrade.bat +++ /dev/null @@ -1,27 +0,0 @@ - -; TEST ALL PEAR LIBRARIES BEFORE UPGRADING INTO RELEASE - -PATH=%PATH%;c:\php5\PEAR - -pear channel-update pear.php.net -pear config-set php_dir "C:\kt\kt.trunk\thirdparty\pear" - -pear config-set preferred_state stable - -pear upgrade --alldeps PEAR -pear upgrade --alldeps Cache_Lite -pear upgrade --alldeps Config -pear upgrade --alldeps DB -pear upgrade --alldeps File - -;pear upgrade --alldeps MDB2#mysql - -pear upgrade --alldeps Log -pear upgrade --alldeps PHP_Compat - -pear config-set preferred_state beta -pear upgrade --alldeps File_Gettext -pear upgrade --alldeps Net_LDAP -pear upgrade --alldeps SOAP -pear config-set preferred_state stable - diff --git a/plugins/ktcore/admin/manageBranding.php b/plugins/ktcore/admin/manageBranding.php index 1d8798d..8313f57 100755 --- a/plugins/ktcore/admin/manageBranding.php +++ b/plugins/ktcore/admin/manageBranding.php @@ -47,7 +47,6 @@ require_once(KT_LIB_DIR . "/validation/dispatchervalidation.inc.php"); require_once(KT_LIB_DIR . "/metadata/fieldsetregistry.inc.php"); require_once(KT_LIB_DIR . "/validation/validatorfactory.inc.php"); - class ManageBrandDispatcher extends KTAdminDispatcher { private $maxLogoWidth = 313; @@ -61,7 +60,6 @@ class ManageBrandDispatcher extends KTAdminDispatcher { } function do_main() { - $oForms[] = $this->getLogoDetailsForm(); $oForms[] = $this->getUploadLogoForm(); @@ -126,7 +124,7 @@ class ManageBrandDispatcher extends KTAdminDispatcher { 'name' => 'logo_url', 'id' => 'file', 'value' => $logoUrl, - 'description' => _kt("This is the website address you will be redirected to after clicking the logo"), + 'description' => _kt("This is the website address you will be redirected to after clicking the logo. The url should include the protocol e.g. http://www.knowledgetree.com . If no protocol is given the url is treated as a relative link."), )); $oForm->setWidgets($widgets); @@ -445,6 +443,12 @@ class ManageBrandDispatcher extends KTAdminDispatcher { $config =& KTConfig::getSingleton(); $logoUrl = $_REQUEST['data']['logo_url']; $logoTitle = $_REQUEST['data']['logo_title']; + + if(!preg_match('/([a-z])|([A-Z])|([0-9])/', $logoTitle)){ + $this->errorRedirectTo('main', _kt("You have entered an invalid character in the logo title. You may use only letters and numbers.")); + } + + $logoTitle = addslashes(htmlentities($logoTitle)); if ($config->set('ui/companyLogoUrl', $logoUrl) && $config->set('ui/companyLogoTitle', $logoTitle)) { $this->successRedirectTo('main', _kt('Logo fields have been successfully updated.')); @@ -597,7 +601,6 @@ class ManageBrandDispatcher extends KTAdminDispatcher { } - /** * Returns the MIME of the filename, deducted from its extension * If the extension is unknown, returns "image/jpeg" @@ -674,7 +677,6 @@ class ManageBrandDispatcher extends KTAdminDispatcher { return FALSE; } - /* * This method uses the GD library to scale an image.