[Nocc-svn] SF.net SVN: nocc:[2402] trunk

[<ge...@us...>]

Revision: 2402
          http://nocc.svn.sourceforge.net/nocc/?rev=2402&view=rev
Author:   gerundt
Date:     2011-03-06 11:47:03 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
Switch from FCKeditor to CKEditor

Modified Paths:
--------------
    trunk/build.xml
    trunk/webmail/docs/NEWS
    trunk/webmail/html/prefs.php
    trunk/webmail/html/send.php

Added Paths:
-----------
    trunk/webmail/config/ckeditor_config.js

Removed Paths:
-------------
    trunk/webmail/config/fckconfig.js

Property Changed:
----------------
    trunk/webmail/

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2011-03-05 15:08:15 UTC (rev 2401)
+++ trunk/build.xml	2011-03-06 11:47:03 UTC (rev 2402)
@@ -65,7 +65,7 @@
           defaultcategoryname="default">
             <fileset dir="${project.source.dir}">
                 <include name="**/*.php" />
-                <exclude name="fckeditor/**" />
+                <exclude name="ckeditor/**" />
             </fileset>
         </phpdoc>
     </target>
@@ -83,7 +83,7 @@
           haltonwarning="true">
             <fileset dir="${project.source.dir}">
                 <include name="**/*.php" />
-                <exclude name="fckeditor/**" />
+                <exclude name="ckeditor/**" />
                 <exclude name="_tests/lang/**" />
                 <exclude name="_tests/themes/**" />
             </fileset>
@@ -99,7 +99,7 @@
         <phpmd>
             <fileset dir="${project.source.dir}">
                 <include name="**/*.php" />
-                <exclude name="fckeditor/**" />
+                <exclude name="ckeditor/**" />
                 <exclude name="_tests/lang/**" />
                 <exclude name="_tests/themes/**" />
             </fileset>
@@ -121,10 +121,6 @@
                 <exclude name="config/conf.php" />
                 <exclude name="prefs/**" />
                 <exclude name="_tests/**" />
-                <exclude name="fckeditor/_dev/**" />
-                <exclude name="fckeditor/_samples/**" />
-                <exclude name="fckeditor/_test/**" />
-                <exclude name="fckeditor/_testcases/**" />
                 <exclude name="nbproject/**" /> <!-- Netbeans Project -->
             </fileset>
         </copy>


Property changes on: trunk/webmail
___________________________________________________________________
Deleted: svn:externals
   - fckeditor http://svn.fckeditor.net/FCKeditor/tags/2.6.5/


Copied: trunk/webmail/config/ckeditor_config.js (from rev 2401, trunk/webmail/config/fckconfig.js)
===================================================================
--- trunk/webmail/config/ckeditor_config.js	                        (rev 0)
+++ trunk/webmail/config/ckeditor_config.js	2011-03-06 11:47:03 UTC (rev 2402)
@@ -0,0 +1,23 @@
+/*
+ * This file overwrites the default config from CKEditor.
+ */
+
+CKEDITOR.editorConfig = function( config )
+{
+    config.toolbar_NOCC = [
+        ['FontName','FontSize'],
+        ['TextColor','BGColor'],
+        ['Cut','Copy','Paste'],
+        ['Undo','Redo'],
+        ['Source'],
+        '/',
+        ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','RemoveFormat'],
+        ['OrderedList','UnorderedList','-','Outdent','Indent'],
+        ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
+        ['Link','Unlink','-','Rule','-','SpecialChar'],
+        ['About'] // No comma for the last row.
+    ];
+    config.toolbar = 'NOCC';
+
+    config.removeDialogTabs = 'link:advanced;link:target';
+};
\ No newline at end of file

