Changeset 161508

Timestamp:

10/08/2009 06:59:08 AM (16 years ago)

Author:

doni2000

Message:

Config fix

Location:

ckeditor-12/trunk

Files:

• AjexFileManager/ajax/php/ajax.php (modified) (1 diff)
• ckeditor.php (modified) (1 diff)
• ckeditor_class.php (modified) (9 diffs)

ckeditor-12/trunk/AjexFileManager/ajax/php/ajax.php

@@ -34 +34 @@
 
 require_once(dirname(__FILE__). '/../../../ckeditor_class.php');
-if(!$deans_ckeditor->can_upload())
+if(!$ckeditor->can_upload())
     exit();
     

ckeditor-12/trunk/ckeditor.php

@@ -9 +9 @@
 */
 require_once('ckeditor_class.php');
-add_action('admin_menu', array(&$deans_ckeditor, 'add_option_page'));
-add_action('admin_head', array(&$deans_ckeditor, 'add_admin_head'));
-add_action('personal_options_update', array(&$deans_ckeditor, 'user_personalopts_update'));
-add_action('edit_form_advanced', array(&$deans_ckeditor, 'load_ckeditor'));
-add_action('edit_page_form', array(&$deans_ckeditor, 'load_ckeditor'));
-add_action('simple_edit_form', array(&$deans_ckeditor, 'load_ckeditor'));
-add_action('admin_print_scripts', array(&$deans_ckeditor, 'add_admin_js'));
-register_activation_hook(basename(dirname(__FILE__)).'/' . basename(__FILE__), array(&$deans_ckeditor, 'activate'));
-register_deactivation_hook(basename(dirname(__FILE__)).'/' . basename(__FILE__), array(&$deans_ckeditor, 'deactivate'));
+add_action('admin_menu', array(&$ckeditor, 'add_option_page'));
+add_action('admin_head', array(&$ckeditor, 'add_admin_head'));
+add_action('personal_options_update', array(&$ckeditor, 'user_personalopts_update'));
+add_action('edit_form_advanced', array(&$ckeditor, 'load_ckeditor'));
+add_action('edit_page_form', array(&$ckeditor, 'load_ckeditor'));
+add_action('simple_edit_form', array(&$ckeditor, 'load_ckeditor'));
+add_action('admin_print_scripts', array(&$ckeditor, 'add_admin_js'));
+register_activation_hook(basename(dirname(__FILE__)).'/' . basename(__FILE__), array(&$ckeditor, 'activate'));
+register_deactivation_hook(basename(dirname(__FILE__)).'/' . basename(__FILE__), array(&$ckeditor, 'deactivate'));
 ?>

ckeditor-12/trunk/ckeditor_class.php

@@ -2 +2 @@
 
 require_once(dirname(__FILE__).'/../../../wp-config.php');
