Removed kcfinder controller, added a function to the htmleditor helpe…

…r that initiates the sessionvariables.
LimeSurvey · Aug 6, 2012 · dd1e0e3 · dd1e0e3
1 parent 81ab3a6
commit dd1e0e3
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 359 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -508,9 +508,11 @@
 $config['standardtemplaterooturl'] = $config['publicurl'].'templates';      // Location of the standard templates
 $config['adminscripts']            = $config['publicurl'].'scripts/admin/';
 $config['generalscripts']          = $config['publicurl'].'scripts/';
+$config['vendors']                 = $config['publicurl'].'vendors/';
 $config['styleurl']                = $config['publicurl'].'styles/';
 $config['publicstyleurl']          = $config['publicurl'].'styles-public/';
-$config['sCKEditorURL']            = $config['adminscripts'].'/ckeditor.36';
+$config['sCKEditorURL']            = $config['vendors'].'ckeditor';
+//$config['sCKEditorURL']            = '/scripts/admin/ckeditor.36';
 $config['usertemplaterooturl']     = $config['uploadurl'].'/templates';     // Location of the user templates
 $config['adminimageurl']           = $config['styleurl'].$config['admintheme'].'/images/';         // Location of button bar files for admin script
 $config['adminstyleurl']           = $config['styleurl'].$config['admintheme'].'/';         // Location of button bar files for admin script

diff --git a/application/controllers/admin/kcfinder.php b/application/controllers/admin/kcfinder.php