Deleted: trunk/webmail/config/fckconfig.js
===================================================================
--- trunk/webmail/config/fckconfig.js	2011-03-05 15:08:15 UTC (rev 2401)
+++ trunk/webmail/config/fckconfig.js	2011-03-06 11:47:03 UTC (rev 2402)
@@ -1,32 +0,0 @@
-/*
- * This file overwrites the default config from FCKeditor.
- */
-
-FCKConfig.ToolbarSets["NOCC"] = [
-	['FontName','FontSize'],
-	['TextColor','BGColor'],
-	['Cut','Copy','Paste'],
-	['Undo','Redo'],
-	['Source'],
-	'/',
-	['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','RemoveFormat'],
-	['OrderedList','UnorderedList','-','Outdent','Indent'],
-	['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
-	['Link','Unlink','-','Rule','-','SpecialChar'],
-	['About']		// No comma for the last row.
-] ;
-
-FCKConfig.LinkDlgHideTarget		= true ;
-FCKConfig.LinkDlgHideAdvanced	= true ;
-
-FCKConfig.LinkBrowser = false ;
-
-FCKConfig.ImageBrowser = false ;
-
-FCKConfig.FlashBrowser = false ;
-
-FCKConfig.LinkUpload = false ;
-
-FCKConfig.ImageUpload = false ;
-
-FCKConfig.FlashUpload = false ;

Modified: trunk/webmail/docs/NEWS
===================================================================
--- trunk/webmail/docs/NEWS	2011-03-05 15:08:15 UTC (rev 2401)
+++ trunk/webmail/docs/NEWS	2011-03-06 11:47:03 UTC (rev 2402)
@@ -10,6 +10,7 @@
     * RFE #2985080 : Group items in character encoding list (Tim Gerundt).
 
   Misc
+    * Switch from FCKeditor to CKEditor (Tim Gerundt).
     * Use text links for next/previous mail navigation (Tim Gerundt).
     * Change "Cc self" to "Bcc self" (Tim Gerundt).
     * Fix a problem with shorted subjects in inbox (Tim Gerundt).

Modified: trunk/webmail/html/prefs.php
===================================================================
--- trunk/webmail/html/prefs.php	2011-03-05 15:08:15 UTC (rev 2401)
+++ trunk/webmail/html/prefs.php	2011-03-06 11:47:03 UTC (rev 2402)
@@ -127,7 +127,7 @@
              <input type="checkbox" name="cc_self" id="cc_self" value="on" <?php if($user_prefs->getBccSelf()) echo 'checked="checked"'; ?> /><label for="cc_self"><?php echo convertLang2Html($html_bccself) ?></label>
            </td>
          </tr>
-         <?php if (file_exists('fckeditor/fckeditor.php')) { ?>
+         <?php if (file_exists('ckeditor/ckeditor.php')) { ?>
          <tr>
            <td class="prefsLabel">&nbsp;</td>
            <td class="prefsData">
@@ -154,14 +154,12 @@
          <tr>
            <td class="prefsLabel"><label for="signature"><?php echo convertLang2Html($html_signature_label) ?></label></td>
            <td class="prefsData">
-             <?php if ($user_prefs->getSendHtmlMail() && file_exists('fckeditor/fckeditor.php')) {
-               include 'fckeditor/fckeditor.php';
-               $oFCKeditor = new FCKeditor('signature');
-               $oFCKeditor->ToolbarSet = 'NOCC';
-               $oFCKeditor->BasePath = 'fckeditor/';
-               $oFCKeditor->Config['CustomConfigurationsPath'] = $conf->base_url . 'config/fckconfig.js';
-               $oFCKeditor->Value = $user_prefs->getSignature();
-               $oFCKeditor->Create();
+             <?php if ($user_prefs->getSendHtmlMail() && file_exists('ckeditor/ckeditor.php')) {
+               include 'ckeditor/ckeditor.php';
+               $oCKEditor = new CKEditor();
+               $oCKEditor->basePath = 'ckeditor/';
+               $oCKEditor->config['customConfig'] = $conf->base_url . 'config/ckeditor_config.js';
+               $oCKEditor->editor('signature', $user_prefs->getSignature());
              } else { ?>
              <textarea class="button" name="signature" id="signature" rows="5" cols="40"><?php echo $user_prefs->getSignature(); ?></textarea>
              <?php } ?>

Modified: trunk/webmail/html/send.php
===================================================================
--- trunk/webmail/html/send.php	2011-03-05 15:08:15 UTC (rev 2401)
+++ trunk/webmail/html/send.php	2011-03-06 11:47:03 UTC (rev 2402)
@@ -146,17 +146,15 @@
      <tr>
        <td>&nbsp;</td>
        <td class="sendData">
-         <?php if (!NOCC_Session::getSendHtmlMail() || !file_exists('fckeditor/fckeditor.php')) { ?>
+         <?php if (!NOCC_Session::getSendHtmlMail() || !file_exists('ckeditor/ckeditor.php')) { ?>
          <textarea name="mail_body" cols="82" rows="20"><?php echo (isset($mail_body) ? htmlspecialchars($mail_body) : '') ?></textarea>
          <?php
            } else {
-                include 'fckeditor/fckeditor.php';
-                $oFCKeditor = new FCKeditor('mail_body') ;
-                $oFCKeditor->ToolbarSet = 'NOCC';
-                $oFCKeditor->BasePath = 'fckeditor/';
-                $oFCKeditor->Config['CustomConfigurationsPath'] = $conf->base_url . 'config/fckconfig.js';
-                $oFCKeditor->Value = isset($mail_body) ? $mail_body : '';
-                $oFCKeditor->Create();
+                include 'ckeditor/ckeditor.php';
+                $oCKEditor = new CKEditor();
+                $oCKEditor->basePath = 'ckeditor/';
+                $oCKEditor->config['customConfig'] = $conf->base_url . 'config/ckeditor_config.js';
+                $oCKEditor->editor('mail_body', isset($mail_body) ? $mail_body : '');
            }
          ?>
        </td>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.