-class deans_ckeditor {
+class ckeditor {
     var $version = '1.3';
     var $default_options = array();
@@ -9 +9 @@
 
     //var $smiley_images = array();
-    function deans_ckeditor()
+    function ckeditor()
     {
         $this->__construct();
@@ -20 +20 @@
         $this->ckeditor_path = $siteurl .'wp-content/plugins/' . basename(dirname(__FILE__)) .'/ckeditor/';
         $this->default_options['user_file_path'] = 'wp-content/uploads/';
+        $this->default_options['ckskin'] = 'kama';
+        
+        $options = get_option('ckeditor');
+        if (!$options) {
+            add_option('ckeditor', $this->default_options);
+            $options = $this->default_options;
+        }
+        foreach ($options as $option_name => $option_value)
+            $this-> {$option_name} = $option_value;
     }
     function deactivate()
@@ -36 +45 @@
         $message = "";
         if (!empty($_POST['submit_update']) || !empty($_POST['doRebuild'])) {
-            $new_options = array (
-                'user_file_path' => trim($_POST['ch_str_UserFilesPath']),
-                'EditorHeight' => trim($_POST['EditorHeight']),
-                'file_denied_ext' =>trim($_POST['file_denied_ext']),
-                'image_allowed_ext' =>trim($_POST['image_allowed_ext']),
-                'flash_allowed_ext' =>trim($_POST['flash_allowed_ext']),
-                'smiley_path'=>trim($_POST['ch_smiley_folder']),
-                'toolbar_set' =>trim($_POST['cmbToolbars']),
-                'skin' =>trim($_POST['cmbSkins']),
-                'enable_preview' => trim($_POST['ckEnablePreview']),
-                'FirefoxSpellChecker' => trim($_POST['ckFirefoxSpellChecker']),
-                'default_link_target' => trim($_POST['cmdefault_link_target'])
-                );
-
+            $new_options = array ('ckskin' => trim($_POST['ckskin']));
             if (empty($new_options['user_file_path']))
             {
                 $new_options['user_file_path'] = 'wp-content/uploads';
             }
-            if ( ! ereg( '/$', $new_options["user_file_path"] ) )
-                $new_options["user_file_path"] .= '/' ;
-            
-            if (empty($new_options['smiley_path']))
-            {
-                $new_options['smiley_path'] = $this->default_options['smiley_path'];
-            }
-            $new_options['smiley_path'] = trailingslashit($new_options['smiley_path']);
-            
-            $this->build_smiley_images($new_options['smiley_path']);
-            $new_options['smiley_images'] = $this->smiley_images;
-            update_option("deans_ckeditor", $new_options);
-
+            update_option("ckeditor", $new_options);
             foreach ($new_options as $option_name => $option_value)
                 $this-> {$option_name} = $option_value;
@@ -73 +57 @@
         }
         else if (isset($_POST['submit_reset'])) {
-                $this->build_smiley_images($this->default_options['smiley_path']);
-                $this->default_options['smiley_images'] = $this->smiley_images;
-                update_option('deans_ckeditor', $this->default_options);
+                update_option('ckeditor', $this->default_options);
                 foreach ($this->default_options as $option_name => $option_value)
                     $this-> {$option_name} = $option_value;
@@ -84 +66 @@
             <fieldset>
                 <form method="post" >
-                <h2><?php _e('CKeditor', 'ckeditor') ?> <?php echo $this->version?></h2>
+                <h2><?php _e('CKEditor', 'ckeditor') ?> <?php echo $this->version?></h2>
                     <legend><?php _e('Basic Options', 'ckeditor') ?></legend>
                     <li>
                         <?php _e('Select the skin to load:')?>
                         <select name="ckskin"">
-                            <option value="kama"  <?php if ($this->skin == 'kama') { ?> selected="selected"<?php } ?>>Kama</option>
-                            <option value="office2003" <?php if ($this->skin == 'office2003') { ?> selected="selected"<?php } ?>>Office 2003</option>
-                            <option value="v2" <?php if ($this->skin == 'v2') { ?> selected="selected"<?php } ?>>v2</option>
+                            <option value="kama"  <?php if ($this->ckskin == 'kama') { ?> selected="selected"<?php } ?>>Kama</option>
+                            <option value="office2003" <?php if ($this->ckskin == 'office2003') { ?> selected="selected"<?php } ?>>Office 2003</option>
+                            <option value="v2" <?php if ($this->ckskin == 'v2') { ?> selected="selected"<?php } ?>>v2</option>
                         </select>
                     </li>
@@ -119 +101 @@
         var content = CKEDITOR.replace( 'content',
         {
-            skin : 'kama',
+            skin : '<?php echo $this->ckskin;?>',
             language : 'en',
             uiColor: '#6B6868',
@@ -145 +127 @@
     function add_option_page()
     {
-        add_options_page('ckeditor', 'ckeditor', 8, 'deans_ckeditor', array(&$this, 'option_page'));
+        add_options_page('ckeditor', 'CKEditor', 8, 'ckeditor', array(&$this, 'option_page'));
     }
 
@@ -179 +161 @@
     }
 }
-$deans_ckeditor = new deans_ckeditor();
+$ckeditor = new ckeditor();
 ?>