Peter M. Groen / knowledgetree

Commit 4ff2637947356720b88769b98366d276aeec951e

Authored by Kevin Fourie
1 parent dbcea094

Merged in from STABLE trunk... 

KTS-1837
"Admin Version Notifier is not working"
Fixed for Commercial version too. NOTE: Also added some XSS fixes to this (naughty me).

Committed By: Kevin
Reviewed By: Conrad

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6779 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
lib/util/ktutil.inc
  View file @4ff2637
... ... @@ -726,7 +726,7 @@ class KTUtil {
726 726 $aVersions['Development OSS'] = $sVersion;
727 727 } elseif (file_exists($sProfessionalFile)) {
728 728 $sVersion = trim(file_get_contents($sProfessionalFile));
729   - $aVersions['Pro'] = $sVersion;
  729 + $aVersions['Commercial'] = $sVersion;
730 730 } elseif (file_exists($sOssFile)) {
731 731 $sVersion = trim(file_get_contents($sOssFile));
732 732 $aVersions['OSS'] = $sVersion;
... ...
plugins/ktcore/admin/documentFieldsv2.php
  View file @4ff2637
... ... @@ -305,14 +305,14 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
305 305 'name' => 'name',
306 306 'required' => true,
307 307 'description' => _kt("Each fieldset needs a unique name."),
308   - 'value' => $this->oFieldset->getName(),
  308 + 'value' => sanitizeForHTML($this->oFieldset->getName()),
309 309 )),
310 310 array('ktcore.widgets.text',array(
311 311 'label' => _kt("Description"),
312 312 'name' => 'description',
313 313 'required' => true,
314 314 'description' => _kt("In order to ensure that the data that users enter is useful, it is essential that you provide a good example."),
315   - 'value' => $this->oFieldset->getDescription(),
  315 + 'value' => sanitizeForHTML($this->oFieldset->getDescription()),
316 316 )),
317 317 );
318 318  
... ...
plugins/ktcore/admin/fieldsets/basic.inc.php
  View file @4ff2637
... ... @@ -219,14 +219,14 @@ class BasicFieldsetManagementDispatcher extends KTAdminDispatcher {
219 219 array('ktcore.widgets.string',array(
220 220 'label' => _kt("Field Name"),
221 221 'name' => 'name',
222   - 'value' => $oField->getName(),
  222 + 'value' => sanitizeForHTML($oField->getName()),
223 223 'required' => true,
224 224 'description' => _kt("Within a given fieldset, each field needs a unique name."),
225 225 )),
226 226 array('ktcore.widgets.text',array(
227 227 'label' => _kt("Description"),
228 228 'name' => 'description',
229   - 'value' => $oField->getDescription(),
  229 + 'value' => sanitizeForHTML($oField->getDescription()),
230 230 'required' => true,
231 231 'description' => _kt("A good description can be the difference between useful metadata and poor metadata. At the same time, overly long descriptions are far less valuable than concise ones."),
232 232 )),
... ...