From dhaun at qs1489.pair.com  Sat Feb  2 10:04:39 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 02 Feb 2008 15:04:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs calendar.html, 1.9,
	1.10 history, 1.602, 1.603
Message-ID: <20080202150439.7A4EF10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv41526/public_html/docs

Modified Files:
	calendar.html history 
Log Message:
Removed the last (unused) traces of the $_STATES array


Index: calendar.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/calendar.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** calendar.html	5 Aug 2007 09:33:02 -0000	1.9
--- calendar.html	2 Feb 2008 15:04:37 -0000	1.10
***************
*** 105,111 ****
      <a href="config.html#locale">locale settings</a> from Geeklog's main
      <tt>config.php</tt>.</li>
- <li>The names of the <a name="states">states</a> that are listed in a drop-down
-     box when submitting an event are taken from the <code>$_STATES</code> array
-     at the end of Geeklog's main <tt>config.php</tt>.</li>
  </ul>
  
--- 105,108 ----

Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.602
retrieving revision 1.603
diff -C2 -d -r1.602 -r1.603
*** history	21 Dec 2007 13:50:15 -0000	1.602
--- history	2 Feb 2008 15:04:37 -0000	1.603
***************
*** 1,6 ****
  Geeklog History/Changes:
  
! ??? ??, 2007 (1.5.0)
  ------------
  - New function SEC_encryptPassword() to be used when we have to encrypt a
    password. This is only a wrapper for md5() for now but should it make easier
--- 1,8 ----
  Geeklog History/Changes:
  
! ??? ??, 2008 (1.5.0)
  ------------
+ - COM_hit() is now called from COM_siteFooter() instead of doing the UPDATE SQL
+   directly (reported by Joe Mucchiello) [Dirk]
  - New function SEC_encryptPassword() to be used when we have to encrypt a
    password. This is only a wrapper for md5() for now but should it make easier
***************
*** 112,115 ****
--- 114,119 ----
  Calendar plugin (1.0.2)
  ---------------
+ - The global $_STATES has been removed from Geeklog. The state in an event's
+   details is now a simple text entry field.
  - The form to add an event to the personal calendar was missing the site footer
    (reported by Mark Evans) [Dirk]
***************
*** 121,125 ****
  - Added config option what should be displayed after event saving [Oliver]
  
! Links plugin (2.0)
  ------------
  - Added owner_id field to submissions to record submitter and align with
--- 125,129 ----
  - Added config option what should be displayed after event saving [Oliver]
  
! Links plugin (2.0.0)
  ------------
  - Added owner_id field to submissions to record submitter and align with
***************
*** 150,154 ****
    simple x.x.x.x-y.y.y.y ranges [Dirk]
  
! Static Pages plugin (1.5)
  -------------------
  - Bugfix: In a multi-language setup, we need to be able to see all topics for
--- 154,158 ----
    simple x.x.x.x-y.y.y.y ranges [Dirk]
  
! Static Pages plugin (1.5.0)
  -------------------
  - Bugfix: In a multi-language setup, we need to be able to see all topics for



From dhaun at qs1489.pair.com  Sat Feb  2 10:04:39 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 02 Feb 2008 15:04:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html siteconfig.php,1.9,1.10
Message-ID: <20080202150439.6014610FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv41526/public_html

Modified Files:
	siteconfig.php 
Log Message:
Removed the last (unused) traces of the $_STATES array


Index: siteconfig.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/siteconfig.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** siteconfig.php	27 Jan 2008 15:23:32 -0000	1.9
--- siteconfig.php	2 Feb 2008 15:04:37 -0000	1.10
***************
*** 27,32 ****
  
  // Useful Stuff
- global $_STATES;
- 
  
  if (!defined('LB')) {
--- 27,30 ----



From dhaun at qs1489.pair.com  Sat Feb  2 11:36:36 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 02 Feb 2008 16:36:36 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install
	config-install.php, 1.21, 1.22
Message-ID: <20080202163636.1A6D010FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv44585/public_html/admin/install

Modified Files:
	config-install.php 
Log Message:
Have the config data for the Static Pages plugin in only one place


Index: config-install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/config-install.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** config-install.php	27 Jan 2008 10:53:03 -0000	1.21
--- config-install.php	2 Feb 2008 16:36:34 -0000	1.22
***************
*** 38,42 ****
  function install_config()
  {
!     global $_TABLES;
  
      $c = config::get_instance();
--- 38,42 ----
  function install_config()
  {
!     global $_CONF, $_TABLES;
  
      $c = config::get_instance();
***************
*** 230,245 ****
  
      // Add the configuration records for the default installed plugins
!     $c->add('allow_php', 1, 'select', 0, 0, 0, 10, true, 'staticpages');
!     $c->add('sort_by', 'id', 'select', 0, 0, 2, 20, true, 'staticpages');
!     $c->add('sort_menu_by', 'label', 'select', 0, 0, 3, 30, true, 'staticpages');
!     $c->add('delete_pages', 0, 'select', 0, 0, 0, 40, true, 'staticpages');
!     $c->add('in_block', 1, 'select', 0, 0, 0, 50, true, 'staticpages');
!     $c->add('show_hits', 1, 'select', 0, 0, 0, 60, true, 'staticpages');
!     $c->add('show_date', 1, 'select', 0, 0, 0, 70, true, 'staticpages');
!     $c->add('filter_html', 0, 'select', 0, 0, 0, 80, true, 'staticpages');
!     $c->add('censor', 1, 'select', 0, 0, 0, 90, true, 'staticpages');
!     $c->add('aftersave', 'item', 'select', 0, 0, 9, 100, true, 'staticpages');
!     $c->add('atom_max_items', 10, 'text', 0, 0, null, 110, true, 'staticpages');
!     $c->add('default_permissions', array(3,2,2,2), '@select', 0, 1, 12, 120, true, 'staticpages');
  
      $c->add('logging', true, 'select', 0, 0, 1, 10, true, 'spamx');
--- 230,239 ----
  
      // Add the configuration records for the default installed plugins
!     $plugin_path = $_CONF['path'] . 'plugins/';
! 
!     require_once $plugin_path . 'staticpages/install_defaults.php';
! 
!     plugin_initconfig_staticpages();
! 
  
      $c->add('logging', true, 'select', 0, 0, 1, 10, true, 'spamx');



From dhaun at qs1489.pair.com  Sat Feb  2 11:36:36 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 02 Feb 2008 16:36:36 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.113,
	1.114 install_defaults.php, 1.2, 1.3
Message-ID: <20080202163636.1279C10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv44585/plugins/staticpages

Modified Files:
	functions.inc install_defaults.php 
Log Message:
Have the config data for the Static Pages plugin in only one place


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** functions.inc	26 Jan 2008 13:14:46 -0000	1.113
--- functions.inc	2 Feb 2008 16:36:33 -0000	1.114
***************
*** 1021,1025 ****
  function plugin_upgrade_staticpages ()
  {
!     global $_CONF,$_TABLES, $_SP_CONF, $plugin_path;
  
      // the plugin needs this function so complain when it doesn't exist
--- 1021,1025 ----
  function plugin_upgrade_staticpages ()
  {
!     global $_CONF, $_TABLES, $_SP_CONF, $plugin_path;
  
      // the plugin needs this function so complain when it doesn't exist
***************
*** 1031,1068 ****
                               "pi_name = 'staticpages'");
  
!     if ($pi_version == '1.4.3') {  // Need to initialize the config table - GL 1.5+ feature
!         if (file_exists("{$plugin_path}config.php")) {
!             require_once $_CONF['path_system'] . 'classes/config.class.php';
!             $sp_config = config::get_instance();
!             $sp_config->initConfig();
!             if (! $sp_config->group_exists('staticpages')) {
!                 $sp_config->add('allow_php', $_SP_CONF['allow_php'], 'select', 0, 0, 0, 10, true, 'staticpages');
!                 $sp_config->add('sort_by', $_SP_CONF['sort_by'], 'select', 0, 0, 2, 20, true, 'staticpages');
!                 $sp_config->add('sort_menu_by', $_SP_CONF['sort_menu_by'], 'select', 0, 0, 3, 30, true, 'staticpages');
!                 $sp_config->add('delete_pages', $_SP_CONF['delete_pages'], 'select', 0, 0, 0, 40, true, 'staticpages');
!                 $sp_config->add('in_block', $_SP_CONF['in_block'], 'select', 0, 0, 0, 50, true, 'staticpages');
!                 $sp_config->add('show_hits', $_SP_CONF['show_hits'], 'select', 0, 0, 0, 60, true, 'staticpages');
!                 $sp_config->add('show_date', $_SP_CONF['show_date'], 'select', 0, 0, 0, 70, true, 'staticpages');
!                 $sp_config->add('filter_html', $_SP_CONF['filter_html'], 'select', 0, 0, 0, 80, true, 'staticpages');
!                 $sp_config->add('censor', $_SP_CONF['censor'], 'select', 0, 0, 0, 90, true, 'staticpages');
!                 $sp_config->add('aftersave', $_SP_CONF['aftersave'], 'select', 0, 0, 9, 100, true, 'staticpages');
!                 $sp_config->add('atom_max_items', $_SP_CONF['atom_max_items'], 'text', 0, 0, null, 110, true, 'staticpages');
!                 $sp_config->add('default_permissions', $_SP_CONF['default_permissions'], '@select', 0, 1, 12, 120, true, 'staticpages');
  
!                 // Rename the existing config.php as it's not needed now
!                 $ret = @rename ("{$plugin_path}config.php","{$plugin_path}config-pre1.4.3.php");
!                 if (!$ret) {
!                     COM_errorLog("Staticpages upgrade to 1.5 error - unable to rename plugins config.php to complete upgrade");
!                     return 3003;
!                 } elseif ($sp_config->group_exists('staticpages')) {
!                     DB_query ("UPDATE {$_TABLES['plugins']} SET pi_version = '1.5.0' WHERE pi_name = 'staticpages'");
!                 } else {
!                     COM_errorLog("Staticpages upgrade to 1.5 failed");
!                     return 3001;
!                 }
              }
          } else {
!             COM_errorLog("Staticpages upgrade to 1.5 failed - missing plugins config.php");
!             return 3004;
          }
  
--- 1031,1059 ----
                               "pi_name = 'staticpages'");
  
!     if ($pi_version == '1.4.3') { // Need to initialize the config table
  
!         require_once $_CONF['path_system'] . 'classes/config.class.php';
!         require_once $plugin_path . 'install_defaults.php';
! 
!         if (!plugin_initconfig_staticpages()) {
!             COM_errorLog("Staticpages upgrade to 1.5.0 failed");
!             return 3001;
!         }
! 
!         if (file_exists($plugin_path . 'config.php')) {
!             // Rename the existing config.php as it's not needed any more
!             $ren = @rename($plugin_path . 'config.php',
!                            $plugin_path . 'config-pre1.4.3.php');
!             if (!$ren) {
!                 COM_errorLog("Could not rename the Static Pages plugin's config.php file. Please remove if manually, as it is not needed any more.");
              }
+         }
+ 
+         $sp_config = config::get_instance();
+         if ($sp_config->group_exists('staticpages')) {
+             DB_query ("UPDATE {$_TABLES['plugins']} SET pi_version = '1.5.0', pi_gl_version = '1.5.0' WHERE pi_name = 'staticpages'");
          } else {
!             COM_errorLog("Staticpages upgrade to 1.5.0 failed");
!             return 3001;
          }
  

Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/install_defaults.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install_defaults.php	27 Jan 2008 19:53:00 -0000	1.2
--- install_defaults.php	2 Feb 2008 16:36:33 -0000	1.3
***************
*** 1,4 ****
--- 1,42 ----
  <?php
  
+ /* Reminder: always indent with 4 spaces (no tabs). */
+ // +---------------------------------------------------------------------------+
+ // | Static Pages Plugin 1.5                                                   |
+ // +---------------------------------------------------------------------------+
+ // | install_defaults.php                                                      |
+ // |                                                                           |
+ // | Initial Installation Defaults used when loading the online configuration  |
+ // | records. These settings are only used during the initial installation     |
+ // | and not referenced any more once the plugin is installed.                 |
+ // +---------------------------------------------------------------------------+
+ // | Copyright (C) 2008 by the following authors:                              |
+ // |                                                                           |
+ // | Authors: Blaine Lang      - blaine AT portalparts DOT com                 |
+ // |          Dirk Haun        - dirk AT haun-online DOT de                    |
+ // +---------------------------------------------------------------------------+
+ // |                                                                           |
+ // | This program is free software; you can redistribute it and/or             |
+ // | modify it under the terms of the GNU General Public License               |
+ // | as published by the Free Software Foundation; either version 2            |
+ // | of the License, or (at your option) any later version.                    |
+ // |                                                                           |
+ // | This program is distributed in the hope that it will be useful,           |
+ // | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
+ // | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
+ // | GNU General Public License for more details.                              |
+ // |                                                                           |
+ // | You should have received a copy of the GNU General Public License         |
+ // | along with this program; if not, write to the Free Software Foundation,   |
+ // | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
+ // |                                                                           |
+ // +---------------------------------------------------------------------------+
+ //
+ // $Id$
+ 
+ if (strpos($_SERVER['PHP_SELF'], 'install_defaults.php') !== false) {
+     die('This file can not be used on its own!');
+ }
+ 
  /*
   * Static Pages default settings
***************
*** 10,16 ****
   */
  
! if (strpos($_SERVER['PHP_SELF'], 'install_defaults.php') !== false) {
!     die('This file can not be used on its own!');
! }
  
  // If you don't plan on using PHP code in static pages, you should set this
--- 48,52 ----
   */
  
! global $_SP_DEFAULT;
  
  // If you don't plan on using PHP code in static pages, you should set this
***************
*** 69,72 ****
--- 105,160 ----
  // The maximum number of items displayed when an Atom feed is requested
  $_SP_DEFAULT['atom_max_items'] = 10;
+ 
+ 
+ /**
+ * Initialize Static Pages plugin configuration
+ *
+ * Creates the database entries for the configuation if they don't already
+ * exist. Initial values will be taken from $_SP_CONF if available (e.g. from
+ * an old config.php), uses $_SP_DEFAULT otherwise.
+ *
+ * @return   boolean     true: success; false: an error occurred
+ *
+ */
+ function plugin_initconfig_staticpages()
+ {
+     global $_SP_CONF, $_SP_DEFAULT;
+ 
+     if (is_array($_SP_CONF) && (count($_SP_CONF) > 1)) {
+         $_SP_DEFAULT = $_SP_CONF;
+     }
+ 
+     $c = config::get_instance();
+     if (!$c->group_exists('staticpages')) {
+ 
+         $c->add('allow_php', $_SP_DEFAULT['allow_php'], 'select',
+                 0, 0, 0, 10, true, 'staticpages');
+         $c->add('sort_by', $_SP_DEFAULT['sort_by'], 'select',
+                 0, 0, 2, 20, true, 'staticpages');
+         $c->add('sort_menu_by', $_SP_DEFAULT['sort_menu_by'], 'select',
+                 0, 0, 3, 30, true, 'staticpages');
+         $c->add('delete_pages', $_SP_DEFAULT['delete_pages'], 'select',
+                 0, 0, 0, 40, true, 'staticpages');
+         $c->add('in_block', $_SP_DEFAULT['in_block'], 'select',
+                 0, 0, 0, 50, true, 'staticpages');
+         $c->add('show_hits', $_SP_DEFAULT['show_hits'], 'select',
+                 0, 0, 0, 60, true, 'staticpages');
+         $c->add('show_date', $_SP_DEFAULT['show_date'], 'select',
+                 0, 0, 0, 70, true, 'staticpages');
+         $c->add('filter_html', $_SP_DEFAULT['filter_html'], 'select',
+                 0, 0, 0, 80, true, 'staticpages');
+         $c->add('censor', $_SP_DEFAULT['censor'], 'select',
+                 0, 0, 0, 90, true, 'staticpages');
+         $c->add('aftersave', $_SP_DEFAULT['aftersave'], 'select',
+                 0, 0, 9, 100, true, 'staticpages');
+         $c->add('atom_max_items', $_SP_DEFAULT['atom_max_items'], 'text',
+                 0, 0, null, 110, true, 'staticpages');
+         $c->add('default_permissions', $_SP_DEFAULT['default_permissions'],
+                 '@select', 0, 1, 12, 120, true, 'staticpages');
+ 
+     }
+ 
+     return true;
+ }
  
  ?>



From dhaun at qs1489.pair.com  Sat Feb  2 11:36:36 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 02 Feb 2008 16:36:36 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/staticpages
	install.php, 1.29, 1.30
Message-ID: <20080202163636.2982D10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv44585/public_html/admin/plugins/staticpages

Modified Files:
	install.php 
Log Message:
Have the config data for the Static Pages plugin in only one place


Index: install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/staticpages/install.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** install.php	26 Jan 2008 20:05:44 -0000	1.29
--- install.php	2 Feb 2008 16:36:34 -0000	1.30
***************
*** 54,60 ****
  $base_path = $_CONF['path'] . 'plugins/' . $pi_name . '/';
  
- // Load the configuration defaults
- require_once $base_path . 'install_defaults.php';
- 
  // name of the Admin group
  $pi_admin        = $pi_display_name . ' Admin';
--- 54,57 ----
***************
*** 105,130 ****
  function plugin_load_configuration()
  {
!     global $_CONF, $pi_name, $_SP_DEFAULT;
  
      require_once $_CONF['path_system'] . 'classes/config.class.php';
  
!     $sp_config = config::get_instance();
!     $sp_config->initConfig();
!     if (! $sp_config->group_exists($pi_name)) {
!         $sp_config->add('allow_php', $_SP_DEFAULT['allow_php'], 'select', 0, 0, 0, 10, true, 'staticpages');
!         $sp_config->add('sort_by', $_SP_DEFAULT['sort_by'], 'select', 0, 0, 2, 20, true, 'staticpages');
!         $sp_config->add('sort_menu_by', $_SP_DEFAULT['sort_menu_by'], 'select', 0, 0, 3, 30, true, 'staticpages');
!         $sp_config->add('delete_pages', $_SP_DEFAULT['delete_pages'], 'select', 0, 0, 0, 40, true, 'staticpages');
!         $sp_config->add('in_block', $_SP_DEFAULT['in_block'], 'select', 0, 0, 0, 50, true, 'staticpages');
!         $sp_config->add('show_hits', $_SP_DEFAULT['show_hits'], 'select', 0, 0, 0, 60, true, 'staticpages');
!         $sp_config->add('show_date', $_SP_DEFAULT['show_date'], 'select', 0, 0, 0, 70, true, 'staticpages');
!         $sp_config->add('filter_html', $_SP_DEFAULT['filter_html'], 'select', 0, 0, 0, 80, true, 'staticpages');
!         $sp_config->add('censor', $_SP_DEFAULT['censor'], 'select', 0, 0, 0, 90, true, 'staticpages');
!         $sp_config->add('aftersave', $_SP_DEFAULT['aftersave'], 'select', 0, 0, 9, 100, true, 'staticpages');
!         $sp_config->add('atom_max_items', $_SP_DEFAULT['atom_max_items'], 'text', 0, 0, null, 110, true, 'staticpages');
!         $sp_config->add('default_permissions', $_SP_DEFAULT['default_permissions'], '@select', 0, 1, 12, 120, true, 'staticpages');
!     }
! 
!     return true;
  }
  
--- 102,111 ----
  function plugin_load_configuration()
  {
!     global $_CONF, $base_path;
  
      require_once $_CONF['path_system'] . 'classes/config.class.php';
+     require_once $base_path . 'install_defaults.php';
  
!     return plugin_initconfig_staticpages();
  }
  



From dhaun at qs1489.pair.com  Sat Feb  2 11:36:36 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 02 Feb 2008 16:36:36 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.59,
	1.60
Message-ID: <20080202163636.39B5510FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv44585/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Have the config data for the Static Pages plugin in only one place


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** mysql_1.4.1_to_1.5.0.php	27 Jan 2008 19:52:31 -0000	1.59
--- mysql_1.4.1_to_1.5.0.php	2 Feb 2008 16:36:34 -0000	1.60
***************
*** 301,324 ****
  
      $plugin_path = $_CONF['path'] . 'plugins/staticpages/';
      if (file_exists($plugin_path . 'config.php')) {
          require_once $plugin_path . 'config.php';
-         $_SP_DEFAULT = $_SP_CONF;
-     } else {
-         require_once $plugin_path . 'install_defaults.php';
      }
  
!     $c = config::get_instance();
!     $c->add('allow_php', $_SP_DEFAULT['allow_php'], 'select', 0, 0, 0, 10, true, 'staticpages');
!     $c->add('sort_by', $_SP_DEFAULT['sort_by'], 'select', 0, 0, 2, 20, true, 'staticpages');
!     $c->add('sort_menu_by', $_SP_DEFAULT['sort_menu_by'], 'select', 0, 0, 3, 30, true, 'staticpages');
!     $c->add('delete_pages', $_SP_DEFAULT['delete_pages'], 'select', 0, 0, 0, 40, true, 'staticpages');
!     $c->add('in_block', $_SP_DEFAULT['in_block'], 'select', 0, 0, 0, 50, true, 'staticpages');
!     $c->add('show_hits', $_SP_DEFAULT['show_hits'], 'select', 0, 0, 0, 60, true, 'staticpages');
!     $c->add('show_date', $_SP_DEFAULT['show_date'], 'select', 0, 0, 0, 70, true, 'staticpages');
!     $c->add('filter_html', $_SP_DEFAULT['filter_html'], 'select', 0, 0, 0, 80, true, 'staticpages');
!     $c->add('censor', $_SP_DEFAULT['censor'], 'select', 0, 0, 0, 90, true, 'staticpages');
!     $c->add('aftersave', $_SP_DEFAULT['aftersave'], 'select', 0, 0, 9, 100, true, 'staticpages');
!     $c->add('atom_max_items', $_SP_DEFAULT['atom_max_items'], 'text', 0, 0, null, 110, true, 'staticpages');
!     $c->add('default_permissions', $_SP_DEFAULT['default_permissions'], '@select', 0, 1, 12, 120, true, 'staticpages');
  
      $P_SQL = array();
--- 301,316 ----
  
      $plugin_path = $_CONF['path'] . 'plugins/staticpages/';
+     require_once $plugin_path . 'install_defaults.php';
+ 
      if (file_exists($plugin_path . 'config.php')) {
+         global $_SP_CONF;
+ 
          require_once $plugin_path . 'config.php';
      }
  
!     if (!plugin_initconfig_staticpages()) {
!         echo 'There was an error upgrading the Static Pages plugin';
!         return false;
!     }
  
      $P_SQL = array();
***************
*** 331,335 ****
          $rst = DB_query($sql);
          if (DB_error()) {
!             echo "There was an error upgrading the staticpages, SQL: $sql<br>";
              return false;
          }
--- 323,327 ----
          $rst = DB_query($sql);
          if (DB_error()) {
!             echo "There was an error upgrading the Static Pages plugin, SQL: $sql<br>";
              return false;
          }
***************
*** 337,346 ****
  
      if (file_exists($plugin_path . 'config.php')) {
!         $ret = @rename($plugin_path . 'config.php',
                         $plugin_path . 'config-pre1.4.3.php');
-         if (!ret) {
-             echo "There was an error upgrading the Static Pages plugin: Could not rename config.php";
-             return false;
-         }
      }
  
--- 329,335 ----
  
      if (file_exists($plugin_path . 'config.php')) {
!         // Rename the existing config.php as it's not needed any more
!         $ren = @rename($plugin_path . 'config.php',
                         $plugin_path . 'config-pre1.4.3.php');
      }
  



From dhaun at qs1489.pair.com  Sat Feb  2 15:03:09 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 02 Feb 2008 20:03:09 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/spamx
	install.php, 1.22, 1.23
Message-ID: <20080202200309.15CE810FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/spamx
In directory qs1489.pair.com:/tmp/cvs-serv51673/public_html/admin/plugins/spamx

Modified Files:
	install.php 
Log Message:
Have the config data for the Spam-X plugin in only one place


Index: install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/spamx/install.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** install.php	26 Jan 2008 20:06:07 -0000	1.22
--- install.php	2 Feb 2008 20:03:06 -0000	1.23
***************
*** 51,54 ****
--- 51,56 ----
  $pi_url          = 'http://www.pigstye.net/gplugs/staticpages/index.php/spamx';
  
+ $base_path = $_CONF['path'] . 'plugins/' . $pi_name . '/';
+ 
  // name of the Admin group
  $pi_admin        = $pi_name . ' Admin';
***************
*** 92,110 ****
  function plugin_load_configuration()
  {
!     global $_CONF, $pi_name;
  
      require_once $_CONF['path_system'] . 'classes/config.class.php';
  
!     $c = config::get_instance();
!     $c->initConfig();
!     if (!$c->group_exists($pi_name)) {
!         $c->add('logging', true, 'select', 0, 0, 1, 10, true, 'spamx');
!         $c->add('admin_override', false, 'select', 0, 0, 1, 20, true, 'spamx');
!         $c->add('timeout', 5, 'text', 0, 0, null, 30, true, 'spamx');
!         $c->add('notification_email', '', 'text', 0, 0, null, 40, false, 'spamx');
!         $c->add('action', 128, 'text', 0, 0, null, 50, false, 'spamx');
!     }
! 
!     return true;
  }
  
--- 94,103 ----
  function plugin_load_configuration()
  {
!     global $_CONF, $base_path;
  
      require_once $_CONF['path_system'] . 'classes/config.class.php';
+     require_once $base_path . 'install_defaults.php';
  
!     return plugin_initconfig_spamx();
  }
  



From dhaun at qs1489.pair.com  Sat Feb  2 15:03:08 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 02 Feb 2008 20:03:08 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install
	config-install.php, 1.22, 1.23
Message-ID: <20080202200309.0336E10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv51673/public_html/admin/install

Modified Files:
	config-install.php 
Log Message:
Have the config data for the Spam-X plugin in only one place


Index: config-install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/config-install.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** config-install.php	2 Feb 2008 16:36:34 -0000	1.22
--- config-install.php	2 Feb 2008 20:03:06 -0000	1.23
***************
*** 233,245 ****
  
      require_once $plugin_path . 'staticpages/install_defaults.php';
- 
      plugin_initconfig_staticpages();
  
! 
!     $c->add('logging', true, 'select', 0, 0, 1, 10, true, 'spamx');
!     $c->add('admin_override', false, 'select', 0, 0, 1, 20, true, 'spamx');
!     $c->add('timeout', 5, 'text', 0, 0, null, 30, true, 'spamx');
!     $c->add('notification_email', '', 'text', 0, 0, null, 40, false, 'spamx');
!     $c->add('action', 128, 'text', 0, 0, null, 50, false, 'spamx');
  }
  
--- 233,240 ----
  
      require_once $plugin_path . 'staticpages/install_defaults.php';
      plugin_initconfig_staticpages();
  
!     require_once $plugin_path . 'spamx/install_defaults.php';
!     plugin_initconfig_spamx();
  }
  



From dhaun at qs1489.pair.com  Sat Feb  2 15:03:08 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 02 Feb 2008 20:03:08 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/spamx install_defaults.php, NONE,
	1.1 ProjectHoneyPot.Examine.class.php, 1.2, 1.3 functions.inc,
	1.31, 1.32 config.php, 1.20, NONE
Message-ID: <20080202200309.025F610FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/spamx
In directory qs1489.pair.com:/tmp/cvs-serv51673/plugins/spamx

Modified Files:
	ProjectHoneyPot.Examine.class.php functions.inc 
Added Files:
	install_defaults.php 
Removed Files:
	config.php 
Log Message:
Have the config data for the Spam-X plugin in only one place


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/functions.inc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** functions.inc	26 Jan 2008 17:17:41 -0000	1.31
--- functions.inc	2 Feb 2008 20:03:06 -0000	1.32
***************
*** 177,182 ****
  
      $v = DB_getItem($_TABLES['plugins'], 'pi_version', "pi_name = 'spamx'");
- 
      if ($v != $_SPX_CONF['version']) {
          switch ($v) {
          case '1.0.1':
--- 177,182 ----
  
      $v = DB_getItem($_TABLES['plugins'], 'pi_version', "pi_name = 'spamx'");
      if ($v != $_SPX_CONF['version']) {
+ 
          switch ($v) {
          case '1.0.1':
***************
*** 187,238 ****
  
          case '1.1.0':
!             if (file_exists($plugin_path . 'config.php')) {
!                 require_once $_CONF['path_system'] . 'classes/config.class.php';
! 
!                 $spx_config = config::get_instance();
!                 $spx_config->initConfig();
!                 if (!$spx_config->group_exists('spamx')) {
!                     $enable_email = true;
!                     if (empty($_SPX_CONF['notification_email']) || ($_SPX_CONF['notification_email'] == $_CONF['site_mail'])) {
!                         $enable_email = false;
!                     }
  
!                     $spx_config->add('logging', $_SPX_CONF['logging'], 'select', 0, 0, 1, 10, true, 'spamx');
!                     $spx_config->add('admin_override', $_SPX_CONF['admin_override'], 'select', 0, 0, 1, 20, true, 'spamx');
!                     $spx_config->add('timeout', $_SPX_CONF['timeout'], 'text', 0, 0, null, 30, true, 'spamx');
!                     $spx_config->add('notification_email', $_SPX_CONF['notification_email'], 'text', 0, 0, null, 40, $enable_email, 'spamx');
!                     $spx_config->add('action', $_SPX_CONF['action'], 'text', 0, 0, null, 50, false, 'spamx');
  
!                     // rename plugin's config.php as it's not needed any more
!                     $ret = @rename($plugin_path . 'config.php',
!                                    $plugin_path . 'config-pre1.1.1.php');
!                     if (!ret) {
!                         COM_errorLog("Spam-X upgrade failed - unable to rename plugin's config.php to complete upgrade");
!                         return 3002;
!                     } elseif ($spx_config->group_exists('spamx')) {
!                         DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '{$_SPX_CONF['version']}', pi_gl_version = '1.5.0' WHERE pi_name = 'spamx'");
!                     } else {
!                         COM_errorLog("Spam-X upgrade failed.");
!                         return 3002;
!                     }
                  }
              } else {
!                 COM_errorLog("Spam-X upgrade failed - did not find plugin's config.php");
                  return 3002;
              }
              break;
          }
- 
-         // update version numbers
- 
-         // check if version number was updated successfully
-         $v = DB_getItem($_TABLES['plugins'], 'pi_version', "pi_name = 'spamx'");
      }
  
!     if ($v == $_SPX_CONF['version']) {
!         return 3001;
!     }
! 
!     return 3002;
  }
  
--- 187,219 ----
  
          case '1.1.0':
!             require_once $_CONF['path_system'] . 'classes/config.class.php';
!             require_once $plugin_path . 'install_defaults.php';
  
!             if (!plugin_initconfig_spamx()) {
!                 COM_errorLog("Spam-X upgrade to 1.1.1 failed");
!                 return 3002;
!             }
  
!             if (file_exists($plugin_path . 'config.php')) {
!                 // Rename the existing config.php as it's not needed any more
!                 $ren = @rename($plugin_path . 'config.php',
!                                $plugin_path . 'config-pre1.1.1.php');
!                 if (!$ren) {
!                     COM_errorLog("Could not rename the ages Spam-X plugin's config.php file. Please remove if manually, as it is not needed any more.");
                  }
+             }
+ 
+             $spx_config = config::get_instance();
+             if ($spx_config->group_exists('spamx')) {
+                 DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '1.1.1', pi_gl_version = '1.5.0' WHERE pi_name = 'spamx'");
              } else {
!                 COM_errorLog("Spam-X upgrade to 1.1.1 failed");
                  return 3002;
              }
              break;
          }
      }
  
!     return 3001; // success msg
  }
  

--- config.php DELETED ---

Index: ProjectHoneyPot.Examine.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/ProjectHoneyPot.Examine.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProjectHoneyPot.Examine.class.php	7 May 2007 19:40:45 -0000	1.2
--- ProjectHoneyPot.Examine.class.php	2 Feb 2008 20:03:06 -0000	1.3
***************
*** 56,59 ****
--- 56,79 ----
  
  /*
+  * The following settings all relate to the ProjectHoneyPot.org http:BL
+  * examine module. In order to use this, you *MUST* register with
+  * ProjectHoneyPot. You *MUST* install a Honey Pot. You *MUST* accept the
+  * terms of use of the http:BL and acquire your own http:BL access key.
+  */
+ $_SPX_CONF['http_bl_enable'] = true; // Whether or not to use the http:BL, true or false.
+ // You can get your access key from: http://www.projecthoneypot.org/httpbl_configure.php
+ // regardless of http_bl_enable, if you don't have a key, this won't work.
+ $_SPX_CONF['http_bl_access_key'] = 'NOT.CONFIGURED.RIGHT';
+ // Whether or not to use TCP (Virtual Circuits) instead of UDP. If set to false,
+ // UDP will be used unless TCP is required. TCP is required for questions or
+ // responses greater than 512 bytes.
+ $_SPX_CONF['http_bl_use_tcp'] = true; 
+ // DNS Servers to use, in my development environment, I found that the examine
+ // failed without configuring this. Must be an array of IP addresses, or false:
+ $_SPX_CONF['http_bl_dns_servers'] = false;
+ // example of array with dummy values: $_SPX_CONF['http_bl_dns_servers'] = array('ip1','ip2');
+ 
+ 
+ /*
   * Debug settings:
   *

--- NEW FILE: install_defaults.php ---
<?php

/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
// | Spam-X plugin 1.1                                                         |
// +---------------------------------------------------------------------------+
// | install_defaults.php                                                      |
// |                                                                           |
// | Initial Installation Defaults used when loading the online configuration  |
// | records. These settings are only used during the initial installation     |
// | and not referenced any more once the plugin is installed.                 |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2008 by the following authors:                              |
// |                                                                           |
// | Authors: Dirk Haun        - dirk AT haun-online DOT de                    |
// +---------------------------------------------------------------------------+
// |                                                                           |
// | This program is free software; you can redistribute it and/or             |
// | modify it under the terms of the GNU General Public License               |
// | as published by the Free Software Foundation; either version 2            |
// | of the License, or (at your option) any later version.                    |
// |                                                                           |
// | This program is distributed in the hope that it will be useful,           |
// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
// | GNU General Public License for more details.                              |
// |                                                                           |
// | You should have received a copy of the GNU General Public License         |
// | along with this program; if not, write to the Free Software Foundation,   |
// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
// |                                                                           |
// +---------------------------------------------------------------------------+
//
// $Id: install_defaults.php,v 1.1 2008/02/02 20:03:06 dhaun Exp $

if (strpos($_SERVER['PHP_SELF'], 'install_defaults.php') !== false) {
    die('This file can not be used on its own!');
}

/*
 * Spam-X default settings
 *
 * Initial Installation Defaults used when loading the online configuration
 * records. These settings are only used during the initial installation
 * and not referenced any more once the plugin is installed
 *
 */

global $_SPX_DEFAULT;

// Default Spam-X Action
$_SPX_DEFAULT['action'] = 128; // Default is to ignore (delete) the post

// address which mail admin module will use
// same as $_CONF['site_mail'] if empty
$_SPX_DEFAULT['notification_email'] = '';

// if set to = true, skip spam check for members of the "spamx Admin" group
$_SPX_DEFAULT['admin_override'] = false;

// enable / disable logging to spamx.log
$_SPX_DEFAULT['logging'] = true;

// timeout for contacting external services, e.g. SLV
$_SPX_DEFAULT['timeout'] = 5; // in seconds


/**
* Initialize Spam-X plugin configuration
*
* Creates the database entries for the configuation if they don't already
* exist. Initial values will be taken from $_SPX_CONF if available (e.g. from
* an old config.php), uses $_SPX_DEFAULT otherwise.
*
* @return   boolean     true: success; false: an error occurred
*
*/
function plugin_initconfig_spamx()
{
    global $_CONF, $_SPX_CONF, $_SPX_DEFAULT;

    if (is_array($_SPX_CONF) && (count($_SPX_CONF) > 1)) {
        $_SPX_DEFAULT = $_SPX_CONF;
    }

    $c = config::get_instance();
    if (!$c->group_exists('spamx')) {

        $enable_email = true;
        if (empty($_SPX_DEFAULT['notification_email']) || ($_SPX_DEFAULT['notification_email'] == $_CONF['site_mail'])) {
            $enable_email = false;
        }

        $c->add('logging', $_SPX_DEFAULT['logging'], 'select',
                0, 0, 1, 10, true, 'spamx');
        $c->add('admin_override', $_SPX_DEFAULT['admin_override'], 'select',
                0, 0, 1, 20, true, 'spamx');
        $c->add('timeout', $_SPX_DEFAULT['timeout'], 'text',
                0, 0, null, 30, true, 'spamx');
        $c->add('notification_email', $_SPX_DEFAULT['notification_email'],
                'text', 0, 0, null, 40, $enable_email, 'spamx');
        $c->add('action', $_SPX_DEFAULT['action'], 'text',
                0, 0, null, 50, false, 'spamx');

    }

    return true;
}

?>



From dhaun at qs1489.pair.com  Sat Feb  2 15:03:09 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 02 Feb 2008 20:03:09 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.60,
	1.61
Message-ID: <20080202200309.15F1810FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv51673/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Have the config data for the Spam-X plugin in only one place


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** mysql_1.4.1_to_1.5.0.php	2 Feb 2008 16:36:34 -0000	1.60
--- mysql_1.4.1_to_1.5.0.php	2 Feb 2008 20:03:07 -0000	1.61
***************
*** 377,386 ****
      require_once $_CONF['path_system'] . 'classes/config.class.php';
  
!     $c = config::get_instance();
!     $c->add('logging', true, 'select', 0, 0, 1, 10, true, 'spamx');
!     $c->add('admin_override', false, 'select', 0, 0, 1, 20, true, 'spamx');
!     $c->add('timeout', 5, 'text', 0, 0, null, 30, true, 'spamx');
!     $c->add('notification_email', '', 'text', 0, 0, null, 40, false, 'spamx');
!     $c->add('action', 128, 'text', 0, 0, null, 50, false, 'spamx');
  
      $sql = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.1.1', pi_gl_version = '1.5.0' WHERE pi_name = 'spamx'";
--- 377,393 ----
      require_once $_CONF['path_system'] . 'classes/config.class.php';
  
!     $plugin_path = $_CONF['path'] . 'plugins/spamx/';
!     require_once $plugin_path . 'install_defaults.php';
! 
!     if (file_exists($plugin_path . 'config.php')) {
!         global $_SPX_CONF;
! 
!         require_once $plugin_path . 'config.php';
!     }
! 
!     if (!plugin_initconfig_spamx()) {
!         echo 'There was an error upgrading the Spam-X plugin';
!         return false;
!     }
  
      $sql = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.1.1', pi_gl_version = '1.5.0' WHERE pi_name = 'spamx'";



From blaine at qs1489.pair.com  Sat Feb  2 16:56:21 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 02 Feb 2008 21:56:21 +0000
Subject: [geeklog-cvs] Geeklog-1.x/language english.php, 1.325,
	1.326 english_utf-8.php, 1.110, 1.111
Message-ID: <20080202215621.127EC10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/language
In directory qs1489.pair.com:/tmp/cvs-serv56580

Modified Files:
	english.php english_utf-8.php 
Log Message:
Modifications to config manager to not use a standard block function. Config Manager menu(s) are setup to be part of the configmanager template. The config menu block will use the theme's functions.php to get any block header and footer templates. By default we are using a new pair of templates that don't have a title to tighten up the layout.

Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english.php,v
retrieving revision 1.325
retrieving revision 1.326
diff -C2 -d -r1.325 -r1.326
*** english.php	27 Jan 2008 10:53:03 -0000	1.325
--- english.php	2 Feb 2008 21:56:18 -0000	1.326
***************
*** 1561,1570 ****
  
  $LANG_CONFIG = array(
!     'sections' => 'Configuration Sections',
!     'restore' => 'Restore',
!     'add_element' => 'Add Element',
!     'save_changes' => 'Save Changes',
!     'reset_form' => 'Reset Form',
!     'changes_made' => 'Changes were successfully made to'
  );
  
--- 1561,1572 ----
  
  $LANG_CONFIG = array(
!     'home'          => 'Home',
!     'admin_home'    => 'Site Administration',
!     'sections'      => 'Configuration Sections',
!     'restore'       => 'Restore',
!     'add_element'   => 'Add Element',
!     'save_changes'  => 'Save Changes',
!     'reset_form'    => 'Reset Form',
!     'changes_made'  => 'Changes were successfully made to'
  );
  

Index: english_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english_utf-8.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** english_utf-8.php	27 Jan 2008 10:53:03 -0000	1.110
--- english_utf-8.php	2 Feb 2008 21:56:18 -0000	1.111
***************
*** 1561,1570 ****
  
  $LANG_CONFIG = array(
!     'sections' => 'Configuration Sections',
!     'restore' => 'Restore',
!     'add_element' => 'Add Element',
!     'save_changes' => 'Save Changes',
!     'reset_form' => 'Reset Form',
!     'changes_made' => 'Changes were successfully made to'
  );
  
--- 1561,1572 ----
  
  $LANG_CONFIG = array(
!     'home'          => 'Home',
!     'admin_home'    => 'Site Administration',
!     'sections'      => 'Configuration Sections',
!     'restore'       => 'Restore',
!     'add_element'   => 'Add Element',
!     'save_changes'  => 'Save Changes',
!     'reset_form'    => 'Reset Form',
!     'changes_made'  => 'Changes were successfully made to'
  );
  



From blaine at qs1489.pair.com  Sat Feb  2 16:56:29 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 02 Feb 2008 21:56:29 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin configuration.php, 1.10,
	1.11
Message-ID: <20080202215629.DAD8D10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv56603

Modified Files:
	configuration.php 
Log Message:
Modifications to config manager to not use a standard block function. Config Manager menu(s) are setup to be part of the configmanager template. The config menu block will use the theme's functions.php to get any block header and footer templates. By default we are using a new pair of templates that don't have a title to tighten up the layout.

Index: configuration.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/configuration.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** configuration.php	27 Jan 2008 09:02:15 -0000	1.10
--- configuration.php	2 Feb 2008 21:56:27 -0000	1.11
***************
*** 39,97 ****
  $config =& config::get_instance();
  
- 
- function configmanager_menu()
- {
-     global $_CONF, $config, $conf_group, $LANG01, $LANG_ADMIN, $LANG_CONFIG,
-            $LANG_configsections, $LANG_configsubgroups;
- 
-     $retval = COM_startBlock($LANG_CONFIG['sections'], '', 'blockheader.thtml');
-     $link_array = array();
- 
-     $groups = $config->_get_groups();
-     if (count($groups) > 0) {
-         foreach ($groups as $group) {
-             if (empty($LANG_configsections[$group]['label'])) {
-                 $group_display = ucwords($group);
-             } else {
-                 $group_display = $LANG_configsections[$group]['label'];
-             }
-             $link = "<div><a href=\"#\" onclick='open_group(\"$group\")'>$group_display</a></div>";
- 
-             if ($group == 'Core') {
-                 $retval .= $link;
-             } else {
-                 $link_array[$group_display] = $link;
-             }
-         }
-     }
- 
-     uksort($link_array, 'strcasecmp');
-     foreach ($link_array as $link) {
-         $retval .= $link;
-     }
- 
-     $retval .= '<div><a href="' . $_CONF['site_admin_url'] . '">'
-             . $LANG_ADMIN['admin_home'] . '</a></div>';
-     $retval .= COM_endBlock('blockfooter.thtml');
- 
-     if (empty($LANG_configsections[$conf_group]['title'])) {
-         $subgroup_title = ucwords($conf_group);
-     } else {
-         $subgroup_title = $LANG_configsections[$conf_group]['title'];
-     }
-     $retval .= COM_startBlock($subgroup_title, '', 'blockheader.thtml');
- 
-     $groups = $config->get_sgroups($conf_group);
-     if (count($groups) > 0) {
-         foreach ($groups as $group) {
-             $group_display =  $LANG_configsubgroups[$conf_group][$group];
-             $retval .= "<div><a href=\"#\" onclick='open_subgroup(\"$conf_group\",\"$group\")'>$group_display</a></div>";
-         }
-     }
-     $retval .= COM_endBlock('blockfooter.thtml');
- 
-     return $retval;
- }
- 
  /**
  * Helper function: Provide language dropdown
--- 39,42 ----



From blaine at qs1489.pair.com  Sat Feb  2 16:56:37 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 02 Feb 2008 21:56:37 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional
	blockfooter-notitle.thtml, NONE, 1.1 blockheader-notitle.thtml,
	NONE, 1.1 functions.php, 1.9, 1.10
Message-ID: <20080202215637.03DA810FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional
In directory qs1489.pair.com:/tmp/cvs-serv56623

Modified Files:
	functions.php 
Added Files:
	blockfooter-notitle.thtml blockheader-notitle.thtml 
Log Message:
Modifications to config manager to not use a standard block function. Config Manager menu(s) are setup to be part of the configmanager template. The config menu block will use the theme's functions.php to get any block header and footer templates. By default we are using a new pair of templates that don't have a title to tighten up the layout.

Index: functions.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/functions.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** functions.php	8 Feb 2007 02:22:15 -0000	1.9
--- functions.php	2 Feb 2008 21:56:34 -0000	1.10
***************
*** 24,28 ****
  
  $_BLOCK_TEMPLATE['_msg_block'] = 'blockheader-message.thtml,blockfooter-message.thtml';
! 
  $_BLOCK_TEMPLATE['whats_related_block'] = 'blockheader-related.thtml,blockfooter-related.thtml';
  $_BLOCK_TEMPLATE['story_options_block'] = 'blockheader-related.thtml,blockfooter-related.thtml';
--- 24,28 ----
  
  $_BLOCK_TEMPLATE['_msg_block'] = 'blockheader-message.thtml,blockfooter-message.thtml';
! $_BLOCK_TEMPLATE['configmanager_block'] = 'blockheader-notitle.thtml,blockfooter-notitle.thtml';
  $_BLOCK_TEMPLATE['whats_related_block'] = 'blockheader-related.thtml,blockfooter-related.thtml';
  $_BLOCK_TEMPLATE['story_options_block'] = 'blockheader-related.thtml,blockfooter-related.thtml';

--- NEW FILE: blockheader-notitle.thtml ---
<div class="block-box" id="{blockid}">

--- NEW FILE: blockfooter-notitle.thtml ---
</div>
<div class="aligncenter">
    <div class="block-divider"></div>
</div>


From blaine at qs1489.pair.com  Sat Feb  2 16:56:36 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 02 Feb 2008 21:56:36 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/config
	configuration.thtml, 1.9, 1.10
Message-ID: <20080202215636.E962F10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/config
In directory qs1489.pair.com:/tmp/cvs-serv56623/admin/config

Modified Files:
	configuration.thtml 
Log Message:
Modifications to config manager to not use a standard block function. Config Manager menu(s) are setup to be part of the configmanager template. The config menu block will use the theme's functions.php to get any block header and footer templates. By default we are using a new pair of templates that don't have a title to tighten up the layout.

Index: configuration.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/config/configuration.thtml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configuration.thtml	27 Jan 2008 09:02:15 -0000	1.9
--- configuration.thtml	2 Feb 2008 21:56:34 -0000	1.10
***************
*** 5,45 ****
  <input type="hidden" value="" name="subgroup"{xhtml}>
  </form>
! <div class="pluginInfo" style="display:{show_changeblock};margin-top:5px;margin-bottom:5px;padding-left:20px;border:1px solid #CCC; height: 120px;overflow: auto; min-height: 50px; max-height: 100px;">
!   {lang_changes_made}:
!     {change_block}
! </div>
  
! <form action="configuration.php" method="post" name="subgroup">
! <input type="hidden" name="conf_group" value="{open_group}"{xhtml}>
! <input type="hidden" name="sub_group" value="{open_sg}"{xhtml}>
  
! <div id="ce_{subgroup_name}">
  
! <!-- BEGIN fieldset -->
! <fieldset style="margin-top:10px;"><legend>{fs_display}</legend>
  
! <!-- BEGIN notes -->
! <div class="notes">
!  <h4>{fs_display}</h4>
!  <p class="last">{fs_help}</p>
!  <span class="warningsmall">{fs_warning}</span>
! </div>
! <!-- END notes -->
  
! <table class="inputTable">
! <col width="200">
! <col>
! {fs_contents}
! </table>
! </fieldset>
! <!-- END fieldset -->
  
! </div>
  
  
! <input type="hidden" name="form_submit" value="true"{xhtml}>
! <div id="bottom_buttons" class="aligncenter">
! <input type="submit" value="{lang_save_changes}"{xhtml}>
! <input type="submit" name="form_reset" value="{lang_reset_form}"{xhtml}>
! </div>
! </form>
--- 5,55 ----
  <input type="hidden" value="" name="subgroup"{xhtml}>
  </form>
! <table>
!     <tr>
!         <td class="block-featured-left" style="vertical-align:top;">
!             <div class="block-bg-left"> {config_menu}
!         </td>
!         <td>
!             <div class="pluginInfo" style="display:{show_changeblock};margin-top:5px;margin-bottom:5px;padding-left:20px;border:1px solid #CCC; height: 120px;overflow: auto; min-height: 50px; max-height: 100px;">
!                 {lang_changes_made}:
!                 {change_block}
!             </div>
  
!             <form action="configuration.php" method="post" name="subgroup">
!             <input type="hidden" name="conf_group" value="{open_group}"{xhtml}>
!             <input type="hidden" name="sub_group" value="{open_sg}"{xhtml}>
  
!             <div id="ce_{subgroup_name}">
  
!             <!-- BEGIN fieldset -->
!             <fieldset style="margin-top:10px;"><legend>{fs_display}</legend>
  
!             <!-- BEGIN notes -->
!             <div class="notes">
!              <h4>{fs_display}</h4>
!              <p class="last">{fs_help}</p>
!              <span class="warningsmall">{fs_warning}</span>
!             </div>
!             <!-- END notes -->
  
!             <table class="inputTable">
!             <col width="200">
!             <col>
!             {fs_contents}
!             </table>
!             </fieldset>
!             <!-- END fieldset -->
  
!             </div>
  
  
!             <input type="hidden" name="form_submit" value="true"{xhtml}>
!             <div id="bottom_buttons" class="aligncenter">
!                 <input type="submit" value="{lang_save_changes}"{xhtml}>
!                 <input type="submit" name="form_reset" value="{lang_reset_form}"{xhtml}>
!             </div>
!             </form>
! 
!         </td>
!     </tr>
! </table>
\ No newline at end of file



From blaine at qs1489.pair.com  Sat Feb  2 16:56:45 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 02 Feb 2008 21:56:45 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.18,
	1.19
Message-ID: <20080202215645.BBED610FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv56655

Modified Files:
	config.class.php 
Log Message:
Modifications to config manager to not use a standard block function. Config Manager menu(s) are setup to be part of the configmanager template. The config menu block will use the theme's functions.php to get any block header and footer templates. By default we are using a new pair of templates that don't have a title to tighten up the layout.

Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** config.class.php	27 Jan 2008 09:02:15 -0000	1.18
--- config.class.php	2 Feb 2008 21:56:43 -0000	1.19
***************
*** 438,442 ****
          // Output the result and add the required CSS for the dropline menu
          $cssfile = '<link rel="stylesheet" type="text/css" href="'.$_CONF['layout_url'] .'/droplinemenu.css" ' . XHTML .'>' . LB;
!         $display  = COM_siteHeader(array('configmanager_menu'),'Configuration Manager',$cssfile);
          if ($change_result != null AND $change_result !== array()) {
              $t->set_var('change_block',$this->_UI_get_change_block($change_result));
--- 438,443 ----
          // Output the result and add the required CSS for the dropline menu
          $cssfile = '<link rel="stylesheet" type="text/css" href="'.$_CONF['layout_url'] .'/droplinemenu.css" ' . XHTML .'>' . LB;
!         $display  = COM_siteHeader('none','Configuration Manager',$cssfile);
!         $t->set_var('config_menu',$this->_UI_configmanager_menu($grp));
          if ($change_result != null AND $change_result !== array()) {
              $t->set_var('change_block',$this->_UI_get_change_block($change_result));
***************
*** 647,650 ****
--- 648,683 ----
  
          return $r;
+     }
+ 
+ 
+     function _UI_configmanager_menu($conf_group) {
+         global $_CONF,$LANG_configsubgroups,$LANG_CONFIG;
+ 
+         $retval = COM_startBlock( 'Config Sections', '', COM_getBlockTemplate( 'configmanager_block', 'header' ));
+         $retval .= "<div><a href=\"{$_CONF['site_url']}\">{$LANG_CONFIG['home']}</a></div>";
+         $retval .= "<div><a href=\"{$_CONF['site_admin_url']}\">{$LANG_CONFIG['admin_home']}</a></div>";
+         $groups = $this->_get_groups();
+         if (count($groups) > 0) {
+             foreach ($groups as $group) {
+                 $group_display = ucwords($group);
+                 $retval .= "<div><a href=\"#\" onclick='open_group(\"$group\")'>$group_display</a></div>";
+             }
+         }
+         $retval .= COM_endBlock(COM_getBlockTemplate( 'configmanager_block', 'footer' ));
+ 
+         $subgroup_title = ucwords($conf_group);
+         $retval .= COM_startBlock( $subgroup_title, '',COM_getBlockTemplate( 'configmanager_block', 'header' ) );
+ 
+         $groups = $this->get_sgroups($conf_group);
+         if (count($groups) > 0) {
+             foreach ($groups as $group) {
+                 $group_display =  $LANG_configsubgroups[$conf_group][$group];
+                 $retval .= "<div><a href=\"#\" onclick='open_subgroup(\"$conf_group\",\"$group\")'>$group_display</a></div>";
+             }
+         }
+         $retval .= COM_endBlock(COM_getBlockTemplate( 'configmanager_block', 'footer' ));
+ 
+         return $retval;
+ 
      }
  }



From dhaun at qs1489.pair.com  Sun Feb  3 03:36:22 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 08:36:22 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.19,
	1.20
Message-ID: <20080203083622.2DB4F10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv85788/system/classes

Modified Files:
	config.class.php 
Log Message:
Reinstated some earlier improvements: Nice names for the config sections; sections sorted by plugin name (with "Geeklog" always on top)


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** config.class.php	2 Feb 2008 21:56:43 -0000	1.19
--- config.class.php	3 Feb 2008 08:36:20 -0000	1.20
***************
*** 651,671 ****
  
  
!     function _UI_configmanager_menu($conf_group) {
!         global $_CONF,$LANG_configsubgroups,$LANG_CONFIG;
  
-         $retval = COM_startBlock( 'Config Sections', '', COM_getBlockTemplate( 'configmanager_block', 'header' ));
-         $retval .= "<div><a href=\"{$_CONF['site_url']}\">{$LANG_CONFIG['home']}</a></div>";
-         $retval .= "<div><a href=\"{$_CONF['site_admin_url']}\">{$LANG_CONFIG['admin_home']}</a></div>";
          $groups = $this->_get_groups();
          if (count($groups) > 0) {
              foreach ($groups as $group) {
!                 $group_display = ucwords($group);
!                 $retval .= "<div><a href=\"#\" onclick='open_group(\"$group\")'>$group_display</a></div>";
              }
          }
-         $retval .= COM_endBlock(COM_getBlockTemplate( 'configmanager_block', 'footer' ));
  
!         $subgroup_title = ucwords($conf_group);
!         $retval .= COM_startBlock( $subgroup_title, '',COM_getBlockTemplate( 'configmanager_block', 'header' ) );
  
          $groups = $this->get_sgroups($conf_group);
--- 651,698 ----
  
  
!     function _UI_configmanager_menu($conf_group)
!     {
!         global $_CONF, $LANG_ADMIN, $LANG_CONFIG,
!                $LANG_configsections, $LANG_configsubgroups;
! 
!         $retval = COM_startBlock($LANG_CONFIG['sections'], '',
!                         COM_getBlockTemplate('configmanager_block', 'header'));
!         $link_array = array();
  
          $groups = $this->_get_groups();
          if (count($groups) > 0) {
              foreach ($groups as $group) {
!                 if (empty($LANG_configsections[$group]['label'])) {
!                     $group_display = ucwords($group);
!                 } else {
!                     $group_display = $LANG_configsections[$group]['label'];
!                 }
!                 $link = "<div><a href=\"#\" onclick='open_group(\"$group\")'>$group_display</a></div>";
! 
!                 if ($group == 'Core') {
!                     $retval .= $link;
!                 } else {
!                     $link_array[$group_display] = $link;
!                 }
              }
          }
  
!         uksort($link_array, 'strcasecmp');
!         foreach ($link_array as $link) {
!             $retval .= $link;
!         }
! 
!         $retval .= '<div><a href="' . $_CONF['site_admin_url'] . '">'
!                 . $LANG_ADMIN['admin_home'] . '</a></div>';
!         $retval .= COM_endBlock(COM_getBlockTemplate('configmanager_block',
!                                                      'footer'));
! 
!         if (empty($LANG_configsections[$conf_group]['title'])) {
!             $subgroup_title = ucwords($conf_group);
!         } else {
!             $subgroup_title = $LANG_configsections[$conf_group]['title'];
!         }
!         $retval .= COM_startBlock($subgroup_title, '',
!                         COM_getBlockTemplate('configmanager_block', 'header'));
  
          $groups = $this->get_sgroups($conf_group);
***************
*** 676,683 ****
              }
          }
!         $retval .= COM_endBlock(COM_getBlockTemplate( 'configmanager_block', 'footer' ));
  
          return $retval;
- 
      }
  }
--- 703,710 ----
              }
          }
!         $retval .= COM_endBlock(COM_getBlockTemplate('configmanager_block',
!                                                      'footer'));
  
          return $retval;
      }
  }



From dhaun at qs1489.pair.com  Sun Feb  3 03:37:46 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 08:37:46 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional
	blockfooter-notitle.thtml, 1.1, 1.2
Message-ID: <20080203083746.30E6410FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional
In directory qs1489.pair.com:/tmp/cvs-serv85837/public_html/layout/professional

Modified Files:
	blockfooter-notitle.thtml 
Log Message:
Added the "block-bg-spreader" (from leftblocks.thtml) to establish a constant minimum width of the left-side blocks


Index: blockfooter-notitle.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/blockfooter-notitle.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** blockfooter-notitle.thtml	2 Feb 2008 21:56:34 -0000	1.1
--- blockfooter-notitle.thtml	3 Feb 2008 08:37:44 -0000	1.2
***************
*** 2,4 ****
  <div class="aligncenter">
      <div class="block-divider"></div>
! </div>
\ No newline at end of file
--- 2,5 ----
  <div class="aligncenter">
      <div class="block-divider"></div>
! </div>
! <div class="block-bg-spreader"></div>



From dhaun at qs1489.pair.com  Sun Feb  3 04:12:32 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 09:12:32 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links config.php,1.23,1.24
Message-ID: <20080203091232.D0BA910FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links
In directory qs1489.pair.com:/tmp/cvs-serv87112/plugins/links

Modified Files:
	config.php 
Log Message:
Removed $_LI_CONF['enable_multilingual_links'] option. COM_getLangSQL() detects the multi-language support automatically.


Index: config.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/config.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** config.php	1 Jan 2008 21:10:24 -0000	1.23
--- config.php	3 Feb 2008 09:12:30 -0000	1.24
***************
*** 159,169 ****
  
  /**
-  * enable multilingual features
-  * Whether to enable simple multilingual behaviour or not.
-  *
-  */
- $_LI_CONF['enable_multilingual_links'] = false;
- 
- /**
   * Links root category id
   *
--- 159,162 ----



From dhaun at qs1489.pair.com  Sun Feb  3 04:12:32 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 09:12:32 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/links index.php,1.32,1.33
Message-ID: <20080203091232.E6D3110FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/links
In directory qs1489.pair.com:/tmp/cvs-serv87112/public_html/links

Modified Files:
	index.php 
Log Message:
Removed $_LI_CONF['enable_multilingual_links'] option. COM_getLangSQL() detects the multi-language support automatically.


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/links/index.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** index.php	5 Jan 2008 20:47:45 -0000	1.32
--- index.php	3 Feb 2008 09:12:30 -0000	1.33
***************
*** 148,155 ****
          // Show categories
          $sql = "SELECT cid,pid,category,description FROM {$_TABLES['linkcategories']} WHERE pid='{$cat}'";
!         // check if we are using the multilanguage hack
!         if ($_LI_CONF['enable_multilingual_links']) {
!             $sql .= COM_getLangSQL('cid', 'AND');
!         }
          $sql .= COM_getPermSQL('AND') . " ORDER BY category";
          $result = DB_query($sql);
--- 148,152 ----
          // Show categories
          $sql = "SELECT cid,pid,category,description FROM {$_TABLES['linkcategories']} WHERE pid='{$cat}'";
!         $sql .= COM_getLangSQL('cid', 'AND');
          $sql .= COM_getPermSQL('AND') . " ORDER BY category";
          $result = DB_query($sql);



From dhaun at qs1489.pair.com  Sun Feb  3 04:22:07 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 09:22:07 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-database.php,1.49,1.50
Message-ID: <20080203092207.A8F8110FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv87511/system

Modified Files:
	lib-database.php 
Log Message:
Cosmetics


Index: lib-database.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-database.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** lib-database.php	11 Oct 2007 01:52:37 -0000	1.49
--- lib-database.php	3 Feb 2008 09:22:05 -0000	1.50
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-database.php                                                          |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-database.php                                                          |
***************
*** 9,13 ****
  // | Geeklog database library.                                                 |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs, tony AT tonybibbs DOT com                            |
--- 9,13 ----
  // | Geeklog database library.                                                 |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs, tony AT tonybibbs DOT com                            |
***************
*** 39,42 ****
--- 39,46 ----
  */
  
+ if (strpos ($_SERVER['PHP_SELF'], 'lib-database.php') !== false) {
+     die ('This file can not be used on its own!');
+ }
+ 
  // +---------------------------------------------------------------------------+
  // | Table definitions, these are used by the install program to create the    |
***************
*** 55,60 ****
  $_TABLES['cookiecodes']         = $_DB_table_prefix . 'cookiecodes';
  $_TABLES['dateformats']         = $_DB_table_prefix . 'dateformats';
- $_TABLES['events']              = $_DB_table_prefix . 'events';
- $_TABLES['eventsubmission']     = $_DB_table_prefix . 'eventsubmission';
  $_TABLES['featurecodes']        = $_DB_table_prefix . 'featurecodes';
  $_TABLES['features']            = $_DB_table_prefix . 'features';
--- 59,62 ----
***************
*** 62,76 ****
  $_TABLES['group_assignments']   = $_DB_table_prefix . 'group_assignments';
  $_TABLES['groups']              = $_DB_table_prefix . 'groups';
- $_TABLES['links']               = $_DB_table_prefix . 'links';
- $_TABLES['linksubmission']      = $_DB_table_prefix . 'linksubmission';
- $_TABLES['linkcategories']      = $_DB_table_prefix . 'linkcategories';
  $_TABLES['maillist']            = $_DB_table_prefix . 'maillist';
- $_TABLES['personal_events']     = $_DB_table_prefix . 'personal_events';
  $_TABLES['pingservice']         = $_DB_table_prefix . 'pingservice';
  $_TABLES['plugins']             = $_DB_table_prefix . 'plugins';
- $_TABLES['pollanswers']         = $_DB_table_prefix . 'pollanswers';
- $_TABLES['pollquestions']       = $_DB_table_prefix . 'pollquestions';
- $_TABLES['polltopics']          = $_DB_table_prefix . 'polltopics';
- $_TABLES['pollvoters']          = $_DB_table_prefix . 'pollvoters';
  $_TABLES['postmodes']           = $_DB_table_prefix . 'postmodes';
  $_TABLES['sessions']            = $_DB_table_prefix . 'sessions';
--- 64,70 ----
***************
*** 91,104 ****
  $_TABLES['vars']                = $_DB_table_prefix . 'vars';
  $_TABLES['conf_values']         = $_DB_table_prefix . 'conf_values';
- // the static pages plugin has become an integral part of Geeklog anyway ...
- $_TABLES['staticpage']          = $_DB_table_prefix . 'staticpage';
  
! // ditto for spamx
  $_TABLES['spamx']               = $_DB_table_prefix . 'spamx';
  
! // these tables aren't used by Geeklog any more, but the table names are needed
! // when upgrading from old versions
  $_TABLES['commentspeedlimit']   = $_DB_table_prefix . 'commentspeedlimit';
  $_TABLES['submitspeedlimit']    = $_DB_table_prefix . 'submitspeedlimit';
  $_TABLES['userevent']           = $_DB_table_prefix . 'userevent';
  
--- 85,120 ----
  $_TABLES['vars']                = $_DB_table_prefix . 'vars';
  $_TABLES['conf_values']         = $_DB_table_prefix . 'conf_values';
  
! 
! // Tables used by the bundled plugins
! 
! // Calendar plugin
! $_TABLES['events']              = $_DB_table_prefix . 'events';
! $_TABLES['eventsubmission']     = $_DB_table_prefix . 'eventsubmission';
! $_TABLES['personal_events']     = $_DB_table_prefix . 'personal_events';
! 
! // Links plugin
! $_TABLES['links']               = $_DB_table_prefix . 'links';
! $_TABLES['linkcategories']      = $_DB_table_prefix . 'linkcategories';
! $_TABLES['linksubmission']      = $_DB_table_prefix . 'linksubmission';
! 
! // Polls plugin
! $_TABLES['pollanswers']         = $_DB_table_prefix . 'pollanswers';
! $_TABLES['pollquestions']       = $_DB_table_prefix . 'pollquestions';
! $_TABLES['polltopics']          = $_DB_table_prefix . 'polltopics';
! $_TABLES['pollvoters']          = $_DB_table_prefix . 'pollvoters';
! 
! // Spam-X plugin
  $_TABLES['spamx']               = $_DB_table_prefix . 'spamx';
  
! // Static Pages plugin
! $_TABLES['staticpage']          = $_DB_table_prefix . 'staticpage';
! 
! 
! // These tables aren't used by Geeklog any more, but the table names are still
! // needed when upgrading from old versions
  $_TABLES['commentspeedlimit']   = $_DB_table_prefix . 'commentspeedlimit';
  $_TABLES['submitspeedlimit']    = $_DB_table_prefix . 'submitspeedlimit';
+ $_TABLES['tzcodes']             = $_DB_table_prefix . 'tzcodes';
  $_TABLES['userevent']           = $_DB_table_prefix . 'userevent';
  
***************
*** 108,120 ****
  // +---------------------------------------------------------------------------+
  
- if (strpos ($_SERVER['PHP_SELF'], 'lib-database.php') !== false) {
-     die ('This file can not be used on its own!');
- }
- 
  /**
  * Include appropriate DBMS object
  *
  */
! require_once($_CONF['path_system'] . 'databases/'. $_DB_dbms . '.class.php');
  
  // Instantiate the database object
--- 124,132 ----
  // +---------------------------------------------------------------------------+
  
  /**
  * Include appropriate DBMS object
  *
  */
! require_once $_CONF['path_system'] . 'databases/'. $_DB_dbms . '.class.php';
  
  // Instantiate the database object



From dhaun at qs1489.pair.com  Sun Feb  3 04:53:51 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 09:53:51 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.20,
	1.21
Message-ID: <20080203095351.B17A210FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv88570/system/classes

Modified Files:
	config.class.php 
Log Message:
Added set_default() method so that we can update default values


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** config.class.php	3 Feb 2008 08:36:20 -0000	1.20
--- config.class.php	3 Feb 2008 09:53:49 -0000	1.21
***************
*** 172,175 ****
--- 172,203 ----
      }
  
+     /**
+      * This function sets the default of a configuration variable to a value in
+      * the database but not in the current array.
+      * If the variable does not already exist, nothing will happen.
+      *
+      * @param string name        Name of the config parameter to set
+      * @param mixed  value       The value to set the config parameter to
+      * @param string group       Config group name ('Core' or plugin name)
+      */
+     function set_default($name, $value, $group = 'Core')
+     {
+         global $_TABLES, $_DB, $_DB_dbms;
+ 
+         $escaped_val = addslashes(serialize($value));
+         $escaped_name = addslashes($name);
+         $escaped_grp = addslashes($group);
+         $sql_query = "UPDATE {$_TABLES['conf_values']} " .
+             "SET default_value = '{$escaped_val}' WHERE " .
+             "name = '{$escaped_name}' AND group_name = '{$escaped_grp}'";
+         if ($_DB_dbms == 'mssql') {
+             $sql_query = str_replace("\\'", "''", $sql_query);
+             $sql_query = str_replace('\\"', '"', $sql_query);
+             $_DB->dbQuery($sql_query, 0, 1);
+         } else {
+             DB_query($sql_query);
+         }
+     }
+ 
      function restore_param($name, $group)
      {



From dhaun at qs1489.pair.com  Sun Feb  3 04:54:52 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 09:54:52 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.31,
	1.32
Message-ID: <20080203095452.7BAAD10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv88651/public_html/admin/install

Modified Files:
	index.php 
Log Message:
Update default value for 'default_photo' but keep it disabled


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** index.php	6 Jan 2008 20:44:10 -0000	1.31
--- index.php	3 Feb 2008 09:54:50 -0000	1.32
***************
*** 507,511 ****
                              $config->set('rdf_file', $html_path . 'backend/geeklog.rss');
                              $config->set('path_pear', $_CONF['path_system'] . 'pear/');
!                             $config->set('default_photo', urldecode($site_url) . '/default.jpg');
  
                              // Now we're done with the installation so redirect the user to success.php
--- 507,511 ----
                              $config->set('rdf_file', $html_path . 'backend/geeklog.rss');
                              $config->set('path_pear', $_CONF['path_system'] . 'pear/');
!                             $config->set_default('default_photo', urldecode($site_url) . '/default.jpg');
  
                              // Now we're done with the installation so redirect the user to success.php
***************
*** 564,568 ****
                          $config->set('site_mail', urldecode($site_mail));
                          $config->set('noreply_mail', urldecode($noreply_mail));
!                         $config->set('default_photo', urldecode($site_url) . '/default.jpg');
  
                          // Great, installation is complete, redirect to success page
--- 564,568 ----
                          $config->set('site_mail', urldecode($site_mail));
                          $config->set('noreply_mail', urldecode($noreply_mail));
!                         $config->set_default('default_photo', urldecode($site_url) . '/default.jpg');
  
                          // Great, installation is complete, redirect to success page



From dhaun at qs1489.pair.com  Sun Feb  3 14:11:52 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 19:11:52 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links install_defaults.php, NONE,
	1.1 functions.inc, 1.103, 1.104 config.php, 1.24, NONE
Message-ID: <20080203191152.98B6410FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links
In directory qs1489.pair.com:/tmp/cvs-serv13605/plugins/links

Modified Files:
	functions.inc 
Added Files:
	install_defaults.php 
Removed Files:
	config.php 
Log Message:
Added Links plugin config to the configuration GUI


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/functions.inc,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** functions.inc	2 Jan 2008 09:42:07 -0000	1.103
--- functions.inc	3 Feb 2008 19:11:50 -0000	1.104
***************
*** 3,11 ****
  // Reminder: always indent with 4 spaces (no tabs).
  // +---------------------------------------------------------------------------+
! // | Links Plugin 2.0  functions.inc                                           |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
! // | This program is free software; you can redistribute it and/or             |
! // | modify it under the terms of the GNU General Public License               |
  // | as published by the Free Software Foundation; either version 2            |
  // | of the License, or (at your option) any later version.                    |
--- 3,26 ----
  // Reminder: always indent with 4 spaces (no tabs).
  // +---------------------------------------------------------------------------+
! // | Links Plugin 2.0                                                          |
  // +---------------------------------------------------------------------------+
+ // | functions.inc                                                             |
  // |                                                                           |
! // | This file does two things: 1) it implements the necessary Geeklog Plugin  |
! // | API method and 2) implements all the common code needed by the Links      |
! // | Plugins' PHP files.                                                       |
! // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
! // |                                                                           |
! // | Authors: Tony Bibbs         - tony AT tonybibbs DOT com                   |
! // |          Mark Limburg       - mlimburg AT users.sourceforge DOT net       |
! // |          Jason Whittenburg  - jwhitten AT securitygeeks DOT com           |
! // |          Dirk Haun          - dirk AT haun-online DOT de                  |
! // |          Trinity Bays       - trinity93 AT steubentech DOT com            |
! // |          Oliver Spiesshofer - oliver AT spiesshofer DOT com               |
! // |          Euan McKay         - info AT heatherengineering DOT com          |
! // +---------------------------------------------------------------------------+
! // |                                                                           |
! // | This program is licensed under the terms of the GNU General Public License|
  // | as published by the Free Software Foundation; either version 2            |
  // | of the License, or (at your option) any later version.                    |
***************
*** 13,18 ****
  // | This program is distributed in the hope that it will be useful,           |
  // | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
! // | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             |
! // | GNU General Public License for more details.                              |
  // |                                                                           |
  // | You should have received a copy of the GNU General Public License         |
--- 28,33 ----
  // | This program is distributed in the hope that it will be useful,           |
  // | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
! // | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                      |
! // | See the GNU General Public License for more details.                      |
  // |                                                                           |
  // | You should have received a copy of the GNU General Public License         |
***************
*** 24,63 ****
  // $Id$
  
  
! /**
!  * This file does two things: 1) it implements the necessary Geeklog Plugin
!  * API method and 2) implements all the common code needed by the links
!  * Plugins' PHP files.
!  *
!  * @package Links
!  * @filesource
!  * @version 2.0
!  * @since GL 1.4.0
!  * @copyright Copyright &copy; 2005-2008
!  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
!  * @author Trinity Bays <trinity93 AT steubentech DOT com>
!  * @author Tony Bibbs <tony AT tonybibbs DOT com>
!  * @author Tom Willett <tom AT pigstye DOT net>
!  * @author Blaine Lang <langmail AT sympatico DOT ca>
!  * @author Dirk Haun <dirk AT haun-online DOT de>
!  *
!  */
  
  
! if (strpos ($_SERVER['PHP_SELF'], 'functions.inc') !== false) {
!     die ('This file can not be used on its own.');
  }
  
! $langfile = $_CONF['path'] . 'plugins/links/language/'
!           . $_CONF['language'] . '.php';
  
! if (file_exists ($langfile)) {
!     require_once ($langfile);
! } else {
!     require_once ($_CONF['path'] . 'plugins/links/language/english.php');
  }
  
! require_once ($_CONF['path'] . 'plugins/links/config.php');
! 
  
  // +---------------------------------------------------------------------------+
--- 39,74 ----
  // $Id$
  
+ if (strpos($_SERVER['PHP_SELF'], 'functions.inc') !== false) {
+     die('This file can not be used on its own.');
+ }
  
! $plugin_path = $_CONF['path'] . 'plugins/links/';
! $langfile = $plugin_path . 'language/' . $_CONF['language'] . '.php';
  
+ if (file_exists($langfile)) {
+     require_once $langfile;
+ } else {
+     require_once $plugin_path . 'language/english.php';
+ }
  
! /*
! * As of Geeklog 1.5, the plugin's config.php is not needed any more and
! * should be removed after upgrading.
! */
! if (file_exists($plugin_path . 'config.php')) {
!     include_once $plugin_path . 'config.php';
  }
  
! /*
! * Check and see if we need to load the plugin configuration
! */
! if (!isset($_LI_CONF['linksloginrequired'])) {
!     require_once $_CONF['path_system'] . 'classes/config.class.php';
  
!     $li_config = config::get_instance();
!     $_LI_CONF = $li_config->get_config('links');
  }
  
! $_LI_CONF['version'] = '2.0.0';
  
  // +---------------------------------------------------------------------------+
***************
*** 707,733 ****
  {
      global $_CONF, $_TABLES, $_LI_CONF, $_DB_dbms;
      // the plugin needs these functions so complain when they doesn't exist
!     if (!function_exists ('COM_truncate') || !function_exists ('MBYTE_strpos')) {
          return 3002;
      }
-     // include SQL required for upgrade
-     $blockadmin_id = DB_GetItem ($_TABLES['groups'], 'grp_id', "grp_name='Block Admin'");
-     include ($_CONF['path'] . 'plugins/links/sql/upgrade_1.0.1_2.'.$_DB_dbms.'.php');
  
  
      // get current version
!     $currentVersion = DB_getItem($_TABLES['plugins'],'pi_version',"pi_name='links'");
!     switch( $currentVersion ) {
  
!         case "1.0" :
!         case "1.0.1" :
          // do DB changes:
  
          // create categories table
  
!         COM_errorLog ("Adding categories table to the links plugin", 1);
!         DB_Query($LINKS_SQL['linkcategories'],1);
!         if (DB_error ()) {
!             COM_errorLog ("There was an error adding categories table to the links plugin", 1);
              return false;
          }
--- 718,747 ----
  {
      global $_CONF, $_TABLES, $_LI_CONF, $_DB_dbms;
+ 
      // the plugin needs these functions so complain when they doesn't exist
!     if (!function_exists('COM_truncate') || !function_exists('MBYTE_strpos')) {
          return 3002;
      }
  
+     // include SQL required for upgrade
+     $blockadmin_id = DB_getItem($_TABLES['groups'], 'grp_id',
+                                 "grp_name = 'Block Admin'");
+     include $_CONF['path'] . 'plugins/links/sql/upgrade_1.0.1_2.'.$_DB_dbms.'.php';
  
      // get current version
!     $currentVersion = DB_getItem($_TABLES['plugins'], 'pi_version',
!                                  "pi_name = 'links'");
!     switch ($currentVersion) {
  
!         case "1.0":
!         case "1.0.1":
          // do DB changes:
  
          // create categories table
  
!         COM_errorLog("Adding categories table to the links plugin", 1);
!         DB_query($LINKS_SQL['linkcategories'], 1);
!         if (DB_error()) {
!             COM_errorLog("There was an error adding categories table to the links plugin", 1);
              return false;
          }
***************
*** 745,749 ****
  
          // get Links admin group number
!         $group_id = DB_getItem($_TABLES['groups'],'grp_id',"grp_name='Links Admin'");
  
          // loop through adding to category table, then update links table with cids
--- 759,764 ----
  
          // get Links admin group number
!         $group_id = DB_getItem($_TABLES['groups'], 'grp_id',
!                                "grp_name = 'Links Admin'");
  
          // loop through adding to category table, then update links table with cids
***************
*** 754,759 ****
                  $category = addslashes($A['category']);
                  $cid = addslashes(COM_makeSid());
!                 DB_query ("INSERT INTO {$_TABLES['linkcategories']} (cid,pid,category,owner_id,group_id,created,modified) VALUES ('{$cid}','{$_LI_CONF['root']}','{$category}','2','{$group_id}',NOW(),NOW())",1);
!                 DB_query ("UPDATE {$_TABLES['links']} SET category='{$cid}' WHERE category='{$category}'",1);
                  if (DB_error()) {
                      COM_errorLog("Error inserting categories into linkcategories table",1);
--- 769,774 ----
                  $category = addslashes($A['category']);
                  $cid = addslashes(COM_makeSid());
!                 DB_query("INSERT INTO {$_TABLES['linkcategories']} (cid,pid,category,owner_id,group_id,created,modified) VALUES ('{$cid}','{$_LI_CONF['root']}','{$category}','2','{$group_id}',NOW(),NOW())",1);
!                 DB_query("UPDATE {$_TABLES['links']} SET category='{$cid}' WHERE category='{$category}'",1);
                  if (DB_error()) {
                      COM_errorLog("Error inserting categories into linkcategories table",1);
***************
*** 765,786 ****
  
          // update the links and linksubmission table structures
!         COM_errorLog ("Updating linksubmission table for the links plugin (a)", 1);
!         DB_Query($LINKS_SQL['linksubmission1'],1);
!         if (DB_error ()) {
!             COM_errorLog ("There was an error updating the linksubmission table of the links plugin (a)", 1);
              return false;
          }
!         COM_errorLog ("Updating linksubmission table for the links plugin (b)", 1);
!         DB_Query($LINKS_SQL['linksubmission2'],1);
!         if (DB_error ()) {
!             COM_errorLog ("There was an error updating the linksubmission table of the links plugin (b)", 1);
              return false;
          }
          COM_errorLog("Success - updated linksubmission table for the links plugin",1);
  
!         COM_errorLog ("Updating links table for the links plugin", 1);
!         DB_Query($LINKS_SQL['links'],1);
!         if (DB_error ()) {
!             COM_errorLog ("There was an error updating the links table of the links plugin", 1);
              return false;
          }
--- 780,801 ----
  
          // update the links and linksubmission table structures
!         COM_errorLog("Updating linksubmission table for the links plugin (a)", 1);
!         DB_query($LINKS_SQL['linksubmission1'],1);
!         if (DB_error()) {
!             COM_errorLog("There was an error updating the linksubmission table of the links plugin (a)", 1);
              return false;
          }
!         COM_errorLog("Updating linksubmission table for the links plugin (b)", 1);
!         DB_query($LINKS_SQL['linksubmission2'],1);
!         if (DB_error()) {
!             COM_errorLog("There was an error updating the linksubmission table of the links plugin (b)", 1);
              return false;
          }
          COM_errorLog("Success - updated linksubmission table for the links plugin",1);
  
!         COM_errorLog("Updating links table for the links plugin", 1);
!         DB_query($LINKS_SQL['links'],1);
!         if (DB_error()) {
!             COM_errorLog("There was an error updating the links table of the links plugin", 1);
              return false;
          }
***************
*** 788,794 ****
  
          // add root category
!         DB_Query($LINKS_SQL['root'],1);
!         if (DB_error ()) {
!             COM_errorLog ("There was an error adding the root category to the links plugin", 1);
              return false;
          }
--- 803,809 ----
  
          // add root category
!         DB_query($LINKS_SQL['root'],1);
!         if (DB_error()) {
!             COM_errorLog("There was an error adding the root category to the links plugin", 1);
              return false;
          }
***************
*** 796,802 ****
  
          // add php links block
!         DB_Query($LINKS_SQL['linksblock'],1);
!         if (DB_error ()) {
!             COM_errorLog ("There was an error adding the phplinksblock to the links plugin", 1);
              return false;
          }
--- 811,817 ----
  
          // add php links block
!         DB_query($LINKS_SQL['linksblock'],1);
!         if (DB_error()) {
!             COM_errorLog("There was an error adding the phplinksblock to the links plugin", 1);
              return false;
          }
***************
*** 804,810 ****
  
          // add php categories block
!         DB_Query($LINKS_SQL['categoriesblock'],1);
!         if (DB_error ()) {
!             COM_errorLog ("There was an error adding the phpcategoriesblock to the links plugin", 1);
              return false;
          }
--- 819,825 ----
  
          // add php categories block
!         DB_query($LINKS_SQL['categoriesblock'],1);
!         if (DB_error()) {
!             COM_errorLog("There was an error adding the phpcategoriesblock to the links plugin", 1);
              return false;
          }
***************
*** 812,816 ****
  
          // update the version numbers
!         DB_query ("UPDATE {$_TABLES['plugins']} SET pi_version = '{$_LI_CONF['version']}', pi_gl_version='1.5.0' WHERE pi_name='links'");
          break;
  
--- 827,831 ----
  
          // update the version numbers
!         DB_query("UPDATE {$_TABLES['plugins']} SET pi_version = '{$_LI_CONF['version']}', pi_gl_version='1.5.0' WHERE pi_name='links'");
          break;
  

--- config.php DELETED ---

--- NEW FILE: install_defaults.php ---
<?php

// Reminder: always indent with 4 spaces (no tabs).
// +---------------------------------------------------------------------------+
// | Links Plugin 2.0                                                          |
// +---------------------------------------------------------------------------+
// | install_defaults.php                                                      |
// |                                                                           |
// | Initial Installation Defaults used when loading the online configuration  |
// | records. These settings are only used during the initial installation     |
// | and not referenced any more once the plugin is installed.                 |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2008 by the following authors:                         |
// |                                                                           |
// | Authors: Tony Bibbs         - tony AT tonybibbs DOT com                   |
// |          Mark Limburg       - mlimburg AT users.sourceforge DOT net       |
// |          Jason Whittenburg  - jwhitten AT securitygeeks DOT com           |
// |          Dirk Haun          - dirk AT haun-online DOT de                  |
// |          Trinity Bays       - trinity93 AT steubentech DOT com            |
// |          Oliver Spiesshofer - oliver AT spiesshofer DOT com               |
// |          Euan McKay         - info AT heatherengineering DOT com          |
// +---------------------------------------------------------------------------+
// |                                                                           |
// | This program is licensed under the terms of the GNU General Public License|
// | as published by the Free Software Foundation; either version 2            |
// | of the License, or (at your option) any later version.                    |
// |                                                                           |
// | This program is distributed in the hope that it will be useful,           |
// | but WITHOUT ANY WARRANTY; without even the implied warranty of            |
// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                      |
// | See the GNU General Public License for more details.                      |
// |                                                                           |
// | You should have received a copy of the GNU General Public License         |
// | along with this program; if not, write to the Free Software Foundation,   |
// | Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           |
// |                                                                           |
// +---------------------------------------------------------------------------+
//
// $Id: install_defaults.php,v 1.1 2008/02/03 19:11:50 dhaun Exp $

if (strpos($_SERVER['PHP_SELF'], 'install_defaults.php') !== false) {
    die('This file can not be used on its own!');
}

/*
 * Links default settings
 *
 * Initial Installation Defaults used when loading the online configuration
 * records. These settings are only used during the initial installation
 * and not referenced any more once the plugin is installed
 *
 */

global $_LI_DEFAULT;

/**
* the link plugin's config array
*/
$_LI_DEFAULT = array();

/**
 * this lets you select which functions are available for registered users only
 */
$_LI_DEFAULT['linksloginrequired'] = 0;

/**
 * Submission Settings
 * enable (set to 1) or disable (set to 0) submission queues:
 */
$_LI_DEFAULT['linksubmission']  = 1;

/**
 * Following times are in seconds
 */
$_LI_DEFAULT['newlinksinterval']    = 1209600; // = 14 days

/**
 * Set to 1 to hide a section from the What's New block:
 */
$_LI_DEFAULT['hidenewlinks']    = 0;

/**
 * Set to 1 to hide the "Links" entry from the top menu:
 */
$_LI_DEFAULT['hidelinksmenu']    = 0;

/**
 * categories per column
 * You can set this and $_LI_DEFAULT['linksperpage'] to 0 to get back the old
 * (pre-1.3.6) style of the links section. Setting only linkcols to 0 will hide
 * the categories but keep the paging. Setting only linksperpage to 0 will list
 * all the links of the selected category on one page.
 */
$_LI_DEFAULT['linkcols']     =  3;

/**
 * links per page
 * You can set this and $_LI_DEFAULT['linkcols'] to 0 to get back the old
 * (pre-1.3.6) style of the links section. Setting only linkcols to 0 will hide
 * the categories but keep the paging. Setting only linksperpage to 0 will list
 * all the links of the selected category on one page.
 */
$_LI_DEFAULT['linksperpage'] = 10;

/**
 * show top ten links
 * Whether to show the Top Ten Links on the main page or not.
 */
$_LI_DEFAULT['show_top10']   = true;

/**
 * notify when a new link was submitted
 */
$_LI_DEFAULT['notification'] = 0;

/**
 * should we remove links submited by users if account is removed? (1)
 * or change owner to root (0)
 */
$_LI_DEFAULT['delete_links'] = 0;

/** What to show after a link has been saved? Possible choices:
 * 'item' -> forward to the target of the link
 * 'list' -> display the admin-list of links
 * 'plugin' -> display the public homepage of the links plugin
 * 'home' -> display the site homepage
 * 'admin' -> display the site admin homepage
 */
$_LI_DEFAULT['aftersave'] = 'list';

/**
 * show category descriptions
 * Whether to show subcategory descriptions when viewing a category or not.
 */
$_LI_DEFAULT['show_category_descriptions'] = true;

/**
 * Links root category id
 */
$_LI_DEFAULT['root'] = 'site';

/**
 * Define default permissions for new links created from the Admin panel.
 * Permissions are perm_owner, perm_group, perm_members, perm_anon (in that
 * order). Possible values:<br>
 * - 3 = read + write permissions (perm_owner and perm_group only)
 * - 2 = read-only
 * - 0 = neither read nor write permissions
 * (a value of 1, ie. write-only, does not make sense and is not allowed)
 */
$_LI_DEFAULT['default_permissions'] = array (3, 2, 2, 2);


/**
* Initialize Links plugin configuration
*
* Creates the database entries for the configuation if they don't already
* exist. Initial values will be taken from $_LI_CONF if available (e.g. from
* an old config.php), uses $_LI_DEFAULT otherwise.
*
* @return   boolean     true: success; false: an error occurred
*
*/
function plugin_initconfig_links()
{
    global $_LI_CONF, $_LI_DEFAULT;

    if (is_array($_LI_CONF) && (count($_LI_CONF) > 1)) {
        $_LI_DEFAULT = $_LI_CONF;
    }

    $c = config::get_instance();
    if (!$c->group_exists('links')) {

        $c->add('linksloginrequired', $_LI_DEFAULT['linksloginrequired'],
                'select', 0, 0, 0, 10, true, 'links');
        $c->add('linkcols', $_LI_DEFAULT['linkcols'], 'text',
                0, 0, 0, 20, true, 'links');
        $c->add('linksperpage', $_LI_DEFAULT['linksperpage'], 'text',
                0, 0, 0, 30, true, 'links');
        $c->add('show_top10', $_LI_DEFAULT['show_top10'], 'select',
                0, 0, 1, 40, true, 'links');
        $c->add('show_category_descriptions', $_LI_DEFAULT['show_category_descriptions'], 'select', 0, 0, 1, 50, true, 'links');

        $c->add('hidenewlinks', $_LI_DEFAULT['hidenewlinks'], 'select',
                0, 1, 0, 60, true, 'links');
        $c->add('newlinksinterval', $_LI_DEFAULT['newlinksinterval'], 'text',
                0, 1, 0, 70, true, 'links');
        $c->add('hidelinksmenu', $_LI_DEFAULT['hidelinksmenu'], 'select',
                0, 1, 0, 80, true, 'links');
        $c->add('linksubmission', $_LI_DEFAULT['linksubmission'], 'select',
                0, 1, 0, 90, true, 'links');
        $c->add('notification', $_LI_DEFAULT['notification'], 'select',
                0, 1, 0, 100, true, 'links');
        $c->add('delete_links', $_LI_DEFAULT['delete_links'], 'select',
                0, 1, 0, 110, true, 'links');
        $c->add('aftersave', $_LI_DEFAULT['aftersave'], 'select',
                0, 1, 9, 120, true, 'links');
        $c->add('root', $_LI_DEFAULT['root'], 'text',
                0, 1, 0, 130, true, 'links');

        $c->add('default_permissions', $_LI_DEFAULT['default_permissions'],
                '@select', 0, 2, 12, 140, true, 'links');

    }

    return true;
}

?>



From dhaun at qs1489.pair.com  Sun Feb  3 14:11:52 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 19:11:52 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql mysql_tableanddata.php,1.199,1.200
Message-ID: <20080203191152.D432A10FE17@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql
In directory qs1489.pair.com:/tmp/cvs-serv13605/sql

Modified Files:
	mysql_tableanddata.php 
Log Message:
Added Links plugin config to the configuration GUI


Index: mysql_tableanddata.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mysql_tableanddata.php,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** mysql_tableanddata.php	27 Jan 2008 15:23:32 -0000	1.199
--- mysql_tableanddata.php	3 Feb 2008 19:11:50 -0000	1.200
***************
*** 891,897 ****
  $_DATA[] = "INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (18,'Webservices Users', 'Can use the Webservices API (if restricted)',0) ";
  
! $_DATA[] = "INSERT INTO {$_TABLES['links']} (lid, cid, url, description, title, hits, date, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklog.net', '20070828065220743', 'http://www.geeklog.net/', 'Visit the Geeklog homepage for support, FAQs, updates, add-ons, and a great community.', 'Geeklog Project Homepage', 0, '2007-08-28 14:52:13', 1, 5, 3, 2, 2, 2);";
! $_DATA[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('20070828065220743', 'site', 'Geeklog Sites', NULL, NULL, '2007-08-28 14:52:20', '2007-08-28 14:52:20', 2, 5, 3, 2, 2, 2);";
! $_DATA[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('site', 'root', 'Root', 'Website root', '', '2007-08-28 14:52:21', '2007-08-28 14:52:21', 2, 5, 3, 3, 2, 2);";
  
  $_DATA[] = "INSERT INTO {$_TABLES['maillist']} (code, name) VALUES (0,'Don\'t Email') ";
--- 891,897 ----
  $_DATA[] = "INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (18,'Webservices Users', 'Can use the Webservices API (if restricted)',0) ";
  
! $_DATA[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('site', 'root', 'Root', 'Website root', NULL, NOW(), NOW(), 2, 5, 3, 3, 2, 2);";
! $_DATA[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklog-sites', 'site', 'Geeklog Sites', 'Sites using or related to the Geeklog CMS', NULL, NOW(), NOW(), 2, 5, 3, 3, 2, 2);";
! $_DATA[] = "INSERT INTO {$_TABLES['links']} (lid, cid, url, description, title, hits, date, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklog.net', 'geeklog-sites', 'http://www.geeklog.net/', 'Visit the Geeklog homepage for support, FAQs, updates, add-ons, and a great community.', 'Geeklog Project Homepage', 123, NOW(), 1, 5, 3, 3, 2, 2);";
  
  $_DATA[] = "INSERT INTO {$_TABLES['maillist']} (code, name) VALUES (0,'Don\'t Email') ";



From dhaun at qs1489.pair.com  Sun Feb  3 14:11:52 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 19:11:52 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links/language english.php, 1.27,
	1.28 english_utf-8.php, 1.14, 1.15
Message-ID: <20080203191152.A2E3310FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links/language
In directory qs1489.pair.com:/tmp/cvs-serv13605/plugins/links/language

Modified Files:
	english.php english_utf-8.php 
Log Message:
Added Links plugin config to the configuration GUI


Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/language/english.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** english.php	1 Jan 2008 20:03:22 -0000	1.27
--- english.php	3 Feb 2008 19:11:50 -0000	1.28
***************
*** 251,253 ****
--- 251,295 ----
  );
  
+ 
+ // Localization of the Admin Configuration UI
+ $LANG_configsections['links'] = array(
+     'label' => 'Links',
+     'title' => 'Links Configuration'
+ );
+ 
+ $LANG_confignames['links'] = array(
+     'linksloginrequired' => 'Links Login Required?',
+     'linksubmission' => 'Enable Submission Queue?',
+     'newlinksinterval' => 'New Links Interval',
+     'hidenewlinks' => 'Hide New Links?',
+     'hidelinksmenu' => 'Hide Links Menu Entry?',
+     'linkcols' => 'Categories per Column',
+     'linksperpage' => 'Links per Page',
+     'show_top10' => 'Show Top 10 Links?',
+     'notification' => 'Notification Email?',
+     'delete_links' => 'Delete Links with Owner?',
+     'aftersave' => 'After Saving Link',
+     'show_category_descriptions' => 'Show Category Description?',
+     'root' => 'ID of Root Category',
+     'default_permissions' => 'Link Default Permissions'
+ );
+ 
+ $LANG_configsubgroups['links'] = array(
+     0 => 'Main Settings'
+ );
+ 
+ $LANG_fs['links'] = array(
+     0 => 'Public Links List Settings',
+     1 => 'Links Admin Settings',
+     2 => 'Default Permissions'
+ );
+ 
+ // Note: entries 0, 1, and 12 are the same as in $LANG_configselects['Core']
+ $LANG_configselects['links'] = array(
+     0 => array('True' => 1, 'False' => 0),
+     1 => array('True' => TRUE, 'False' => FALSE),
+     9 => array('Forward to Linked Site' => 'item', 'Display Admin List' => 'list', 'Display Public List' => 'plugin', 'Display Home' => 'home', 'Display Admin' => 'admin'),
+     12 => array('No access' => 0, 'Read-Only' => 2, 'Read-Write' => 3)
+ );
+ 
  ?>

Index: english_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/language/english_utf-8.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** english_utf-8.php	1 Jan 2008 20:03:22 -0000	1.14
--- english_utf-8.php	3 Feb 2008 19:11:50 -0000	1.15
***************
*** 251,253 ****
--- 251,295 ----
  );
  
+ 
+ // Localization of the Admin Configuration UI
+ $LANG_configsections['links'] = array(
+     'label' => 'Links',
+     'title' => 'Links Configuration'
+ );
+ 
+ $LANG_confignames['links'] = array(
+     'linksloginrequired' => 'Links Login Required?',
+     'linksubmission' => 'Enable Submission Queue?',
+     'newlinksinterval' => 'New Links Interval',
+     'hidenewlinks' => 'Hide New Links?',
+     'hidelinksmenu' => 'Hide Links Menu Entry?',
+     'linkcols' => 'Categories per Column',
+     'linksperpage' => 'Links per Page',
+     'show_top10' => 'Show Top 10 Links?',
+     'notification' => 'Notification Email?',
+     'delete_links' => 'Delete Links with Owner?',
+     'aftersave' => 'After Saving Link',
+     'show_category_descriptions' => 'Show Category Description?',
+     'root' => 'ID of Root Category',
+     'default_permissions' => 'Link Default Permissions'
+ );
+ 
+ $LANG_configsubgroups['links'] = array(
+     0 => 'Main Settings'
+ );
+ 
+ $LANG_fs['links'] = array(
+     0 => 'Public Links List Settings',
+     1 => 'Links Admin Settings',
+     2 => 'Default Permissions'
+ );
+ 
+ // Note: entries 0, 1, and 12 are the same as in $LANG_configselects['Core']
+ $LANG_configselects['links'] = array(
+     0 => array('True' => 1, 'False' => 0),
+     1 => array('True' => TRUE, 'False' => FALSE),
+     9 => array('Forward to Linked Site' => 'item', 'Display Admin List' => 'list', 'Display Public List' => 'plugin', 'Display Home' => 'home', 'Display Admin' => 'admin'),
+     12 => array('No access' => 0, 'Read-Only' => 2, 'Read-Write' => 3)
+ );
+ 
  ?>



From dhaun at qs1489.pair.com  Sun Feb  3 14:11:52 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 19:11:52 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.61,
	1.62
Message-ID: <20080203191152.E374810FE18@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv13605/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Added Links plugin config to the configuration GUI


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** mysql_1.4.1_to_1.5.0.php	2 Feb 2008 20:03:07 -0000	1.61
--- mysql_1.4.1_to_1.5.0.php	3 Feb 2008 19:11:50 -0000	1.62
***************
*** 331,335 ****
          // Rename the existing config.php as it's not needed any more
          $ren = @rename($plugin_path . 'config.php',
!                        $plugin_path . 'config-pre1.4.3.php');
      }
  
--- 331,335 ----
          // Rename the existing config.php as it's not needed any more
          $ren = @rename($plugin_path . 'config.php',
!                        $plugin_path . 'config-pre1.5.0.php');
      }
  
***************
*** 370,374 ****
  }
  
! // spamx plugin updates
  function upgrade_SpamXPlugin()
  {
--- 370,374 ----
  }
  
! // Spam-X plugin updates
  function upgrade_SpamXPlugin()
  {
***************
*** 398,407 ****
      }
  
      return true;
  }
  
  function upgrade_LinksPlugin()
  {
!     global $_TABLES, $_LI_CONF;
  
      $P_SQL = array();
--- 398,432 ----
      }
  
+     if (file_exists($plugin_path . 'config.php')) {
+         // Rename the existing config.php as it's not needed any more
+         $ren = @rename($plugin_path . 'config.php',
+                        $plugin_path . 'config-pre1.5.0.php');
+     }
+ 
      return true;
  }
  
+ // Links plugin updates
  function upgrade_LinksPlugin()
  {
!     global $_CONF, $_TABLES;
! 
!     require_once $_CONF['path_system'] . 'classes/config.class.php';
! 
!     $plugin_path = $_CONF['path'] . 'plugins/links/';
!     require_once $plugin_path . 'install_defaults.php';
! 
!     if (!plugin_initconfig_links()) {
!         echo 'There was an error upgrading the Links plugin';
!         return false;
!     }
! 
!     $li_config = config::get_instance();
!     $_LI_CONF = $li_config->get_config('links');
! 
!     if (empty($_LI_CONF['root'])) {
!         $_LI_CONF['root'] = 'site';
!     }
!     $root = addslashes($_LI_CONF['root']);
  
      $P_SQL = array();
***************
*** 432,441 ****
      $P_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} CHANGE category cid varchar(32) NOT NULL";
      $P_SQL[] = "ALTER TABLE {$_TABLES['links']} CHANGE category cid varchar(32) NOT NULL";
!     $P_SQL[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) "
!         . "VALUES ('site', 'root', 'Root', 'Website root', '', NOW(), NOW(), 5, 2, 3, 3, 2, 2)";
!     $P_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) "
!         . "VALUES (1, 'links_topic_links', 'phpblock', 'Topic Links', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_links', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
!     $P_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) "
!         . "VALUES (1, 'links_topic_categories', 'phpblock', 'Topic Categories', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_categories', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
      $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.0', pi_gl_version='1.5.0' WHERE pi_name='links'";
  
--- 457,463 ----
      $P_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} CHANGE category cid varchar(32) NOT NULL";
      $P_SQL[] = "ALTER TABLE {$_TABLES['links']} CHANGE category cid varchar(32) NOT NULL";
!     $P_SQL[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('{$root}', 'root', 'Root', 'Website root', NULL, NOW(), NOW(), 5, 2, 3, 3, 2, 2)";
!     $P_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_links', 'phpblock', 'Topic Links', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_links', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
!     $P_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_categories', 'phpblock', 'Topic Categories', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_categories', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
      $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.0', pi_gl_version='1.5.0' WHERE pi_name='links'";
  
***************
*** 452,459 ****
      $group_id = DB_getItem($_TABLES['groups'], 'grp_id',
                             "grp_name = 'Links Admin'");
-     if (empty($_LI_CONF['root'])) {
-         $_LI_CONF['root'] = 'site';
-     }
-     $root = addslashes($_LI_CONF['root']);
  
      // loop through adding to category table, then update links table with cids
--- 474,477 ----
***************
*** 461,469 ****
      $nrows = DB_numRows($result);
      for ($i = 0; $i < $nrows; $i++) {
          $A = DB_fetchArray($result);
          $category = addslashes($A['category']);
          $cid = $category;
!         DB_query("INSERT INTO {$_TABLES['linkcategories']} (cid,pid,category,description,tid,owner_id,group_id,created,modified) "
!             . "VALUES ('{$cid}','{$root}','{$category}','{$category}','all',2,'{$group_id}',NOW(),NOW())",1);
          if ($cid != $category) { // still experimenting ...
              DB_query("UPDATE {$_TABLES['links']} SET cid='{$cid}' WHERE cid='{$category}'",1);
--- 479,487 ----
      $nrows = DB_numRows($result);
      for ($i = 0; $i < $nrows; $i++) {
+ 
          $A = DB_fetchArray($result);
          $category = addslashes($A['category']);
          $cid = $category;
!         DB_query("INSERT INTO {$_TABLES['linkcategories']} (cid,pid,category,description,tid,owner_id,group_id,created,modified) VALUES ('{$cid}','{$root}','{$category}','{$category}','all',2,'{$group_id}',NOW(),NOW())",1);
          if ($cid != $category) { // still experimenting ...
              DB_query("UPDATE {$_TABLES['links']} SET cid='{$cid}' WHERE cid='{$category}'",1);
***************
*** 473,476 ****
--- 491,500 ----
              return false;
          }
+     }
+ 
+     if (file_exists($plugin_path . 'config.php')) {
+         // Rename the existing config.php as it's not needed any more
+         $ren = @rename($plugin_path . 'config.php',
+                        $plugin_path . 'config-pre1.5.0.php');
      }
  



From dhaun at qs1489.pair.com  Sun Feb  3 14:11:52 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 19:11:52 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/links
	install.php, 1.21, 1.22
Message-ID: <20080203191152.C4C5910FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links
In directory qs1489.pair.com:/tmp/cvs-serv13605/public_html/admin/plugins/links

Modified Files:
	install.php 
Log Message:
Added Links plugin config to the configuration GUI


Index: install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/install.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** install.php	2 Sep 2007 02:44:32 -0000	1.21
--- install.php	3 Feb 2008 19:11:50 -0000	1.22
***************
*** 3,7 ****
  // Reminder: always indent with 4 spaces (no tabs).
  // +---------------------------------------------------------------------------+
! // | Links plugin 1.0 for Geeklog                                              |
  // +---------------------------------------------------------------------------+
  // | install.php                                                               |
--- 3,7 ----
  // Reminder: always indent with 4 spaces (no tabs).
  // +---------------------------------------------------------------------------+
! // | Links plugin 2.0 for Geeklog                                              |
  // +---------------------------------------------------------------------------+
  // | install.php                                                               |
***************
*** 12,22 ****
  // | Based on the Universal Plugin and prior work by the following authors:    |
  // |                                                                           |
! // | Copyright (C) 2002-2006 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
! // |          Tom Willett       - tom AT pigstye DOT net                       |
! // |          Blaine Lang       - blaine AT portalparts DOT com                |
! // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Vincent Furia     - vinny01 AT users DOT sourceforge DOT net     |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 12,24 ----
  // | Based on the Universal Plugin and prior work by the following authors:    |
  // |                                                                           |
! // | Copyright (C) 2002-2008 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs         - tony AT tonybibbs DOT com                   |
! // |          Tom Willett        - tom AT pigstye DOT net                      |
! // |          Blaine Lang        - blaine AT portalparts DOT com               |
! // |          Dirk Haun          - dirk AT haun-online DOT de                  |
! // |          Vincent Furia      - vinny01 AT users DOT sourceforge DOT net    |
! // |          Oliver Spiesshofer - oliver AT spiesshofer DOT com               |
! // |          Euan McKay         - info AT heatherengineering DOT com          |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 37,109 ****
  // +---------------------------------------------------------------------------+
  //
- 
- /**
-  * This file installs and removes the data structures for the
-  * Links plugin for Geeklog.
-  *
-  * @package Links
-  * @subpackage admin
-  * @filesource
-  * @version 1.0.1
-  * @since GL 1.4.0
-  * @copyright Copyright &copy; 2005-2006
-  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
-  * @author Trinity Bays <trinity93 at steubentech.com>
-  * @author Tony Bibbs <tony at tonybibbs.com>
-  * @author Tom Willett <twillett at users.sourceforge.net>
-  * @author Blaine Lang <langmail at sympatico.ca>
-  * @author Dirk Haun <dirk at haun-online.de>
-  *
-  */
  // $Id$
  
! require_once ('../../../lib-common.php');
! require_once ($_CONF['path'] . 'plugins/links/config.php');
  
  // Plugin information
! /**
!  * plugin display name
!  * @global string $pi_display_name
!  */
  $pi_display_name = 'Links';
- /**
-  * plugin name
-  * @global string $pi_name
-  */
  $pi_name         = 'links';
! /**
!  * plugin version
!  * @global string $pi_version
!  */
! $pi_version      = $_LI_CONF['version'];
! /**
!  * plugin suported GL version
!  * @global string $gl_version
!  */
! $gl_version      = '1.4.1';
! /**
!  * plugin suport website url
!  * @global string $pi_url
!  */
  $pi_url          = 'http://www.geeklog.net/';
- /**
-  * name of the Admin group
-  * @global string $pi_admin
-  */
- $pi_admin        = $pi_display_name . ' Admin';
  
  
! /**
!  * the plugin's groups - assumes first group to be the Admin group
!  * @global array $GROUPS
!  *
!  */
  $GROUPS = array();
  $GROUPS[$pi_admin] = 'Has full access to ' . $pi_name . ' features';
  
- /**
- * @global array $FEATURES
- *
- */
  $FEATURES = array();
  $FEATURES['links.edit']         = 'Access to links editor';
--- 39,65 ----
  // +---------------------------------------------------------------------------+
  //
  // $Id$
  
! require_once '../../../lib-common.php';
  
  // Plugin information
! //
! // ----------------------------------------------------------------------------
! //
  $pi_display_name = 'Links';
  $pi_name         = 'links';
! $pi_version      = '2.0.0';
! $gl_version      = '1.5.0';
  $pi_url          = 'http://www.geeklog.net/';
  
+ $base_path = $_CONF['path'] . 'plugins/' . $pi_name . '/';
  
! // name of the Admin group
! $pi_admin        = $pi_display_name . ' Admin';
! 
! // the plugin's groups - assumes first group to be the Admin group
  $GROUPS = array();
  $GROUPS[$pi_admin] = 'Has full access to ' . $pi_name . ' features';
  
  $FEATURES = array();
  $FEATURES['links.edit']         = 'Access to links editor';
***************
*** 111,118 ****
  $FEATURES['links.submit']       = 'May skip the links submission queue';
  
- /**
-  * @global array $MAPPINGS
-  *
-  */
  $MAPPINGS = array();
  $MAPPINGS['links.edit']         = array ($pi_admin);
--- 67,70 ----
***************
*** 120,149 ****
  $MAPPINGS['links.submit']       = array ($pi_admin);
  
! /**
!  * (optional) data to pre-populate tables with
!  * Insert table name and sql to insert default data for your plugin.
!  * Note: '#group#' will be replaced with the id of the plugin's admin group.
!  * @global array $DEFVALUES
!  * @name $DEFVALUES
!  */
! $DEFVALUES = array();
! 
! $blockadmin_id = DB_GetItem ($_TABLES['groups'], 'grp_id', "grp_name='Block Admin'");
! 
! $DEFVALUES[] = "INSERT INTO {$_TABLES['linkcategories']} "
!     . "(cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) "
!     . "VALUES ('{$_LI_CONF['root']}', 'root', 'Root', 'Website root', '', NOW(), NOW(), 5, 2, 3, 3, 2, 2)";
! $DEFVALUES[] = "INSERT INTO {$_TABLES['linkcategories']} "
!     . "(cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) "
!     . "VALUES ('20070122143647631', '{$_LI_CONF['root']}', 'Geeklog sites', 'Sites using or related to the Geeklog CMS', '', NOW(), NOW(), 5, 2, 3, 3, 2, 2)";
! $DEFVALUES[] = "INSERT INTO {$_TABLES['links']} "
!     . "(lid, cid, url, description, title, hits, date, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) "
!     . "VALUES ('geeklog.net', '20070828065220743', 'http://www.geeklog.net/', 'Visit the Geeklog homepage for support, FAQs, updates, add-ons, and a great community.', 'Geeklog Project Homepage', 0, NOW(), 1, 5, 3, 2, 2, 2);";
! $DEFVALUES[] = "INSERT INTO gl_blocks "
!     . "(is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) "
!     . "VALUES (1, 'links_topic_links', 'phpblock', 'Topic Links', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_links', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
! $DEFVALUES[] = "INSERT INTO gl_blocks "
!     . "(is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) "
!     . "VALUES (1, 'links_topic_categories', 'phpblock', 'Topic Categories', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_categories', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
  
  
--- 72,79 ----
  $MAPPINGS['links.submit']       = array ($pi_admin);
  
! // (optional) data to pre-populate tables with
! // Insert table name and sql to insert default data for your plugin.
! // Note: '#group#' will be replaced with the id of the plugin's admin group.
! $DEFVALUES = array(); // not used here - see plugin_postinstall
  
  
***************
*** 155,161 ****
   *
   */
! function plugin_compatible_with_this_geeklog_version ()
  {
!     if (!function_exists ('COM_truncate') || !function_exists ('MBYTE_strpos')) {
          return false;
      }
--- 85,91 ----
   *
   */
! function plugin_compatible_with_this_geeklog_version()
  {
!     if (!function_exists('COM_truncate') || !function_exists('MBYTE_strpos')) {
          return false;
      }
***************
*** 163,166 ****
--- 93,160 ----
      return true;
  }
+ 
+ /**
+ * Loads the configuration records for the GL Online Config Manager
+ *
+ * @return   boolean     true = proceed with install, false = an error occured
+ *
+ */
+ function plugin_load_configuration()
+ {
+     global $_CONF, $base_path;
+ 
+     require_once $_CONF['path_system'] . 'classes/config.class.php';
+     require_once $base_path . 'install_defaults.php';
+ 
+     return plugin_initconfig_links();
+ }
+ 
+ /**
+ * Plugin postinstall
+ *
+ * We're inserting our default here since it depends on other stuff that has
+ * to happen first ...
+ *
+ * @return   boolean     true = proceed with install, false = an error occured
+ *
+ */
+ function plugin_postinstall()
+ {
+     global $_CONF, $_TABLES, $pi_admin;
+ 
+     require_once $_CONF['path_system'] . 'classes/config.class.php';
+ 
+     $li_config = config::get_instance(); 
+     $_LI_CONF = $li_config->get_config('links');
+ 
+     $admin_group_id = DB_getItem($_TABLES['groups'], 'grp_id',
+                                  "grp_name = '{$pi_admin}'");
+     $blockadmin_id = DB_getItem($_TABLES['groups'], 'grp_id',
+                                 "grp_name = 'Block Admin'");
+ 
+     $L_SQL = array();
+     $L_SQL[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('{$_LI_CONF['root']}', 'root', 'Root', 'Website root', '', NOW(), NOW(), #group#, 2, 3, 3, 2, 2)";
+ 
+     $L_SQL[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklog-sites', '{$_LI_CONF['root']}', 'Geeklog Sites', 'Sites using or related to the Geeklog CMS', NULL, NOW(), NOW(), #group#, 2, 3, 3, 2, 2)";
+ 
+     $L_SQL[] = "INSERT INTO {$_TABLES['links']} (lid, cid, url, description, title, hits, date, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklog.net', 'geeklog-sites', 'http://www.geeklog.net/', 'Visit the Geeklog homepage for support, FAQs, updates, add-ons, and a great community.', 'Geeklog Project Homepage', 123, NOW(), 1, #group#, 3, 3, 2, 2);";
+ 
+     $L_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_links', 'phpblock', 'Topic Links', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_links', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
+ 
+     $L_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_categories', 'phpblock', 'Topic Categories', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_categories', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
+ 
+     foreach ($L_SQL as $sql) {
+         $sql = str_replace('#group#', $admin_group_id, $sql);
+         DB_query($sql, 1);
+         if (DB_error()) {
+             COM_error("SQL error in Links plugin postinstall, SQL: " . $sql);
+             return false;
+         }
+     }
+ 
+     return true;
+ }
+ 
+ 
  //
  // ----------------------------------------------------------------------------
***************
*** 169,181 ****
  // require modifications.
  
- $base_path = $_CONF['path'] . 'plugins/' . $pi_name . '/';
  $langfile = $base_path . $_CONF['language'] . '.php';
! if (file_exists ($langfile)) {
!     require_once ($langfile);
  } else {
!     require_once ($base_path . 'language/english.php');
  }
! require_once ($base_path . 'config.php');
! require_once ($base_path . 'functions.inc');
  
  
--- 163,173 ----
  // require modifications.
  
  $langfile = $base_path . $_CONF['language'] . '.php';
! if (file_exists($langfile)) {
!     require_once $langfile;
  } else {
!     require_once $base_path . 'language/english.php';
  }
! require_once $base_path . 'functions.inc';
  
  
***************
*** 198,215 ****
  /**
  * Puts the datastructures for this plugin into the Geeklog database
! * @global array core config vars
! * @global array core table data
! * @global array core user data
! * @global array plugin group data
! * @global array plugin feature data
! * @global array plugin feature mapping data
! * @global array data to preopulate db
! * @global string path data
! * @global string plugin name
! * @global string plugin display name
! * @global string plugin version
! * @global string geeklog supported version
! * @global string plugin support url
! * @return boolean true if compleated false if failed
  */
  function plugin_install_now()
--- 190,195 ----
  /**
  * Puts the datastructures for this plugin into the Geeklog database
! * @return boolean true if completed false if failed
! *
  */
  function plugin_install_now()
***************
*** 263,267 ****
              }
              DB_query ($sql);
-             COM_errorLog ('...table', 1);
              if (DB_error ()) {
                  COM_errorLog ('Error creating table', 1);
--- 243,246 ----
***************
*** 326,329 ****
--- 305,316 ----
      }
  
+     // Load the online configuration records
+     if (function_exists('plugin_load_configuration')) {
+         if (!plugin_load_configuration()) {
+             PLG_uninstall($pi_name);
+             return false;
+         }
+     }
+ 
      // Finally, register the plugin with Geeklog
      COM_errorLog ("Registering $pi_display_name plugin with Geeklog", 1);
***************
*** 342,348 ****
  
      // give the plugin a chance to perform any post-install operations
!     if (function_exists ('plugin_postinstall')) {
!         if (!plugin_postinstall ()) {
!             PLG_uninstall ($pi_name);
  
              return false;
--- 329,335 ----
  
      // give the plugin a chance to perform any post-install operations
!     if (function_exists('plugin_postinstall')) {
!         if (!plugin_postinstall()) {
!             PLG_uninstall($pi_name);
  
              return false;



From dhaun at qs1489.pair.com  Sun Feb  3 14:11:52 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 19:11:52 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install
	config-install.php, 1.23, 1.24
Message-ID: <20080203191152.B2CC210FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv13605/public_html/admin/install

Modified Files:
	config-install.php 
Log Message:
Added Links plugin config to the configuration GUI


Index: config-install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/config-install.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** config-install.php	2 Feb 2008 20:03:06 -0000	1.23
--- config-install.php	3 Feb 2008 19:11:50 -0000	1.24
***************
*** 232,235 ****
--- 232,238 ----
      $plugin_path = $_CONF['path'] . 'plugins/';
  
+     require_once $plugin_path . 'links/install_defaults.php';
+     plugin_initconfig_links();
+ 
      require_once $plugin_path . 'staticpages/install_defaults.php';
      plugin_initconfig_staticpages();



From dhaun at qs1489.pair.com  Sun Feb  3 14:11:52 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 19:11:52 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql mysql_tableanddata.php,1.199,1.200
Message-ID: <20080203191152.D432A10FE17@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql
In directory qs1489.pair.com:/tmp/cvs-serv13605/sql

Modified Files:
	mysql_tableanddata.php 
Log Message:
Added Links plugin config to the configuration GUI


Index: mysql_tableanddata.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mysql_tableanddata.php,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** mysql_tableanddata.php	27 Jan 2008 15:23:32 -0000	1.199
--- mysql_tableanddata.php	3 Feb 2008 19:11:50 -0000	1.200
***************
*** 891,897 ****
  $_DATA[] = "INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (18,'Webservices Users', 'Can use the Webservices API (if restricted)',0) ";
  
! $_DATA[] = "INSERT INTO {$_TABLES['links']} (lid, cid, url, description, title, hits, date, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklog.net', '20070828065220743', 'http://www.geeklog.net/', 'Visit the Geeklog homepage for support, FAQs, updates, add-ons, and a great community.', 'Geeklog Project Homepage', 0, '2007-08-28 14:52:13', 1, 5, 3, 2, 2, 2);";
! $_DATA[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('20070828065220743', 'site', 'Geeklog Sites', NULL, NULL, '2007-08-28 14:52:20', '2007-08-28 14:52:20', 2, 5, 3, 2, 2, 2);";
! $_DATA[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('site', 'root', 'Root', 'Website root', '', '2007-08-28 14:52:21', '2007-08-28 14:52:21', 2, 5, 3, 3, 2, 2);";
  
  $_DATA[] = "INSERT INTO {$_TABLES['maillist']} (code, name) VALUES (0,'Don\'t Email') ";
--- 891,897 ----
  $_DATA[] = "INSERT INTO {$_TABLES['groups']} (grp_id, grp_name, grp_descr, grp_gl_core) VALUES (18,'Webservices Users', 'Can use the Webservices API (if restricted)',0) ";
  
! $_DATA[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('site', 'root', 'Root', 'Website root', NULL, NOW(), NOW(), 2, 5, 3, 3, 2, 2);";
! $_DATA[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklog-sites', 'site', 'Geeklog Sites', 'Sites using or related to the Geeklog CMS', NULL, NOW(), NOW(), 2, 5, 3, 3, 2, 2);";
! $_DATA[] = "INSERT INTO {$_TABLES['links']} (lid, cid, url, description, title, hits, date, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklog.net', 'geeklog-sites', 'http://www.geeklog.net/', 'Visit the Geeklog homepage for support, FAQs, updates, add-ons, and a great community.', 'Geeklog Project Homepage', 123, NOW(), 1, 5, 3, 3, 2, 2);";
  
  $_DATA[] = "INSERT INTO {$_TABLES['maillist']} (code, name) VALUES (0,'Don\'t Email') ";



From dhaun at qs1489.pair.com  Sun Feb  3 14:23:26 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 19:23:26 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.114,
	1.115
Message-ID: <20080203192326.85E1C10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv14091/plugins/staticpages

Modified Files:
	functions.inc 
Log Message:
For consistency: Let's use the Geeklog version number when renaming the old config files


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** functions.inc	2 Feb 2008 16:36:33 -0000	1.114
--- functions.inc	3 Feb 2008 19:23:24 -0000	1.115
***************
*** 1044,1048 ****
              // Rename the existing config.php as it's not needed any more
              $ren = @rename($plugin_path . 'config.php',
!                            $plugin_path . 'config-pre1.4.3.php');
              if (!$ren) {
                  COM_errorLog("Could not rename the Static Pages plugin's config.php file. Please remove if manually, as it is not needed any more.");
--- 1044,1048 ----
              // Rename the existing config.php as it's not needed any more
              $ren = @rename($plugin_path . 'config.php',
!                            $plugin_path . 'config-pre1.5.0.php');
              if (!$ren) {
                  COM_errorLog("Could not rename the Static Pages plugin's config.php file. Please remove if manually, as it is not needed any more.");



From dhaun at qs1489.pair.com  Sun Feb  3 14:23:26 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 19:23:26 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/spamx functions.inc,1.32,1.33
Message-ID: <20080203192326.7777210FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/spamx
In directory qs1489.pair.com:/tmp/cvs-serv14091/plugins/spamx

Modified Files:
	functions.inc 
Log Message:
For consistency: Let's use the Geeklog version number when renaming the old config files


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/functions.inc,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** functions.inc	2 Feb 2008 20:03:06 -0000	1.32
--- functions.inc	3 Feb 2008 19:23:24 -0000	1.33
***************
*** 198,202 ****
                  // Rename the existing config.php as it's not needed any more
                  $ren = @rename($plugin_path . 'config.php',
!                                $plugin_path . 'config-pre1.1.1.php');
                  if (!$ren) {
                      COM_errorLog("Could not rename the ages Spam-X plugin's config.php file. Please remove if manually, as it is not needed any more.");
--- 198,202 ----
                  // Rename the existing config.php as it's not needed any more
                  $ren = @rename($plugin_path . 'config.php',
!                                $plugin_path . 'config-pre1.5.0.php');
                  if (!$ren) {
                      COM_errorLog("Could not rename the ages Spam-X plugin's config.php file. Please remove if manually, as it is not needed any more.");



From dhaun at qs1489.pair.com  Sun Feb  3 15:21:26 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 20:21:26 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.674,1.675
Message-ID: <20080203202126.2208A10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv16461/public_html

Modified Files:
	lib-common.php 
Log Message:
Updated comment - no more changes required in this file


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.674
retrieving revision 1.675
diff -C2 -d -r1.674 -r1.675
*** lib-common.php	26 Jan 2008 14:23:29 -0000	1.674
--- lib-common.php	3 Feb 2008 20:21:23 -0000	1.675
***************
*** 42,49 ****
  * This is the common library for Geeklog.  Through our code, you will see
  * functions with the COM_ prefix (e.g. COM_siteHeader()).  Any such functions
! * can be found in this file.  This file provides all configuration variables
! * needed by Geeklog with a series of includes (see futher down).
  *
! * --- You only need to modify one line in this file! ---
  *
  * WARNING: put any custom hacks in lib-custom.php and not in here.  This file is
--- 42,48 ----
  * This is the common library for Geeklog.  Through our code, you will see
  * functions with the COM_ prefix (e.g. COM_siteHeader()).  Any such functions
! * can be found in this file.
  *
! * --- You don't need to modify anything in this file! ---
  *
  * WARNING: put any custom hacks in lib-custom.php and not in here.  This file is



From dhaun at qs1489.pair.com  Sun Feb  3 15:47:29 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 20:47:29 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-plugins.php,1.140,1.141
Message-ID: <20080203204729.D293A10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv17346/system

Modified Files:
	lib-plugins.php 
Log Message:
Only incude lib-story.php when it's needed; moved PLG_afterSaveSwitch to the ned of the file


Index: lib-plugins.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-plugins.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** lib-plugins.php	2 Jan 2008 21:06:02 -0000	1.140
--- lib-plugins.php	3 Feb 2008 20:47:27 -0000	1.141
***************
*** 66,121 ****
  
  /**
- * Forward the user depending on config.php-setting after saving something
- *
- * @param  string  $item_url   the url of the item saved
- * @param  string  $plugin     the name of the plugin that saved the item
- * @return the url where the user will be forwarded to
- *
- */
- function PLG_afterSaveSwitch($target, $item_url, $plugin, $message = '')
- {
-     global $_CONF;
- 
-     if (isset($message)) {
-         $msg = "msg=$message";
-     } else {
-         $msg = '';
-     }
- 
-     switch ($target) {
-     case 'item':
-         $url = $item_url . '&' . $msg;
-         break;
- 
-     case 'list':
-         if ($plugin == 'story') {
-             $url = $_CONF['site_admin_url'] . "/$plugin.php?$msg";
-         } elseif ($plugin == 'user') {
-             $url = $_CONF['site_admin_url'] . "/user.php?$msg";
-         } else {
-             $url = $_CONF['site_admin_url'] . "/plugins/$plugin/index.php?$msg";
-         }
-         break;
- 
-     case 'home':
-         // the plugins messages are not available, use generic
-         $url = $_CONF['site_url'] . "/index.php?msg=15";
-         break;
- 
-     case 'admin':
-         // the plugins messages are not available, use generic
-         $url = $_CONF['site_admin_url'] . "/moderation.php?msg=15";
-         break;
- 
-     case 'plugin':
-         $url = $_CONF['site_url'] . "/$plugin/index.php?$msg";
-         break;
-     }
- 
-     return COM_refresh($url);
- }
- 
- 
- /**
  * Calls a function for all enabled plugins
  *
--- 66,69 ----
***************
*** 2305,2310 ****
      $retval = PLG_RET_ERROR;
  
!     // ensure we can see the service_XXX_story functions
!     require_once $_CONF['path_system'] . 'lib-story.php';
  
      $output  = '';
--- 2253,2260 ----
      $retval = PLG_RET_ERROR;
  
!     if ($type == 'story') {
!         // ensure we can see the service_XXX_story functions
!         require_once $_CONF['path_system'] . 'lib-story.php';
!     }
  
      $output  = '';
***************
*** 2329,2337 ****
   * @param   string  type    The plugin type that is to be checked
   */
! function PLG_wsEnabled($type) {
      global $_CONF;
  
!     // ensure we can see the service_XXX_story functions
!     require_once $_CONF['path_system'] . 'lib-story.php';
  
      $function = 'plugin_wsEnabled_' . $type;
--- 2279,2290 ----
   * @param   string  type    The plugin type that is to be checked
   */
! function PLG_wsEnabled($type)
! {
      global $_CONF;
  
!     if ($type == 'story') {
!         // ensure we can see the service_XXX_story functions
!         require_once $_CONF['path_system'] . 'lib-story.php';
!     }
  
      $function = 'plugin_wsEnabled_' . $type;
***************
*** 2341,2344 ****
--- 2294,2357 ----
          return false;
      }
+ }
+ 
+ /**
+ * Forward the user depending on config.php-setting after saving something
+ *
+ * @param  string  $item_url   the url of the item saved
+ * @param  string  $plugin     the name of the plugin that saved the item
+ * @return the url where the user will be forwarded to
+ *
+ */
+ function PLG_afterSaveSwitch($target, $item_url, $plugin, $message = '')
+ {
+     global $_CONF;
+ 
+     if (isset($message)) {
+         $msg = "msg=$message";
+     } else {
+         $msg = '';
+     }
+ 
+     switch ($target) {
+     case 'item':
+         $url = $item_url;
+         if (!empty($msg)) {
+             $url .= '&' . $msg;
+         }
+         break;
+ 
+     case 'list':
+         if ($plugin == 'story') {
+             $url = $_CONF['site_admin_url'] . "/$plugin.php";
+         } elseif ($plugin == 'user') {
+             $url = $_CONF['site_admin_url'] . "/user.php";
+         } else {
+             $url = $_CONF['site_admin_url'] . "/plugins/$plugin/index.php";
+         }
+         if (!empty($msg)) {
+             $url .= '?' . $msg;
+         }
+         break;
+ 
+     case 'home':
+         // the plugins messages are not available, use generic
+         $url = $_CONF['site_url'] . '/index.php?msg=15';
+         break;
+ 
+     case 'admin':
+         // the plugins messages are not available, use generic
+         $url = $_CONF['site_admin_url'] . '/moderation.php?msg=15';
+         break;
+ 
+     case 'plugin':
+         $url = $_CONF['site_url'] . "/$plugin/index.php";
+         if (!empty($msg)) {
+             $url .= '?' . $msg;
+         }
+         break;
+     }
+ 
+     return COM_refresh($url);
  }
  



From dhaun at qs1489.pair.com  Sun Feb  3 15:52:57 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 20:52:57 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install
	config-install.php, 1.24, 1.25
Message-ID: <20080203205257.8815810FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv17509/public_html/admin/install

Modified Files:
	config-install.php 
Log Message:
Revert 'aftersave_story' to 'list', which makes more sense for sending Trackbacks, etc. after saving a story


Index: config-install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/config-install.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** config-install.php	3 Feb 2008 19:11:50 -0000	1.24
--- config-install.php	3 Feb 2008 20:52:55 -0000	1.25
***************
*** 174,178 ****
      $c->add('hide_main_page_navigation',0,'select',1,24,0,1310,TRUE);
      $c->add('onlyrootfeatures',0,'select',1,24,0,1320,TRUE);
!     $c->add('aftersave_story','item','select',1,24,9,1330,TRUE);
      $c->add('aftersave_user','item','select',1,24,9,1340,TRUE);
      $c->add('show_right_blocks',FALSE,'select',2,25,1,1350,TRUE);
--- 174,178 ----
      $c->add('hide_main_page_navigation',0,'select',1,24,0,1310,TRUE);
      $c->add('onlyrootfeatures',0,'select',1,24,0,1320,TRUE);
!     $c->add('aftersave_story','list','select',1,24,9,1330,TRUE);
      $c->add('aftersave_user','item','select',1,24,9,1340,TRUE);
      $c->add('show_right_blocks',FALSE,'select',2,25,1,1350,TRUE);



From dhaun at qs1489.pair.com  Sun Feb  3 15:52:57 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 20:52:57 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.62,
	1.63
Message-ID: <20080203205257.97D4110FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv17509/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Revert 'aftersave_story' to 'list', which makes more sense for sending Trackbacks, etc. after saving a story


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** mysql_1.4.1_to_1.5.0.php	3 Feb 2008 19:11:50 -0000	1.62
--- mysql_1.4.1_to_1.5.0.php	3 Feb 2008 20:52:55 -0000	1.63
***************
*** 181,185 ****
      $c->add('hide_main_page_navigation',0,'select',1,24,0,1310,TRUE);
      $c->add('onlyrootfeatures',0,'select',1,24,0,1320,TRUE);
!     $c->add('aftersave_story','item','select',1,24,9,1330,TRUE);
      $c->add('aftersave_user','item','select',1,24,9,1340,TRUE);
      $c->add('show_right_blocks',FALSE,'select',2,25,1,1350,TRUE);
--- 181,185 ----
      $c->add('hide_main_page_navigation',0,'select',1,24,0,1310,TRUE);
      $c->add('onlyrootfeatures',0,'select',1,24,0,1320,TRUE);
!     $c->add('aftersave_story','list','select',1,24,9,1330,TRUE);
      $c->add('aftersave_user','item','select',1,24,9,1340,TRUE);
      $c->add('show_right_blocks',FALSE,'select',2,25,1,1350,TRUE);



From dhaun at qs1489.pair.com  Sun Feb  3 15:52:57 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 03 Feb 2008 20:52:57 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.62,
	1.63
Message-ID: <20080203205257.97D4110FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv17509/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Revert 'aftersave_story' to 'list', which makes more sense for sending Trackbacks, etc. after saving a story


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** mysql_1.4.1_to_1.5.0.php	3 Feb 2008 19:11:50 -0000	1.62
--- mysql_1.4.1_to_1.5.0.php	3 Feb 2008 20:52:55 -0000	1.63
***************
*** 181,185 ****
      $c->add('hide_main_page_navigation',0,'select',1,24,0,1310,TRUE);
      $c->add('onlyrootfeatures',0,'select',1,24,0,1320,TRUE);
!     $c->add('aftersave_story','item','select',1,24,9,1330,TRUE);
      $c->add('aftersave_user','item','select',1,24,9,1340,TRUE);
      $c->add('show_right_blocks',FALSE,'select',2,25,1,1350,TRUE);
--- 181,185 ----
      $c->add('hide_main_page_navigation',0,'select',1,24,0,1310,TRUE);
      $c->add('onlyrootfeatures',0,'select',1,24,0,1320,TRUE);
!     $c->add('aftersave_story','list','select',1,24,9,1330,TRUE);
      $c->add('aftersave_user','item','select',1,24,9,1340,TRUE);
      $c->add('show_right_blocks',FALSE,'select',2,25,1,1350,TRUE);



From blaine at qs1489.pair.com  Sat Feb  9 07:01:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:01:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional
	functions.php, 1.10, 1.11
Message-ID: <20080209120101.796E210FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional
In directory qs1489.pair.com:/tmp/cvs-serv23623

Modified Files:
	functions.php 
Log Message:
Tweak to config menu to not show current selected sub-group as a link in the menu.
Able to now set block templates for both config menus.

Index: functions.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/functions.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** functions.php	2 Feb 2008 21:56:34 -0000	1.10
--- functions.php	9 Feb 2008 12:00:59 -0000	1.11
***************
*** 25,28 ****
--- 25,29 ----
  $_BLOCK_TEMPLATE['_msg_block'] = 'blockheader-message.thtml,blockfooter-message.thtml';
  $_BLOCK_TEMPLATE['configmanager_block'] = 'blockheader-notitle.thtml,blockfooter-notitle.thtml';
+ $_BLOCK_TEMPLATE['configmanager_subblock'] = 'blockheader-notitle.thtml,blockfooter-notitle.thtml';
  $_BLOCK_TEMPLATE['whats_related_block'] = 'blockheader-related.thtml,blockfooter-related.thtml';
  $_BLOCK_TEMPLATE['story_options_block'] = 'blockheader-related.thtml,blockfooter-related.thtml';



From blaine at qs1489.pair.com  Sat Feb  9 07:01:08 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:01:08 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.21,
	1.22
Message-ID: <20080209120108.BB6F610FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv23660

Modified Files:
	config.class.php 
Log Message:
Tweak to config menu to not show current selected sub-group as a link in the menu.
Able to now set block templates for both config menus.

Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** config.class.php	3 Feb 2008 09:53:49 -0000	1.21
--- config.class.php	9 Feb 2008 12:01:06 -0000	1.22
***************
*** 467,471 ****
          $cssfile = '<link rel="stylesheet" type="text/css" href="'.$_CONF['layout_url'] .'/droplinemenu.css" ' . XHTML .'>' . LB;
          $display  = COM_siteHeader('none','Configuration Manager',$cssfile);
!         $t->set_var('config_menu',$this->_UI_configmanager_menu($grp));
          if ($change_result != null AND $change_result !== array()) {
              $t->set_var('change_block',$this->_UI_get_change_block($change_result));
--- 467,471 ----
          $cssfile = '<link rel="stylesheet" type="text/css" href="'.$_CONF['layout_url'] .'/droplinemenu.css" ' . XHTML .'>' . LB;
          $display  = COM_siteHeader('none','Configuration Manager',$cssfile);
!         $t->set_var('config_menu',$this->_UI_configmanager_menu($grp,$sg));
          if ($change_result != null AND $change_result !== array()) {
              $t->set_var('change_block',$this->_UI_get_change_block($change_result));
***************
*** 679,683 ****
  
  
!     function _UI_configmanager_menu($conf_group)
      {
          global $_CONF, $LANG_ADMIN, $LANG_CONFIG,
--- 679,683 ----
  
  
!     function _UI_configmanager_menu($conf_group,$sg=0)
      {
          global $_CONF, $LANG_ADMIN, $LANG_CONFIG,
***************
*** 716,719 ****
--- 716,721 ----
                                                       'footer'));
  
+ 
+         /* Now display the sub-group menu for the selected config group */
          if (empty($LANG_configsections[$conf_group]['title'])) {
              $subgroup_title = ucwords($conf_group);
***************
*** 722,732 ****
          }
          $retval .= COM_startBlock($subgroup_title, '',
!                         COM_getBlockTemplate('configmanager_block', 'header'));
  
!         $groups = $this->get_sgroups($conf_group);
!         if (count($groups) > 0) {
!             foreach ($groups as $group) {
!                 $group_display =  $LANG_configsubgroups[$conf_group][$group];
!                 $retval .= "<div><a href=\"#\" onclick='open_subgroup(\"$conf_group\",\"$group\")'>$group_display</a></div>";
              }
          }
--- 724,741 ----
          }
          $retval .= COM_startBlock($subgroup_title, '',
!                         COM_getBlockTemplate('configmanager_subblock', 'header'));
  
!         $sgroups = $this->get_sgroups($conf_group);
!         if (count($sgroups) > 0) {
!             $i =0;
!             foreach ($sgroups as $sgroup) {
!                 $group_display =  $LANG_configsubgroups[$conf_group][$sgroup];
!                 // Create a menu item for each sub config group - disable the link for the current selected one
!                 if ($i == $sg) {
!                     $retval .= "<div>$group_display</div>";
!                 } else {
!                     $retval .= "<div><a href=\"#\" onclick='open_subgroup(\"$conf_group\",\"$sgroup\")'>$group_display</a></div>";
!                 }
!                 $i++;
              }
          }
***************
*** 738,740 ****
  }
  
! ?>
--- 747,749 ----
  }
  
! ?>
\ No newline at end of file



From blaine at qs1489.pair.com  Sat Feb  9 07:22:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:22:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.22,
	1.23
Message-ID: <20080209122230.26BA710FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv24354

Modified Files:
	config.class.php 
Log Message:
Tweak to config menu to not show current selected group as a link in the menu.

Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** config.class.php	9 Feb 2008 12:01:06 -0000	1.22
--- config.class.php	9 Feb 2008 12:22:28 -0000	1.23
***************
*** 696,700 ****
                      $group_display = $LANG_configsections[$group]['label'];
                  }
!                 $link = "<div><a href=\"#\" onclick='open_group(\"$group\")'>$group_display</a></div>";
  
                  if ($group == 'Core') {
--- 696,705 ----
                      $group_display = $LANG_configsections[$group]['label'];
                  }
!                 // Create a menu item for each config group - disable the link for the current selected one
!                 if ($conf_group == $group) {
!                     $link = "<div>$group_display</div>";
!                 } else {
!                     $link = "<div><a href=\"#\" onclick='open_group(\"$group\")'>$group_display</a></div>";
!                 }
  
                  if ($group == 'Core') {



From blaine at qs1489.pair.com  Sat Feb  9 07:33:38 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:38 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses
	fck_othercommands.js, 1.4, NONE fckfitwindow.js, 1.1,
	NONE fcknamedcommand.js, 1.3, NONE fckpasteplaintextcommand.js,
	1.3, NONE fckpastewordcommand.js, 1.4,
	NONE fckspellcheckcommand_gecko.js, 1.2,
	NONE fckspellcheckcommand_ie.js, 1.2, NONE fckstylecommand.js,
	1.3, NONE fcktablecommand.js, 1.4, NONE fcktextcolorcommand.js,
	1.3, NONE
Message-ID: <20080209123338.0482A10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/_source/commandclasses

Removed Files:
	fck_othercommands.js fckfitwindow.js fcknamedcommand.js 
	fckpasteplaintextcommand.js fckpastewordcommand.js 
	fckspellcheckcommand_gecko.js fckspellcheckcommand_ie.js 
	fckstylecommand.js fcktablecommand.js fcktextcolorcommand.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fcktablecommand.js DELETED ---

--- fckpastewordcommand.js DELETED ---

--- fckspellcheckcommand_ie.js DELETED ---

--- fcknamedcommand.js DELETED ---

--- fckstylecommand.js DELETED ---

--- fckspellcheckcommand_gecko.js DELETED ---

--- fckpasteplaintextcommand.js DELETED ---

--- fckfitwindow.js DELETED ---

--- fck_othercommands.js DELETED ---

--- fcktextcolorcommand.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:38 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor _documentation.html,
	1.3, NONE _whatsnew.html, 1.5, NONE fckconfig.js, 1.9,
	NONE fckeditor.js, 1.5, NONE fckeditor.php, 1.4,
	NONE fckstyles.xml, 1.2, NONE fcktemplates.xml, 1.4,
	NONE htaccess.txt, 1.1, NONE license.txt, 1.1,
	NONE myconfig.js, 1.1, NONE
Message-ID: <20080209123338.D8F6A10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor
In directory qs1489.pair.com:/tmp/cvs-serv24797

Removed Files:
	_documentation.html _whatsnew.html fckconfig.js fckeditor.js 
	fckeditor.php fckstyles.xml fcktemplates.xml htaccess.txt 
	license.txt myconfig.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fckeditor.php DELETED ---

--- fckstyles.xml DELETED ---

--- _documentation.html DELETED ---

--- fcktemplates.xml DELETED ---

--- fckeditor.js DELETED ---

--- myconfig.js DELETED ---

--- fckconfig.js DELETED ---

--- htaccess.txt DELETED ---

--- license.txt DELETED ---

--- _whatsnew.html DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:38 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/css/images
	fck_anchor.gif, 1.1, NONE fck_flashlogo.gif, 1.1,
	NONE fck_pagebreak.gif, 1.1, NONE
Message-ID: <20080209123339.21C3B10FE17@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css/images
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/css/images

Removed Files:
	fck_anchor.gif fck_flashlogo.gif fck_pagebreak.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_flashlogo.gif DELETED ---

--- fck_anchor.gif DELETED ---

--- fck_pagebreak.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:38 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:38 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/_source/classes
	fckcontextmenu.js, 1.1, NONE fckeditingarea.js, 1.2,
	NONE fckevents.js, 1.3, NONE fckicon.js, 1.1,
	NONE fckiecleanup.js, 1.1, NONE fckmenublock.js, 1.2,
	NONE fckmenublockpanel.js, 1.1, NONE fckmenuitem.js, 1.2,
	NONE fckpanel.js, 1.2, NONE fckplugin.js, 1.3,
	NONE fckspecialcombo.js, 1.4, NONE fckstyledef.js, 1.3,
	NONE fckstyledef_gecko.js, 1.3, NONE fckstyledef_ie.js, 1.3,
	NONE fckstylesloader.js, 1.3, NONE fcktoolbar.js, 1.4,
	NONE fcktoolbarbreak_gecko.js, 1.3, NONE fcktoolbarbreak_ie.js,
	1.4, NONE fcktoolbarbutton.js, 1.3, NONE fcktoolbarbuttonui.js,
	1.2, NONE fcktoolbarfontformatcombo.js, 1.3,
	NONE fcktoolbarfontscombo.js, 1.3,
	NONE fcktoolbarfontsizecombo.js, 1.3,
	NONE fcktoolbarpanelbutton.js, 1.3,
	NONE fcktoolbarspecialcombo.js, 1.3,
	NONE fcktoolbarstylecombo.js, 1.3, NONE fckxml_gecko.js, 1.3,
	NONE fckxml_ie.js, 1.3, NONE
Message-ID: <20080209123338.05E4B10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/_source/classes

Removed Files:
	fckcontextmenu.js fckeditingarea.js fckevents.js fckicon.js 
	fckiecleanup.js fckmenublock.js fckmenublockpanel.js 
	fckmenuitem.js fckpanel.js fckplugin.js fckspecialcombo.js 
	fckstyledef.js fckstyledef_gecko.js fckstyledef_ie.js 
	fckstylesloader.js fcktoolbar.js fcktoolbarbreak_gecko.js 
	fcktoolbarbreak_ie.js fcktoolbarbutton.js 
	fcktoolbarbuttonui.js fcktoolbarfontformatcombo.js 
	fcktoolbarfontscombo.js fcktoolbarfontsizecombo.js 
	fcktoolbarpanelbutton.js fcktoolbarspecialcombo.js 
	fcktoolbarstylecombo.js fckxml_gecko.js fckxml_ie.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fckstyledef_ie.js DELETED ---

--- fckmenuitem.js DELETED ---

--- fckmenublock.js DELETED ---

--- fcktoolbarpanelbutton.js DELETED ---

--- fckpanel.js DELETED ---

--- fcktoolbarbutton.js DELETED ---

--- fckstyledef_gecko.js DELETED ---

--- fcktoolbarfontscombo.js DELETED ---

--- fcktoolbarbreak_ie.js DELETED ---

--- fckspecialcombo.js DELETED ---

--- fckcontextmenu.js DELETED ---

--- fcktoolbarfontsizecombo.js DELETED ---

--- fcktoolbar.js DELETED ---

--- fckiecleanup.js DELETED ---

--- fcktoolbarfontformatcombo.js DELETED ---

--- fckxml_gecko.js DELETED ---

--- fckxml_ie.js DELETED ---

--- fckicon.js DELETED ---

--- fckmenublockpanel.js DELETED ---

--- fcktoolbarbuttonui.js DELETED ---

--- fckstylesloader.js DELETED ---

--- fckplugin.js DELETED ---

--- fckevents.js DELETED ---

--- fcktoolbarspecialcombo.js DELETED ---

--- fcktoolbarbreak_gecko.js DELETED ---

--- fckstyledef.js DELETED ---

--- fcktoolbarstylecombo.js DELETED ---

--- fckeditingarea.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:38 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:38 +0000
Subject: [geeklog-cvs]
 Geeklog-1.x/public_html/fckeditor/editor/_source/internals fck.js, 1.4,
 NONE fck_1.js, 1.5, NONE fck_1_gecko.js, 1.5, NONE fck_1_ie.js, 1.5,
 NONE fck_2.js, 1.4, NONE fck_2_gecko.js, 1.4, NONE fck_2_ie.js, 1.5,
 NONE fck_contextmenu.js, 1.1, NONE fckbrowserinfo.js, 1.4,
 NONE fckcodeformatter.js, 1.3, NONE fckcommands.js, 1.4, NONE fckconfig.js,
 1.3, NONE fckdebug.js, 1.3, NONE fckdialog.js, 1.4, NONE fckdialog_gecko.js,
 1.4, NONE fckdialog_ie.js, 1.3, NONE fckdocumentprocessor.js, 1.2,
 NONE fcklanguagemanager.js, 1.3, NONE fckplugins.js, 1.3,
 NONE fckregexlib.js, 1.4, NONE fckselection.js, 1.3,
 NONE fckselection_gecko.js, 1.3, NONE fckselection_ie.js, 1.3,
 NONE fcktablehandler.js, 1.4, NONE fcktablehandler_gecko.js, 1.3,
 NONE fcktablehandler_ie.js, 1.3, NONE fcktoolbaritems.js, 1.4,
 NONE fcktoolbarset.js, 1.4, NONE fcktools.js, 1.5, NONE fcktools_gecko.js,
 1.5, NONE fcktools_ie.js, 1.4, NONE fckundo_gecko.js, 1.2,
 NONE fckundo_ie.js, 1.4, NONE fckurlparams.js, 1.3, NONE fckxhtml.js, 1.5,
 NONE fckxhtml_gecko.js, 1.3, NONE fckxhtml_ie.js, 1.4 ,
 NONE fckxhtmlentities.js, 1.3, NONE
Message-ID: <20080209123339.2258510FE18@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/internals
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/_source/internals

Removed Files:
	fck.js fck_1.js fck_1_gecko.js fck_1_ie.js fck_2.js 
	fck_2_gecko.js fck_2_ie.js fck_contextmenu.js 
	fckbrowserinfo.js fckcodeformatter.js fckcommands.js 
	fckconfig.js fckdebug.js fckdialog.js fckdialog_gecko.js 
	fckdialog_ie.js fckdocumentprocessor.js fcklanguagemanager.js 
	fckplugins.js fckregexlib.js fckselection.js 
	fckselection_gecko.js fckselection_ie.js fcktablehandler.js 
	fcktablehandler_gecko.js fcktablehandler_ie.js 
	fcktoolbaritems.js fcktoolbarset.js fcktools.js 
	fcktools_gecko.js fcktools_ie.js fckundo_gecko.js 
	fckundo_ie.js fckurlparams.js fckxhtml.js fckxhtml_gecko.js 
	fckxhtml_ie.js fckxhtmlentities.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fcktoolbarset.js DELETED ---

--- fck_2_ie.js DELETED ---

--- fcktools_gecko.js DELETED ---

--- fcktools_ie.js DELETED ---

--- fckundo_gecko.js DELETED ---

--- fck_2_gecko.js DELETED ---

--- fckbrowserinfo.js DELETED ---

--- fckdialog.js DELETED ---

--- fck_2.js DELETED ---

--- fckxhtml_gecko.js DELETED ---

--- fckcommands.js DELETED ---

--- fcktools.js DELETED ---

--- fckregexlib.js DELETED ---

--- fckurlparams.js DELETED ---

--- fckcodeformatter.js DELETED ---

--- fckselection.js DELETED ---

--- fck.js DELETED ---

--- fcktoolbaritems.js DELETED ---

--- fcktablehandler.js DELETED ---

--- fckundo_ie.js DELETED ---

--- fckplugins.js DELETED ---

--- fcktablehandler_ie.js DELETED ---

--- fckselection_ie.js DELETED ---

--- fck_1.js DELETED ---

--- fckxhtmlentities.js DELETED ---

--- fcktablehandler_gecko.js DELETED ---

--- fcklanguagemanager.js DELETED ---

--- fckxhtml_ie.js DELETED ---

--- fck_1_gecko.js DELETED ---

--- fckdocumentprocessor.js DELETED ---

--- fckselection_gecko.js DELETED ---

--- fck_contextmenu.js DELETED ---

--- fckdialog_gecko.js DELETED ---

--- fckxhtml.js DELETED ---

--- fck_1_ie.js DELETED ---

--- fckconfig.js DELETED ---

--- fckdebug.js DELETED ---

--- fckdialog_ie.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:39 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog
	fck_about.html, 1.4, NONE fck_anchor.html, 1.4,
	NONE fck_button.html, 1.2, NONE fck_checkbox.html, 1.3,
	NONE fck_colorselector.html, 1.2, NONE fck_docprops.html, 1.3,
	NONE fck_find.html, 1.3, NONE fck_flash.html, 1.2,
	NONE fck_form.html, 1.2, NONE fck_hiddenfield.html, 1.2,
	NONE fck_image.html, 1.5, NONE fck_link.html, 1.4,
	NONE fck_listprop.html, 1.3, NONE fck_paste.html, 1.3,
	NONE fck_radiobutton.html, 1.3, NONE fck_replace.html, 1.2,
	NONE fck_select.html, 1.2, NONE fck_smiley.html, 1.3,
	NONE fck_source.html, 1.2, NONE fck_specialchar.html, 1.4,
	NONE fck_spellerpages.html, 1.2, NONE fck_table.html, 1.4,
	NONE fck_tablecell.html, 1.2, NONE fck_template.html, 1.4,
	NONE fck_textarea.html, 1.2, NONE fck_textfield.html, 1.2,
	NONE fck_universalkey.html, 1.2, NONE
Message-ID: <20080209123339.5F57410FE1D@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog

Removed Files:
	fck_about.html fck_anchor.html fck_button.html 
	fck_checkbox.html fck_colorselector.html fck_docprops.html 
	fck_find.html fck_flash.html fck_form.html 
	fck_hiddenfield.html fck_image.html fck_link.html 
	fck_listprop.html fck_paste.html fck_radiobutton.html 
	fck_replace.html fck_select.html fck_smiley.html 
	fck_source.html fck_specialchar.html fck_spellerpages.html 
	fck_table.html fck_tablecell.html fck_template.html 
	fck_textarea.html fck_textfield.html fck_universalkey.html 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_table.html DELETED ---

--- fck_template.html DELETED ---

--- fck_radiobutton.html DELETED ---

--- fck_hiddenfield.html DELETED ---

--- fck_link.html DELETED ---

--- fck_find.html DELETED ---

--- fck_button.html DELETED ---

--- fck_listprop.html DELETED ---

--- fck_about.html DELETED ---

--- fck_image.html DELETED ---

--- fck_smiley.html DELETED ---

--- fck_docprops.html DELETED ---

--- fck_tablecell.html DELETED ---

--- fck_universalkey.html DELETED ---

--- fck_replace.html DELETED ---

--- fck_colorselector.html DELETED ---

--- fck_textfield.html DELETED ---

--- fck_spellerpages.html DELETED ---

--- fck_checkbox.html DELETED ---

--- fck_specialchar.html DELETED ---

--- fck_form.html DELETED ---

--- fck_select.html DELETED ---

--- fck_textarea.html DELETED ---

--- fck_flash.html DELETED ---

--- fck_source.html DELETED ---

--- fck_paste.html DELETED ---

--- fck_anchor.html DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:38 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/_source
	fckconstants.js, 1.1, NONE fckeditorapi.js, 1.2,
	NONE fckjscoreextensions.js, 1.1, NONE
Message-ID: <20080209123338.0826E10FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/_source

Removed Files:
	fckconstants.js fckeditorapi.js fckjscoreextensions.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fckjscoreextensions.js DELETED ---

--- fckeditorapi.js DELETED ---

--- fckconstants.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages
	blank.html, 1.1, NONE controlWindow.js, 1.1,
	NONE controls.html, 1.1, NONE spellChecker.js, 1.1,
	NONE spellchecker.html, 1.2, NONE spellerStyle.css, 1.1,
	NONE wordWindow.js, 1.1, NONE
Message-ID: <20080209123340.37A7A10FE22@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_spellerpages/spellerpages

Removed Files:
	blank.html controlWindow.js controls.html spellChecker.js 
	spellchecker.html spellerStyle.css wordWindow.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- spellChecker.js DELETED ---

--- controls.html DELETED ---

--- wordWindow.js DELETED ---

--- spellerStyle.css DELETED ---

--- spellchecker.html DELETED ---

--- controlWindow.js DELETED ---

--- blank.html DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:38 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/css/behaviors
	disablehandles.htc, 1.1, NONE hiddenfield.gif, 1.1,
	NONE hiddenfield.htc, 1.1, NONE showtableborders.htc, 1.3, NONE
Message-ID: <20080209123339.289F810FE19@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css/behaviors
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/css/behaviors

Removed Files:
	disablehandles.htc hiddenfield.gif hiddenfield.htc 
	showtableborders.htc 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- hiddenfield.htc DELETED ---

--- hiddenfield.gif DELETED ---

--- disablehandles.htc DELETED ---

--- showtableborders.htc DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default
	browser.css, 1.1, NONE browser.html, 1.1,
	NONE frmactualfolder.html, 1.1, NONE frmcreatefolder.html, 1.1,
	NONE frmfolders.html, 1.1, NONE frmresourceslist.html, 1.2,
	NONE frmresourcetype.html, 1.1, NONE frmupload.html, 1.1, NONE
Message-ID: <20080209123340.5F29510FE29@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/filemanager/browser/default

Removed Files:
	browser.css browser.html frmactualfolder.html 
	frmcreatefolder.html frmfolders.html frmresourceslist.html 
	frmresourcetype.html frmupload.html 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- frmfolders.html DELETED ---

--- frmactualfolder.html DELETED ---

--- browser.html DELETED ---

--- frmresourcetype.html DELETED ---

--- frmresourceslist.html DELETED ---

--- frmcreatefolder.html DELETED ---

--- browser.css DELETED ---

--- frmupload.html DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:38 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/css
	fck_editorarea.css, 1.4, NONE fck_internal.css, 1.4,
	NONE fck_showtableborders_gecko.css, 1.2, NONE
Message-ID: <20080209123339.29CB110FE1A@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/css

Removed Files:
	fck_editorarea.css fck_internal.css 
	fck_showtableborders_gecko.css 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_showtableborders_gecko.css DELETED ---

--- fck_editorarea.css DELETED ---

--- fck_internal.css DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor
	fckblank.html, 1.2, NONE fckdebug.html, 1.3,
	NONE fckdialog.html, 1.3, NONE fckeditor.html, 1.4,
	NONE fckeditor.original.html, 1.4, NONE
Message-ID: <20080209123340.565C610FE28@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor

Removed Files:
	fckblank.html fckdebug.html fckdialog.html fckeditor.html 
	fckeditor.original.html 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fckblank.html DELETED ---

--- fckdialog.html DELETED ---

--- fckeditor.original.html DELETED ---

--- fckeditor.html DELETED ---

--- fckdebug.html DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:39 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:39 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/common/images
	locked.gif, 1.1, NONE reset.gif, 1.1, NONE unlocked.gif, 1.1, NONE
Message-ID: <20080209123339.2C3C910FE1B@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/common/images
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/common/images

Removed Files:
	locked.gif reset.gif unlocked.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- reset.gif DELETED ---

--- locked.gif DELETED ---

--- unlocked.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/upload/php
	config.php, 1.2, NONE upload.php, 1.1, NONE util.php, 1.1, NONE
Message-ID: <20080209123340.6FDBB10FE2E@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/upload/php
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/filemanager/upload/php

Removed Files:
	config.php upload.php util.php 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- config.php DELETED ---

--- util.php DELETED ---

--- upload.php DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/images
	anchor.gif, 1.1, NONE arrow_ltr.gif, 1.1, NONE arrow_rtl.gif,
	1.1, NONE spacer.gif, 1.1, NONE
Message-ID: <20080209123340.8DC9110FE6C@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/images
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/images

Removed Files:
	anchor.gif arrow_ltr.gif arrow_rtl.gif spacer.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- arrow_rtl.gif DELETED ---

--- spacer.gif DELETED ---

--- anchor.gif DELETED ---

--- arrow_ltr.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:39 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/common
	fck_dialog_common.css, 1.5, NONE fck_dialog_common.js, 1.3,
	NONE fcknumericfield.htc, 1.1, NONE moz-bindings.xml, 1.2, NONE
Message-ID: <20080209123339.2DC9B10FE1C@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/common
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/common

Removed Files:
	fck_dialog_common.css fck_dialog_common.js fcknumericfield.htc 
	moz-bindings.xml 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- moz-bindings.xml DELETED ---

--- fck_dialog_common.js DELETED ---

--- fck_dialog_common.css DELETED ---

--- fcknumericfield.htc DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash
	fck_flash.js, 1.2, NONE fck_flash_preview.html, 1.1, NONE
Message-ID: <20080209123340.2C0CF10FE1F@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_flash

Removed Files:
	fck_flash.js fck_flash_preview.html 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_flash_preview.html DELETED ---

--- fck_flash.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_select
	fck_select.js, 1.3, NONE
Message-ID: <20080209123340.37BAA10FE23@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_select
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_select

Removed Files:
	fck_select.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_select.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image
	fck_image.js, 1.5, NONE fck_image_preview.html, 1.2, NONE
Message-ID: <20080209123340.3351010FE21@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_image

Removed Files:
	fck_image.js fck_image_preview.html 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_image.js DELETED ---

--- fck_image_preview.html DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts
	spellchecker.cfm, 1.1, NONE spellchecker.php, 1.1,
	NONE spellchecker.pl, 1.1, NONE
Message-ID: <20080209123340.3BFC210FE24@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_spellerpages/spellerpages/server-scripts

Removed Files:
	spellchecker.cfm spellchecker.php spellchecker.pl 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- spellchecker.pl DELETED ---

--- spellchecker.php DELETED ---

--- spellchecker.cfm DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:39 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:39 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_about
	lgpl.html, 1.1, NONE logo_fckeditor.gif, 1.1,
	NONE logo_fredck.gif, 1.1, NONE
Message-ID: <20080209123340.3DA4910FE25@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_about
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_about

Removed Files:
	lgpl.html logo_fckeditor.gif logo_fredck.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- logo_fckeditor.gif DELETED ---

--- lgpl.html DELETED ---

--- logo_fredck.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:39 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:39 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops
	fck_document_preview.html, 1.2, NONE
Message-ID: <20080209123340.28CAC10FE1E@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_docprops

Removed Files:
	fck_document_preview.html 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_document_preview.html DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_universalkey
	00.gif, 1.1, NONE data.js, 1.2, NONE diacritic.js, 1.2,
	NONE dialogue.js, 1.2, NONE fck_universalkey.css, 1.2,
	NONE keyboard_layout.gif, 1.1, NONE multihexa.js, 1.3, NONE
Message-ID: <20080209123340.533F110FE27@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_universalkey
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_universalkey

Removed Files:
	00.gif data.js diacritic.js dialogue.js fck_universalkey.css 
	keyboard_layout.gif multihexa.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_universalkey.css DELETED ---

--- multihexa.js DELETED ---

--- diacritic.js DELETED ---

--- dialogue.js DELETED ---

--- data.js DELETED ---

--- 00.gif DELETED ---

--- keyboard_layout.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_link
	fck_link.js, 1.4, NONE
Message-ID: <20080209123340.2EC5F10FE20@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_link
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_link

Removed Files:
	fck_link.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_link.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_template/images
	template1.gif, 1.1, NONE template2.gif, 1.1,
	NONE template3.gif, 1.1, NONE
Message-ID: <20080209123340.5319910FE26@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_template/images
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_template/images

Removed Files:
	template1.gif template2.gif template3.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- template3.gif DELETED ---

--- template2.gif DELETED ---

--- template1.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/connectors/php
	basexml.php, 1.2, NONE commands.php, 1.1, NONE config.php, 1.1,
	NONE connector.php, 1.2, NONE io.php, 1.1, NONE util.php, 1.1, NONE
Message-ID: <20080209123340.624A110FE2A@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/connectors/php
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/filemanager/browser/default/connectors/php

Removed Files:
	basexml.php commands.php config.php connector.php io.php 
	util.php 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- connector.php DELETED ---

--- commands.php DELETED ---

--- basexml.php DELETED ---

--- config.php DELETED ---

--- util.php DELETED ---

--- io.php DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
 Geeklog-1.x/public_html/fckeditor/editor/images/smiley/fun aiua.gif, 1.1,
 NONE ak.gif, 1.1, NONE alien.gif, 1.1, NONE alien2.gif, 1.1, NONE angry.gif,
 1.1, NONE angry1.gif, 1.1, NONE apophys.gif, 1.1, NONE assjani.gif, 1.1,
 NONE asthanos.gif, 1.1, NONE bazuzeus.gif, 1.1, NONE beaute.gif, 1.1,
 NONE bigsmile.gif, 1.1, NONE blush.gif, 1.1, NONE boid.gif, 1.1,
 NONE bonk.gif, 1.1, NONE bored.gif, 1.1, NONE borg.gif, 1.1, NONE capo.gif,
 1.1, NONE confused.gif, 1.1, NONE cool.gif, 1.1, NONE crazy.gif, 1.1,
 NONE cwm14.gif, 1.1, NONE demis_roussos.gif, 1.1, NONE devil.gif, 1.1,
 NONE devil2.gif, 1.1, NONE double0smile.gif, 1.1, NONE eek3.gif, 1.1,
 NONE eltaf.gif, 1.1, NONE gele.gif, 1.1, NONE halm.gif, 1.1, NONE happy.gif,
 1.1, NONE icon12.gif, 1.1, NONE icon23.gif, 1.1, NONE icon26.gif, 1.1,
 NONE icon_angel.gif, 1.1, NONE icon_bandit.gif, 1.1, NONE icon_bravo.gif,
 1.1, NONE icon_clown.gif, 1.1, NONE jesors.gif, 1.1, NONE jesors1.gif, 1.1,
 NONE lol3.gif, 1.1, NONE love.gif, 1.1, NONE mad.gif, 1.1,
 NONE megaphone.gif, 1.1, NONE mmm.gif, 1.1, NONE music.gif, 1.1,
 NONE  notify.gif, 1.1, NONE nuts.gif, 1.1, NONE obanon.gif, 1.1,
 NONE ouaip.gif, 1.1, NONE pleure.gif, 1.1, NONE plugin.gif, 1.1,
 NONE question.gif, 1.1, NONE question2.gif, 1.1, NONE rasta2.gif, 1.1,
 NONE rastapop.gif, 1.1, NONE rosebud.gif, 1.1, NONE sad.gif, 1.1,
 NONE sad2.gif, 1.1, NONE shocked.gif, 1.1, NONE sick.gif, 1.1,
 NONE sick2.gif, 1.1, NONE slaap.gif, 1.1, NONE sleep.gif, 1.1,
 NONE smile.gif, 1.1, NONE smiley_peur.gif, 1.1, NONE sors.gif, 1.1,
 NONE sovxx.gif, 1.1, NONE spamafote.gif, 1.1, NONE tap67.gif, 1.1,
 NONE thumbdown.gif, 1.1, NONE thumbup.gif, 1.1, NONE tigi.gif, 1.1,
 NONE toad666.gif, 1.1, NONE tongue.gif, 1.1, NONE tuffgong.gif, 1.1,
 NONE urgeman.gif, 1.1, NONE vanadium.gif, 1.1, NONE wink.gif, 1.1,
 NONE worship.gif, 1.1, NONE wouaf.gif, 1.1, NONE wow.gif, 1.1,
 NONE xp1700.gif, 1.1, NONE yltype.gif, 1.1, NONE yopyopyop.gif, 1.1,
 NONE youpi.gif, 1.1, NONE zoor.gif, 1.1, NONE
Message-ID: <20080209123340.B81CA10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/images/smiley/fun
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/images/smiley/fun

Removed Files:
	aiua.gif ak.gif alien.gif alien2.gif angry.gif angry1.gif 
	apophys.gif assjani.gif asthanos.gif bazuzeus.gif beaute.gif 
	bigsmile.gif blush.gif boid.gif bonk.gif bored.gif borg.gif 
	capo.gif confused.gif cool.gif crazy.gif cwm14.gif 
	demis_roussos.gif devil.gif devil2.gif double0smile.gif 
	eek3.gif eltaf.gif gele.gif halm.gif happy.gif icon12.gif 
	icon23.gif icon26.gif icon_angel.gif icon_bandit.gif 
	icon_bravo.gif icon_clown.gif jesors.gif jesors1.gif lol3.gif 
	love.gif mad.gif megaphone.gif mmm.gif music.gif notify.gif 
	nuts.gif obanon.gif ouaip.gif pleure.gif plugin.gif 
	question.gif question2.gif rasta2.gif rastapop.gif rosebud.gif 
	sad.gif sad2.gif shocked.gif sick.gif sick2.gif slaap.gif 
	sleep.gif smile.gif smiley_peur.gif sors.gif sovxx.gif 
	spamafote.gif tap67.gif thumbdown.gif thumbup.gif tigi.gif 
	toad666.gif tongue.gif tuffgong.gif urgeman.gif vanadium.gif 
	wink.gif worship.gif wouaf.gif wow.gif xp1700.gif yltype.gif 
	yopyopyop.gif youpi.gif zoor.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- notify.gif DELETED ---

--- assjani.gif DELETED ---

--- toad666.gif DELETED ---

--- worship.gif DELETED ---

--- sick.gif DELETED ---

--- vanadium.gif DELETED ---

--- icon_bravo.gif DELETED ---

--- sick2.gif DELETED ---

--- apophys.gif DELETED ---

--- bonk.gif DELETED ---

--- demis_roussos.gif DELETED ---

--- mmm.gif DELETED ---

--- ak.gif DELETED ---

--- icon_clown.gif DELETED ---

--- icon23.gif DELETED ---

--- angry1.gif DELETED ---

--- question2.gif DELETED ---

--- borg.gif DELETED ---

--- capo.gif DELETED ---

--- thumbdown.gif DELETED ---

--- zoor.gif DELETED ---

--- cool.gif DELETED ---

--- cwm14.gif DELETED ---

--- jesors.gif DELETED ---

--- wouaf.gif DELETED ---

--- bigsmile.gif DELETED ---

--- sad.gif DELETED ---

--- eltaf.gif DELETED ---

--- happy.gif DELETED ---

--- devil.gif DELETED ---

--- lol3.gif DELETED ---

--- eek3.gif DELETED ---

--- shocked.gif DELETED ---

--- icon_angel.gif DELETED ---

--- slaap.gif DELETED ---

--- angry.gif DELETED ---

--- wink.gif DELETED ---

--- sors.gif DELETED ---

--- tuffgong.gif DELETED ---

--- rasta2.gif DELETED ---

--- sovxx.gif DELETED ---

--- icon26.gif DELETED ---

--- rastapop.gif DELETED ---

--- confused.gif DELETED ---

--- asthanos.gif DELETED ---

--- love.gif DELETED ---

--- gele.gif DELETED ---

--- halm.gif DELETED ---

--- beaute.gif DELETED ---

--- sleep.gif DELETED ---

--- yopyopyop.gif DELETED ---

--- bored.gif DELETED ---

--- obanon.gif DELETED ---

--- mad.gif DELETED ---

--- music.gif DELETED ---

--- devil2.gif DELETED ---

--- rosebud.gif DELETED ---

--- double0smile.gif DELETED ---

--- smiley_peur.gif DELETED ---

--- xp1700.gif DELETED ---

--- bazuzeus.gif DELETED ---

--- icon12.gif DELETED ---

--- pleure.gif DELETED ---

--- aiua.gif DELETED ---

--- blush.gif DELETED ---

--- jesors1.gif DELETED ---

--- alien.gif DELETED ---

--- yltype.gif DELETED ---

--- smile.gif DELETED ---

--- boid.gif DELETED ---

--- megaphone.gif DELETED ---

--- sad2.gif DELETED ---

--- icon_bandit.gif DELETED ---

--- question.gif DELETED ---

--- tigi.gif DELETED ---

--- urgeman.gif DELETED ---

--- alien2.gif DELETED ---

--- wow.gif DELETED ---

--- thumbup.gif DELETED ---

--- youpi.gif DELETED ---

--- spamafote.gif DELETED ---

--- plugin.gif DELETED ---

--- tongue.gif DELETED ---

--- tap67.gif DELETED ---

--- crazy.gif DELETED ---

--- nuts.gif DELETED ---

--- ouaip.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images/icons/32
	ai.gif, 1.1, NONE avi.gif, 1.1, NONE bmp.gif, 1.1, NONE cs.gif,
	1.1, NONE default.icon.gif, 1.1, NONE dll.gif, 1.1,
	NONE doc.gif, 1.1, NONE exe.gif, 1.1, NONE fla.gif, 1.1,
	NONE gif.gif, 1.1, NONE htm.gif, 1.1, NONE html.gif, 1.1,
	NONE jpg.gif, 1.1, NONE js.gif, 1.1, NONE mdb.gif, 1.1,
	NONE mp3.gif, 1.1, NONE pdf.gif, 1.1, NONE ppt.gif, 1.1,
	NONE rdp.gif, 1.1, NONE swf.gif, 1.1, NONE swt.gif, 1.1,
	NONE txt.gif, 1.1, NONE vsd.gif, 1.1, NONE xls.gif, 1.1,
	NONE xml.gif, 1.1, NONE zip.gif, 1.1, NONE
Message-ID: <20080209123340.675EA10FE2C@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images/icons/32
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/filemanager/browser/default/images/icons/32

Removed Files:
	ai.gif avi.gif bmp.gif cs.gif default.icon.gif dll.gif doc.gif 
	exe.gif fla.gif gif.gif htm.gif html.gif jpg.gif js.gif 
	mdb.gif mp3.gif pdf.gif ppt.gif rdp.gif swf.gif swt.gif 
	txt.gif vsd.gif xls.gif xml.gif zip.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- default.icon.gif DELETED ---

--- mdb.gif DELETED ---

--- bmp.gif DELETED ---

--- exe.gif DELETED ---

--- cs.gif DELETED ---

--- ai.gif DELETED ---

--- html.gif DELETED ---

--- mp3.gif DELETED ---

--- htm.gif DELETED ---

--- dll.gif DELETED ---

--- gif.gif DELETED ---

--- zip.gif DELETED ---

--- fla.gif DELETED ---

--- js.gif DELETED ---

--- xls.gif DELETED ---

--- swf.gif DELETED ---

--- swt.gif DELETED ---

--- xml.gif DELETED ---

--- avi.gif DELETED ---

--- txt.gif DELETED ---

--- doc.gif DELETED ---

--- ppt.gif DELETED ---

--- vsd.gif DELETED ---

--- rdp.gif DELETED ---

--- pdf.gif DELETED ---

--- jpg.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images
	ButtonArrow.gif, 1.1, NONE Folder.gif, 1.1, NONE Folder32.gif,
	1.1, NONE FolderOpened.gif, 1.1, NONE FolderOpened32.gif, 1.1,
	NONE FolderUp.gif, 1.1, NONE spacer.gif, 1.1, NONE
Message-ID: <20080209123340.625F910FE2B@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/filemanager/browser/default/images

Removed Files:
	ButtonArrow.gif Folder.gif Folder32.gif FolderOpened.gif 
	FolderOpened32.gif FolderUp.gif spacer.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- spacer.gif DELETED ---

--- FolderUp.gif DELETED ---

--- FolderOpened.gif DELETED ---

--- Folder32.gif DELETED ---

--- FolderOpened32.gif DELETED ---

--- ButtonArrow.gif DELETED ---

--- Folder.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images/icons
	ai.gif, 1.1, NONE avi.gif, 1.1, NONE bmp.gif, 1.1, NONE cs.gif,
	1.1, NONE default.icon.gif, 1.1, NONE dll.gif, 1.1,
	NONE doc.gif, 1.1, NONE exe.gif, 1.1, NONE fla.gif, 1.1,
	NONE gif.gif, 1.1, NONE htm.gif, 1.1, NONE html.gif, 1.1,
	NONE jpg.gif, 1.1, NONE js.gif, 1.1, NONE mdb.gif, 1.1,
	NONE mp3.gif, 1.1, NONE pdf.gif, 1.1, NONE ppt.gif, 1.1,
	NONE rdp.gif, 1.1, NONE swf.gif, 1.1, NONE swt.gif, 1.1,
	NONE txt.gif, 1.1, NONE vsd.gif, 1.1, NONE xls.gif, 1.1,
	NONE xml.gif, 1.1, NONE zip.gif, 1.1, NONE
Message-ID: <20080209123340.6F35E10FE6A@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images/icons
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/filemanager/browser/default/images/icons

Removed Files:
	ai.gif avi.gif bmp.gif cs.gif default.icon.gif dll.gif doc.gif 
	exe.gif fla.gif gif.gif htm.gif html.gif jpg.gif js.gif 
	mdb.gif mp3.gif pdf.gif ppt.gif rdp.gif swf.gif swt.gif 
	txt.gif vsd.gif xls.gif xml.gif zip.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- default.icon.gif DELETED ---

--- mdb.gif DELETED ---

--- bmp.gif DELETED ---

--- exe.gif DELETED ---

--- cs.gif DELETED ---

--- ai.gif DELETED ---

--- html.gif DELETED ---

--- mp3.gif DELETED ---

--- htm.gif DELETED ---

--- dll.gif DELETED ---

--- gif.gif DELETED ---

--- zip.gif DELETED ---

--- fla.gif DELETED ---

--- js.gif DELETED ---

--- xls.gif DELETED ---

--- swf.gif DELETED ---

--- swt.gif DELETED ---

--- xml.gif DELETED ---

--- avi.gif DELETED ---

--- txt.gif DELETED ---

--- doc.gif DELETED ---

--- ppt.gif DELETED ---

--- vsd.gif DELETED ---

--- rdp.gif DELETED ---

--- pdf.gif DELETED ---

--- jpg.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js
	common.js, 1.2, NONE fckxml.js, 1.1, NONE
Message-ID: <20080209123340.6F07F10FE2D@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/filemanager/browser/default/js

Removed Files:
	common.js fckxml.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- common.js DELETED ---

--- fckxml.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/upload
	test.html, 1.1, NONE
Message-ID: <20080209123340.83F6E10FE6B@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/upload
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/filemanager/upload

Removed Files:
	test.html 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- test.html DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/lang
	_getfontformat.html, 1.1, NONE _translationstatus.txt, 1.5,
	NONE ar.js, 1.4, NONE bg.js, 1.4, NONE bn.js, 1.1, NONE bs.js,
	1.4, NONE ca.js, 1.5, NONE cs.js, 1.4, NONE da.js, 1.4,
	NONE de.js, 1.4, NONE el.js, 1.5, NONE en-au.js, 1.4,
	NONE en-ca.js, 1.1, NONE en-uk.js, 1.4, NONE en.js, 1.4,
	NONE eo.js, 1.4, NONE es.js, 1.5, NONE et.js, 1.4, NONE eu.js,
	1.4, NONE fa.js, 1.4, NONE fi.js, 1.4, NONE fo.js, 1.2,
	NONE fr.js, 1.5, NONE gl.js, 1.4, NONE he.js, 1.4, NONE hi.js,
	1.1, NONE hr.js, 1.4, NONE hu.js, 1.4, NONE it.js, 1.4,
	NONE ja.js, 1.4, NONE km.js, 1.1, NONE ko.js, 1.4, NONE lt.js,
	1.4, NONE lv.js, 1.1, NONE mn.js, 1.2, NONE ms.js, 1.2,
	NONE nl.js, 1.4, NONE no.js, 1.4, NONE pl.js, 1.4,
	NONE pt-br.js, 1.5, NONE pt.js, 1.5, NONE ro.js, 1.4,
	NONE ru.js, 1.4, NONE sk.js, 1.4, NONE sl.js, 1.4,
	NONE sr-latn.js, 1.4, NONE sr.js, 1.4, NONE sv.js, 1.4,
	NONE th.js, 1.4, NONE tr.js, 1.4, NONE uk.js, 1.4, NONE vi.js,
	1.2, NONE zh-cn.js, 1.4, NONE zh.js, 1.4, NONE
Message-ID: <20080209123341.4972210FE72@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/lang
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/lang

Removed Files:
	_getfontformat.html _translationstatus.txt ar.js bg.js bn.js 
	bs.js ca.js cs.js da.js de.js el.js en-au.js en-ca.js en-uk.js 
	en.js eo.js es.js et.js eu.js fa.js fi.js fo.js fr.js gl.js 
	he.js hi.js hr.js hu.js it.js ja.js km.js ko.js lt.js lv.js 
	mn.js ms.js nl.js no.js pl.js pt-br.js pt.js ro.js ru.js sk.js 
	sl.js sr-latn.js sr.js sv.js th.js tr.js uk.js vi.js zh-cn.js 
	zh.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- ar.js DELETED ---

--- th.js DELETED ---

--- lt.js DELETED ---

--- km.js DELETED ---

--- ru.js DELETED ---

--- pt-br.js DELETED ---

--- ms.js DELETED ---

--- zh-cn.js DELETED ---

--- _getfontformat.html DELETED ---

--- fr.js DELETED ---

--- ro.js DELETED ---

--- pl.js DELETED ---

--- sl.js DELETED ---

--- it.js DELETED ---

--- cs.js DELETED ---

--- ko.js DELETED ---

--- hu.js DELETED ---

--- en-uk.js DELETED ---

--- eu.js DELETED ---

--- de.js DELETED ---

--- ca.js DELETED ---

--- lv.js DELETED ---

--- bg.js DELETED ---

--- fi.js DELETED ---

--- sr-latn.js DELETED ---

--- mn.js DELETED ---

--- fo.js DELETED ---

--- hi.js DELETED ---

--- uk.js DELETED ---

--- sr.js DELETED ---

--- nl.js DELETED ---

--- no.js DELETED ---

--- _translationstatus.txt DELETED ---

--- eo.js DELETED ---

--- hr.js DELETED ---

--- en-au.js DELETED ---

--- da.js DELETED ---

--- vi.js DELETED ---

--- tr.js DELETED ---

--- en-ca.js DELETED ---

--- el.js DELETED ---

--- zh.js DELETED ---

--- bn.js DELETED ---

--- ja.js DELETED ---

--- sk.js DELETED ---

--- en.js DELETED ---

--- pt.js DELETED ---

--- et.js DELETED ---

--- he.js DELETED ---

--- gl.js DELETED ---

--- es.js DELETED ---

--- fa.js DELETED ---

--- bs.js DELETED ---

--- sv.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/images/smiley/msn
	angel_smile.gif, 1.1, NONE angry_smile.gif, 1.1,
	NONE broken_heart.gif, 1.1, NONE cake.gif, 1.1,
	NONE confused_smile.gif, 1.1, NONE cry_smile.gif, 1.1,
	NONE devil_smile.gif, 1.1, NONE embaressed_smile.gif, 1.1,
	NONE envelope.gif, 1.1, NONE heart.gif, 1.1, NONE kiss.gif,
	1.1, NONE lightbulb.gif, 1.1, NONE omg_smile.gif, 1.1,
	NONE regular_smile.gif, 1.1, NONE sad_smile.gif, 1.1,
	NONE shades_smile.gif, 1.1, NONE teeth_smile.gif, 1.1,
	NONE thumbs_down.gif, 1.1, NONE thumbs_up.gif, 1.1,
	NONE tounge_smile.gif, 1.1, NONE whatchutalkingabout_smile.gif,
	1.1, NONE wink_smile.gif, 1.1, NONE
Message-ID: <20080209123340.D06F810FE6E@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/images/smiley/msn
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/images/smiley/msn

Removed Files:
	angel_smile.gif angry_smile.gif broken_heart.gif cake.gif 
	confused_smile.gif cry_smile.gif devil_smile.gif 
	embaressed_smile.gif envelope.gif heart.gif kiss.gif 
	lightbulb.gif omg_smile.gif regular_smile.gif sad_smile.gif 
	shades_smile.gif teeth_smile.gif thumbs_down.gif thumbs_up.gif 
	tounge_smile.gif whatchutalkingabout_smile.gif wink_smile.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- thumbs_down.gif DELETED ---

--- shades_smile.gif DELETED ---

--- regular_smile.gif DELETED ---

--- heart.gif DELETED ---

--- tounge_smile.gif DELETED ---

--- devil_smile.gif DELETED ---

--- whatchutalkingabout_smile.gif DELETED ---

--- teeth_smile.gif DELETED ---

--- omg_smile.gif DELETED ---

--- thumbs_up.gif DELETED ---

--- lightbulb.gif DELETED ---

--- embaressed_smile.gif DELETED ---

--- broken_heart.gif DELETED ---

--- confused_smile.gif DELETED ---

--- kiss.gif DELETED ---

--- cry_smile.gif DELETED ---

--- angry_smile.gif DELETED ---

--- cake.gif DELETED ---

--- angel_smile.gif DELETED ---

--- wink_smile.gif DELETED ---

--- sad_smile.gif DELETED ---

--- envelope.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/autogrow
	fckplugin.js, 1.2, NONE
Message-ID: <20080209123341.589B610FE74@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/autogrow
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/plugins/autogrow

Removed Files:
	fckplugin.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fckplugin.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/js
	fckeditorcode_gecko.js, 1.2, NONE fckeditorcode_ie.js, 1.2, NONE
Message-ID: <20080209123341.02B3510FE70@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/js
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/js

Removed Files:
	fckeditorcode_gecko.js fckeditorcode_ie.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fckeditorcode_gecko.js DELETED ---

--- fckeditorcode_ie.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder
	fck_placeholder.html, 1.3, NONE fckplugin.js, 1.3,
	NONE placeholder.gif, 1.2, NONE
Message-ID: <20080209123341.73A3F10FE76@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/plugins/placeholder

Removed Files:
	fck_placeholder.html fckplugin.js placeholder.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- placeholder.gif DELETED ---

--- fckplugin.js DELETED ---

--- fck_placeholder.html DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/lang
	de.js, 1.2, NONE en.js, 1.3, NONE fr.js, 1.3, NONE it.js, 1.3,
	NONE pl.js, 1.1, NONE
Message-ID: <20080209123341.8439110FE78@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/lang
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/plugins/placeholder/lang

Removed Files:
	de.js en.js fr.js it.js pl.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- en.js DELETED ---

--- pl.js DELETED ---

--- de.js DELETED ---

--- fr.js DELETED ---

--- it.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/tablecommands
	fckplugin.js, 1.2, NONE
Message-ID: <20080209123341.A180310FE7A@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/tablecommands
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/plugins/tablecommands

Removed Files:
	fckplugin.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fckplugin.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/skins
	_fckviewstrips.html, 1.1, NONE
Message-ID: <20080209123341.B163110FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/skins

Removed Files:
	_fckviewstrips.html 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- _fckviewstrips.html DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/skins/default
	fck_dialog.css, 1.2, NONE fck_editor.css, 1.4,
	NONE fck_strip.gif, 1.1, NONE
Message-ID: <20080209123341.C082910FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/default
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/skins/default

Removed Files:
	fck_dialog.css fck_editor.css fck_strip.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_dialog.css DELETED ---

--- fck_editor.css DELETED ---

--- fck_strip.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/default/images
	toolbar.arrowright.gif, 1.1, NONE toolbar.buttonarrow.gif, 1.1,
	NONE toolbar.collapse.gif, 1.1, NONE toolbar.end.gif, 1.1,
	NONE toolbar.expand.gif, 1.1, NONE toolbar.separator.gif, 1.1,
	NONE toolbar.start.gif, 1.2, NONE
Message-ID: <20080209123341.D130C10FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/default/images
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/skins/default/images

Removed Files:
	toolbar.arrowright.gif toolbar.buttonarrow.gif 
	toolbar.collapse.gif toolbar.end.gif toolbar.expand.gif 
	toolbar.separator.gif toolbar.start.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- toolbar.expand.gif DELETED ---

--- toolbar.end.gif DELETED ---

--- toolbar.separator.gif DELETED ---

--- toolbar.collapse.gif DELETED ---

--- toolbar.start.gif DELETED ---

--- toolbar.arrowright.gif DELETED ---

--- toolbar.buttonarrow.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/office2003
	fck_dialog.css, 1.2, NONE fck_editor.css, 1.4,
	NONE fck_strip.gif, 1.1, NONE
Message-ID: <20080209123341.E147610FE17@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/office2003
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/skins/office2003

Removed Files:
	fck_dialog.css fck_editor.css fck_strip.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_dialog.css DELETED ---

--- fck_editor.css DELETED ---

--- fck_strip.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/office2003/images
	toolbar.arrowright.gif, 1.1, NONE toolbar.bg.gif, 1.1,
	NONE toolbar.buttonarrow.gif, 1.1, NONE toolbar.collapse.gif,
	1.1, NONE toolbar.end.gif, 1.1, NONE toolbar.expand.gif, 1.1,
	NONE toolbar.separator.gif, 1.1, NONE toolbar.start.gif, 1.2, NONE
Message-ID: <20080209123341.F21AB10FE18@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/office2003/images
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/skins/office2003/images

Removed Files:
	toolbar.arrowright.gif toolbar.bg.gif toolbar.buttonarrow.gif 
	toolbar.collapse.gif toolbar.end.gif toolbar.expand.gif 
	toolbar.separator.gif toolbar.start.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- toolbar.bg.gif DELETED ---

--- toolbar.expand.gif DELETED ---

--- toolbar.end.gif DELETED ---

--- toolbar.separator.gif DELETED ---

--- toolbar.collapse.gif DELETED ---

--- toolbar.start.gif DELETED ---

--- toolbar.arrowright.gif DELETED ---

--- toolbar.buttonarrow.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:41 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:41 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/simplecommands
	fckplugin.js, 1.1, NONE
Message-ID: <20080209123341.92EDD10FE79@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/simplecommands
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/plugins/simplecommands

Removed Files:
	fckplugin.js 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fckplugin.js DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:42 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:42 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/skins/silver
	fck_dialog.css, 1.2, NONE fck_editor.css, 1.4,
	NONE fck_strip.gif, 1.1, NONE
Message-ID: <20080209123342.0D8D210FE19@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/silver
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/skins/silver

Removed Files:
	fck_dialog.css fck_editor.css fck_strip.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- fck_dialog.css DELETED ---

--- fck_editor.css DELETED ---

--- fck_strip.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:42 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:42 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/silver/images
	toolbar.arrowright.gif, 1.1, NONE toolbar.buttonarrow.gif, 1.1,
	NONE toolbar.buttonbg.gif, 1.2, NONE toolbar.collapse.gif, 1.1,
	NONE toolbar.end.gif, 1.1, NONE toolbar.expand.gif, 1.1,
	NONE toolbar.separator.gif, 1.1, NONE toolbar.start.gif, 1.2, NONE
Message-ID: <20080209123342.1EAED10FE1A@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/silver/images
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/skins/silver/images

Removed Files:
	toolbar.arrowright.gif toolbar.buttonarrow.gif 
	toolbar.buttonbg.gif toolbar.collapse.gif toolbar.end.gif 
	toolbar.expand.gif toolbar.separator.gif toolbar.start.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- toolbar.expand.gif DELETED ---

--- toolbar.end.gif DELETED ---

--- toolbar.separator.gif DELETED ---

--- toolbar.collapse.gif DELETED ---

--- toolbar.start.gif DELETED ---

--- toolbar.buttonbg.gif DELETED ---

--- toolbar.arrowright.gif DELETED ---

--- toolbar.buttonarrow.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:33:40 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:33:40 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_template/images
	template1.gif, 1.1, NONE template2.gif, 1.1,
	NONE template3.gif, 1.1, NONE
Message-ID: <20080209123340.5319910FE26@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_template/images
In directory qs1489.pair.com:/tmp/cvs-serv24797/editor/dialog/fck_template/images

Removed Files:
	template1.gif template2.gif template3.gif 
Log Message:
Removed older FCKEditor files in prep for upgrade to v2.5.1 of FCKeditor

--- template3.gif DELETED ---

--- template2.gif DELETED ---

--- template1.gif DELETED ---



From blaine at qs1489.pair.com  Sat Feb  9 07:35:19 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:35:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dtd - New
	directory
Message-ID: <20080209123519.898D910FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dtd
In directory qs1489.pair.com:/tmp/cvs-serv25369/dtd

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dtd added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:37:29 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:37:29 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors
	- New directory
Message-ID: <20080209123729.702FF10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors
In directory qs1489.pair.com:/tmp/cvs-serv25540/connectors

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:38:24 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:38:24 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/aspx
	- New directory
Message-ID: <20080209123824.7159310FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/aspx
In directory qs1489.pair.com:/tmp/cvs-serv25635/aspx

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/aspx added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:38:24 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:38:24 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/lasso
	- New directory
Message-ID: <20080209123824.8C70010FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/lasso
In directory qs1489.pair.com:/tmp/cvs-serv25635/lasso

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/lasso added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:38:24 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:38:24 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm
	- New directory
Message-ID: <20080209123824.800F510FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm
In directory qs1489.pair.com:/tmp/cvs-serv25635/cfm

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:38:24 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:38:24 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php
	- New directory
Message-ID: <20080209123824.A7C4310FE18@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php
In directory qs1489.pair.com:/tmp/cvs-serv25635/php

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:38:24 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:38:24 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl
	- New directory
Message-ID: <20080209123824.9A98110FE17@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl
In directory qs1489.pair.com:/tmp/cvs-serv25635/perl

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:38:24 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:38:24 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py
	- New directory
Message-ID: <20080209123824.B577410FE19@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py
In directory qs1489.pair.com:/tmp/cvs-serv25635/py

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:38:24 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:38:24 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp
	- New directory
Message-ID: <20080209123824.63B8510FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp
In directory qs1489.pair.com:/tmp/cvs-serv25635/asp

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:39:39 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:39:39 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode - New
	directory
Message-ID: <20080209123939.076C710FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode
In directory qs1489.pair.com:/tmp/cvs-serv25804/bbcode

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:39:39 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:39:39 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/dragresizetable
	- New directory
Message-ID: <20080209123939.155CA10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/dragresizetable
In directory qs1489.pair.com:/tmp/cvs-serv25804/dragresizetable

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/dragresizetable added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:39:39 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:39:39 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/dragresizetable
	- New directory
Message-ID: <20080209123939.155CA10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/dragresizetable
In directory qs1489.pair.com:/tmp/cvs-serv25804/dragresizetable

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/dragresizetable added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:49:39 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:49:39 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode/_sample
	- New directory
Message-ID: <20080209124939.949F310FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode/_sample
In directory qs1489.pair.com:/tmp/cvs-serv26155/_sample

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode/_sample added to the repository




From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/common
	fck_dialog_common.css, 1.6, 1.7 fck_dialog_common.js, 1.4, 1.5
Message-ID: <20080209125401.AE5BE10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/common
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/common

Added Files:
	fck_dialog_common.css fck_dialog_common.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_dialog_common.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_dialog_common.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the CSS file used for interface details in some dialog
 * windows.
 */

.ImagePreviewArea
{
	border: #000000 1px solid;
	overflow: auto;
	width: 100%;
	height: 170px;
	background-color: #ffffff;
}

.FlashPreviewArea
{
	border: #000000 1px solid;
	padding: 5px;
	overflow: auto;
	width: 100%;
	height: 170px;
	background-color: #ffffff;
}

.BtnReset
{
	float: left;
	background-position: center center;
	background-image: url(images/reset.gif);
	width: 16px;
	height: 16px;
	background-repeat: no-repeat;
	border: 1px none;
	font-size: 1px ;
}

.BtnLocked, .BtnUnlocked
{
	float: left;
	background-position: center center;
	background-image: url(images/locked.gif);
	width: 16px;
	height: 16px;
	background-repeat: no-repeat;
	border: none 1px;
	font-size: 1px ;
}

.BtnUnlocked
{
	background-image: url(images/unlocked.gif);
}

.BtnOver
{
	border: outset 1px;
	cursor: pointer;
	cursor: hand;
}



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/css/behaviors
	disablehandles.htc, 1.2, 1.3 showtableborders.htc, 1.4, 1.5
Message-ID: <20080209125401.B534A10FE17@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css/behaviors
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/css/behaviors

Added Files:
	disablehandles.htc showtableborders.htc 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: disablehandles.htc ---
<public:component lightweight="true">

<script language="javascript">

function CancelEvent()
{
	return false ;
}

this.onresizestart = CancelEvent ;
this.onbeforeeditfocus = CancelEvent ;

</script>

</public:component>

--- NEW FILE: showtableborders.htc ---
<public:component lightweight="true">

<public:attach event="oncontentready" onevent="ShowBorders()" />
<public:attach event="onpropertychange" onevent="OnPropertyChange()" />

<script language="javascript">

var oClassRegex = /\s*FCK__ShowTableBorders/ ;

function ShowBorders()
{
	if ( this.border == 0 )
	{
		if ( !oClassRegex.test( this.className ) )
			this.className += ' FCK__ShowTableBorders' ;
	}
	else
	{
		if ( oClassRegex.test( this.className ) )
		{
			this.className = this.className.replace( oClassRegex, '' ) ;
			if ( this.className.length == 0 )
				this.removeAttribute( 'className', 0 ) ;
		}
	}
}

function OnPropertyChange()
{
	if ( event.propertyName == 'border' || event.propertyName == 'className' )
		ShowBorders.call(this) ;
}

</script>

</public:component>



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/_source
	fckconstants.js, 1.2, 1.3 fckeditorapi.js, 1.3,
	1.4 fckjscoreextensions.js, 1.2, 1.3 fckscriptloader.js, NONE, 1.1
Message-ID: <20080209125401.B3C5D10FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/_source

Added Files:
	fckconstants.js fckeditorapi.js fckjscoreextensions.js 
	fckscriptloader.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckscriptloader.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckjscoreextensions.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckeditorapi.js ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Create the FCKeditorAPI object that is available as a global object in
 * the page where the editor is placed in.
 */

var FCKeditorAPI ;

function InitializeAPI()
{
	var oParentWindow = window.parent ;

	if ( !( FCKeditorAPI = oParentWindow.FCKeditorAPI ) )
	{
		// Make the FCKeditorAPI object available in the parent window. Use
		// eval so this core runs in the parent's scope and so it will still be
		// available if the editor instance is removed ("Can't execute code
		// from a freed script" error).

		// Note: we check the existence of oEditor.GetParentForm because some external 
		// code (like JSON) can extend the Object prototype and we get then extra oEditor 
		// objects that aren't really FCKeditor instances.
		var sScript =
			'var FCKeditorAPI = {' +
				'Version : "2.5.1",' +
				'VersionBuild : "17566",' +
				'__Instances : new Object(),' +

				'GetInstance : function( name )' +
				'{' +
					'return this.__Instances[ name ];' +
				'},' +

				'_FormSubmit : function()' +
				'{' +
					'for ( var name in FCKeditorAPI.__Instances )' +
					'{' +
						'var oEditor = FCKeditorAPI.__Instances[ name ] ;' +
						'if ( oEditor.GetParentForm && oEditor.GetParentForm() == this )' +
							'oEditor.UpdateLinkedField() ;' +
					'}' +
					'this._FCKOriginalSubmit() ;' +
				'},' +

				'_FunctionQueue	: {' +
					'Functions : new Array(),' +
					'IsRunning : false,' +

					'Add : function( f )' +
					'{' +
						'this.Functions.push( f );' +
						'if ( !this.IsRunning )' +
							'this.StartNext();' +
					'},' +

					'StartNext : function()' +
					'{' +
						'var aQueue = this.Functions ;' +
						'if ( aQueue.length > 0 )' +
						'{' +
							'this.IsRunning = true;' +
							'aQueue[0].call();' +
						'}' +
						'else ' +
							'this.IsRunning = false;' +
					'},' +

					'Remove : function( f )' +
					'{' +
						'var aQueue = this.Functions;' +
						'var i = 0, fFunc;' +
						'while( (fFunc = aQueue[ i ]) )' +
						'{' +
							'if ( fFunc == f )' +
								'aQueue.splice( i,1 );' +
							'i++ ;' +
						'}' +
						'this.StartNext();' +
					'}' +
				'}' +
			'}' ;

		// In IE, the "eval" function is not always available (it works with
		// the JavaScript samples, but not with the ASP ones, for example).
		// So, let's use the execScript instead.
		if ( oParentWindow.execScript )
			oParentWindow.execScript( sScript, 'JavaScript' ) ;
		else
		{
			if ( FCKBrowserInfo.IsGecko10 )
			{
				// FF 1.0.4 gives an error with the request bellow. The
				// following seams to work well.
				eval.call( oParentWindow, sScript ) ;
			}
			else if ( FCKBrowserInfo.IsSafari || FCKBrowserInfo.IsGecko19 )
			{
				// oParentWindow.eval in Safari and Gran Paradiso executes in the calling window
				// environment, instead of the parent one. The following should make it work.
				var oParentDocument = oParentWindow.document ;
				var eScript = oParentDocument.createElement('script') ;
				eScript.appendChild( oParentDocument.createTextNode( sScript ) ) ;
				oParentDocument.documentElement.appendChild( eScript ) ;
			}
			else
				oParentWindow.eval( sScript ) ;
		}

		FCKeditorAPI = oParentWindow.FCKeditorAPI ;
	}

	// Add the current instance to the FCKeditorAPI's instances collection.
	FCKeditorAPI.__Instances[ FCK.Name ] = FCK ;
}

// Attach to the form onsubmit event and to the form.submit().
function _AttachFormSubmitToAPI()
{
	// Get the linked field form.
	var oForm = FCK.GetParentForm() ;

	if ( oForm )
	{
		// Attach to the onsubmit event.
		FCKTools.AddEventListener( oForm, 'submit', FCK.UpdateLinkedField ) ;

		// IE sees oForm.submit function as an 'object'.
		if ( !oForm._FCKOriginalSubmit && ( typeof( oForm.submit ) == 'function' || ( !oForm.submit.tagName && !oForm.submit.length ) ) )
		{
			// Save the original submit.
			oForm._FCKOriginalSubmit = oForm.submit ;

			// Create our replacement for the submit.
			oForm.submit = FCKeditorAPI._FormSubmit ;
		}
	}
}

function FCKeditorAPI_Cleanup()
{
	if ( ! window.FCKUnloadFlag )
		return ;
	delete FCKeditorAPI.__Instances[ FCK.Name ] ;
}
function FCKeditorAPI_ConfirmCleanup()
{
	window.FCKUnloadFlag = true ;
}
FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;	
FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ;

--- NEW FILE: fckconstants.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/css
	fck_editorarea.css, 1.5, 1.6 fck_internal.css, 1.5,
	1.6 fck_showtableborders_gecko.css, 1.3, 1.4
Message-ID: <20080209125401.C378910FE1A@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/css

Added Files:
	fck_editorarea.css fck_internal.css 
	fck_showtableborders_gecko.css 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_showtableborders_gecko.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This CSS Style Sheet defines the rules to show table borders on Gecko.
 */

/* For tables with the "border" attribute set to "0" */
table[border="0"],
table[border="0"] > tr > td, table[border="0"] > tr > th,
table[border="0"] > tbody > tr > td, table[border="0"] > tbody > tr > th,
table[border="0"] > thead > tr > td, table[border="0"] > thead > tr > th,
table[border="0"] > tfoot > tr > td, table[border="0"] > tfoot > tr > th
{
	border: #d3d3d3 1px dotted ;
}

/* For tables with no "border" attribute set */
table:not([border]),
table:not([border]) > tr > td, table:not([border]) > tr > th,
table:not([border]) > tbody > tr > td, table:not([border]) > tbody > tr > th,
table:not([border]) > thead > tr > td, table:not([border]) > thead > tr > th,
table:not([border]) > tfoot > tr > td, table:not([border]) > tfoot > tr > th
{
	border: #d3d3d3 1px dotted ;
}

--- NEW FILE: fck_editorarea.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the default CSS file used by the editor area. It defines the
 * initial font of the editor and background color.
 *
 * A user can configure the editor to use another CSS file. Just change
 * the value of the FCKConfig.EditorAreaCSS key in the configuration
 * file.
 */

/*
    The "body" styles should match your editor web site, mainly regarding
    background color and font family and size.
*/

body
{
	background-color: #ffffff;
	padding: 5px 5px 5px 5px;
	margin: 0px;
}

body, td
{
	font-family: Arial, Verdana, sans-serif;
	font-size: 12px;
}

a[href]
{
	color: -moz-hyperlinktext !important;		/* For Firefox... mark as important, otherwise it becomes black */
	text-decoration: -moz-anchor-decoration;	/* For Firefox 3, otherwise no underline will be used */
}

/*
	Just uncomment the following block if you want to avoid spaces between
	paragraphs. Remember to apply the same style in your output front end page.
*/

/*
p, ul, li
{
	margin-top: 0px;
	margin-bottom: 0px;
}
*/

/*
    The following are some sample styles used in the "Styles" toolbar command.
    You should instead remove them, and include the styles used by the site
    you are using the editor in.
*/

.Bold
{
	font-weight: bold;
}

.Title
{
	font-weight: bold;
	font-size: 18px;
	color: #cc3300;
}

.Code
{
	border: #8b4513 1px solid;
	padding-right: 5px;
	padding-left: 5px;
	color: #000066;
	font-family: 'Courier New' , Monospace;
	background-color: #ff9933;
}

--- NEW FILE: fck_internal.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This CSS Style Sheet defines rules used by the editor for its internal use.
 */

/* Fix to allow putting the caret at the end of the content in Firefox if
   clicking below the content. */
html
{
	min-height: 100%;
}

table.FCK__ShowTableBorders, table.FCK__ShowTableBorders td, table.FCK__ShowTableBorders th
{
	border: #d3d3d3 1px solid;
}

form
{
	border: 1px dotted #FF0000;
	padding: 2px;
}

.FCK__Flash
{
	border: #a9a9a9 1px solid;
	background-position: center center;
	background-image: url(images/fck_flashlogo.gif);
	background-repeat: no-repeat;
	width: 80px;
	height: 80px;
}

/* Empty anchors images */
.FCK__Anchor
{
	border: 1px dotted #00F;
	background-position: center center;
	background-image: url(images/fck_anchor.gif);
	background-repeat: no-repeat;
	width: 16px;
	height: 15px;
	vertical-align: middle;
}

/* Anchors with content */
.FCK__AnchorC
{
	border: 1px dotted #00F;
	background-position: 1px center;
	background-image: url(images/fck_anchor.gif);
	background-repeat: no-repeat;
	padding-left: 18px;
}

/* Any anchor for non-IE, if we combine it with the previous rule IE ignores all. */
a[name]
{
	border: 1px dotted #00F;
	background-position: 0 center;
	background-image: url(images/fck_anchor.gif);
	background-repeat: no-repeat;
	padding-left: 18px;
}

.FCK__PageBreak
{
	background-position: center center;
	background-image: url(images/fck_pagebreak.gif);
	background-repeat: no-repeat;
	clear: both;
	display: block;
	float: none;
	width: 100%;
	border-top: #999999 1px dotted;
	border-bottom: #999999 1px dotted;
	border-right: 0px;
	border-left: 0px;
	height: 5px;
}

/* Hidden fields */
.FCK__InputHidden
{
	width: 19px;
	height: 18px;
	background-image: url(images/fck_hiddenfield.gif);
	background-repeat: no-repeat;
	vertical-align: text-bottom;
	background-position: center center;
}

.FCK__ShowBlocks p,
.FCK__ShowBlocks div,
.FCK__ShowBlocks pre,
.FCK__ShowBlocks address,
.FCK__ShowBlocks blockquote,
.FCK__ShowBlocks h1,
.FCK__ShowBlocks h2,
.FCK__ShowBlocks h3,
.FCK__ShowBlocks h4,
.FCK__ShowBlocks h5,
.FCK__ShowBlocks h6
{
	background-repeat: no-repeat;
	border: 1px dotted gray;
	padding-top: 8px;
	padding-left: 8px;
}

.FCK__ShowBlocks p
{
	background-image: url(images/block_p.png);
}

.FCK__ShowBlocks div
{
	background-image: url(images/block_div.png);
}

.FCK__ShowBlocks pre
{
	background-image: url(images/block_pre.png);
}

.FCK__ShowBlocks address
{
	background-image: url(images/block_address.png);
}

.FCK__ShowBlocks blockquote 
{
	background-image: url(images/block_blockquote.png);
}

.FCK__ShowBlocks h1
{
	background-image: url(images/block_h1.png);
}

.FCK__ShowBlocks h2
{
	background-image: url(images/block_h2.png);
}

.FCK__ShowBlocks h3
{
	background-image: url(images/block_h3.png);
}

.FCK__ShowBlocks h4
{
	background-image: url(images/block_h4.png);
}

.FCK__ShowBlocks h5
{
	background-image: url(images/block_h5.png);
}

.FCK__ShowBlocks h6
{
	background-image: url(images/block_h6.png);
}



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/css/images
	block_address.png, NONE, 1.1 block_blockquote.png, NONE,
	1.1 block_div.png, NONE, 1.1 block_h1.png, NONE,
	1.1 block_h2.png, NONE, 1.1 block_h3.png, NONE,
	1.1 block_h4.png, NONE, 1.1 block_h5.png, NONE,
	1.1 block_h6.png, NONE, 1.1 block_p.png, NONE,
	1.1 block_pre.png, NONE, 1.1 fck_anchor.gif, 1.2,
	1.3 fck_flashlogo.gif, 1.2, 1.3 fck_hiddenfield.gif, NONE,
	1.1 fck_pagebreak.gif, 1.2, 1.3
Message-ID: <20080209125401.C9D4810FE1B@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css/images
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/css/images

Added Files:
	block_address.png block_blockquote.png block_div.png 
	block_h1.png block_h2.png block_h3.png block_h4.png 
	block_h5.png block_h6.png block_p.png block_pre.png 
	fck_anchor.gif fck_flashlogo.gif fck_hiddenfield.gif 
	fck_pagebreak.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: block_blockquote.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_flashlogo.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: block_div.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_hiddenfield.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: block_address.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: block_h3.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: block_h6.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_anchor.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: block_p.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: block_h5.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: block_h4.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: block_pre.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: block_h1.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_pagebreak.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: block_h2.png ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image
	fck_image.js, 1.6, 1.7 fck_image_preview.html, 1.3, 1.4
Message-ID: <20080209125401.E3B3010FE21@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/fck_image

Added Files:
	fck_image.js fck_image_preview.html 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_image.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_image_preview.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Preview page for the Image dialog window.
 *
 * Curiosity: http://en.wikipedia.org/wiki/Lorem_ipsum
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title></title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="robots" content="noindex, nofollow" />
	<link href="../common/fck_dialog_common.css" rel="stylesheet" type="text/css" />
	<script type="text/javascript">

// Sets the Skin CSS
document.write( '<link href="' + window.parent.FCKConfig.SkinPath + 'fck_dialog.css" type="text/css" rel="stylesheet">' ) ;

if ( window.parent.FCKConfig.BaseHref.length > 0 )
	document.write( '<base href="' + window.parent.FCKConfig.BaseHref + '">' ) ;

window.onload = function()
{
	window.parent.SetPreviewElements(
		document.getElementById( 'imgPreview' ),
		document.getElementById( 'lnkPreview' ) ) ;
}

	</script>
</head>
<body style="color: #000000; background-color: #ffffff">
	<a id="lnkPreview" onclick="return false;" style="cursor: default">
		<img id="imgPreview" onload="window.parent.UpdateOriginal();" style="display: none" /></a>Lorem
	ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat diam.
	Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, nulla.
	Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis
	euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce
	mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie.
	Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque
	egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem,
	in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut
	placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy
	metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices,
	ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris
	non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas
	elementum. Nunc imperdiet gravida mauris.
</body>
</html>



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor _documentation.html,
	1.4, 1.5 _upgrade.html, NONE, 1.1 _whatsnew.html, 1.6,
	1.7 _whatsnew_history.html, NONE, 1.1 fckconfig.js, 1.10,
	1.11 fckeditor.js, 1.6, 1.7 fckeditor.php, 1.5,
	1.6 fckeditor_php4.php, NONE, 1.1 fckeditor_php5.php, NONE,
	1.1 fckpackager.xml, NONE, 1.1 fckstyles.xml, 1.3,
	1.4 fcktemplates.xml, 1.5, 1.6 license.txt, 1.2,
	1.3 myconfig.js, 1.2, 1.3
Message-ID: <20080209125401.AF5DE10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor
In directory qs1489.pair.com:/tmp/cvs-serv26402

Added Files:
	_documentation.html _upgrade.html _whatsnew.html 
	_whatsnew_history.html fckconfig.js fckeditor.js fckeditor.php 
	fckeditor_php4.php fckeditor_php5.php fckpackager.xml 
	fckstyles.xml fcktemplates.xml license.txt myconfig.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckeditor.php ---
<?php
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the integration file for PHP (All versions).
 *
 * It loads the correct integration file based on the PHP version (avoiding
 * strict error messages with PHP 5).
 */

function FCKeditor_IsCompatibleBrowser()
{
	global $HTTP_USER_AGENT ;

	if ( !isset( $_SERVER ) ) {
		global $HTTP_SERVER_VARS ;
	    $_SERVER = $HTTP_SERVER_VARS ;
	}
		
	if ( isset( $HTTP_USER_AGENT ) )
		$sAgent = $HTTP_USER_AGENT ;
	else
		$sAgent = $_SERVER['HTTP_USER_AGENT'] ;

	if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false )
	{
		$iVersion = (float)substr($sAgent, strpos($sAgent, 'MSIE') + 5, 3) ;
		return ($iVersion >= 5.5) ;
	}
	else if ( strpos($sAgent, 'Gecko/') !== false )
	{
		$iVersion = (int)substr($sAgent, strpos($sAgent, 'Gecko/') + 6, 8) ;
		return ($iVersion >= 20030210) ;
	}
	else if ( strpos($sAgent, 'Opera/') !== false )
	{
		$fVersion = (float)substr($sAgent, strpos($sAgent, 'Opera/') + 6, 4) ;
		return ($fVersion >= 9.5) ;
	}
	else if ( preg_match( "|AppleWebKit/(\d+)|i", $sAgent, $matches ) )
	{
		$iVersion = $matches[1] ;
		return ( $matches[1] >= 522 ) ;
	}
	else
		return false ;	
}

if ( !function_exists('version_compare') || version_compare( phpversion(), '5', '<' ) )
	include_once( 'fckeditor_php4.php' ) ;
else
	include_once( 'fckeditor_php5.php' ) ;

?>

--- NEW FILE: fckstyles.xml ---
<?xml version="1.0" encoding="utf-8" ?>
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the sample style definitions file. It makes the styles combo
 * completely customizable.
 *
 * See FCKConfig.StylesXmlPath in the configuration file.
-->
<Styles>

	<!-- Block Styles -->

	<!--
	# These styles are already available in the "Format" combo, so they are not
	# needed here by default.

	<Style name="Heading 1" element="h1" />
	<Style name="Heading 2" element="h2" />
	<Style name="Heading 3" element="h3" />
	<Style name="Heading 4" element="h4" />
	<Style name="Heading 5" element="h5" />
	<Style name="Heading 6" element="h6" />
	<Style name="Paragraph" element="p" />
	<Style name="Document Block" element="div" />
	<Style name="Preformatted Text" element="pre" />
	<Style name="Address" element="address" />
	-->

	<!-- Inline Styles -->

	<!--
	# These are core styles available as toolbar buttons.

	<Style name="Bold" element="b">
		<Override element="strong" />
	</Style>
	<Style name="Italic" element="i">
		<Override element="em" />
	</Style>
	<Style name="Underline" element="u" />
	<Style name="Strikethrough" element="strike" />
	<Style name="Subscript" element="sub" />
	<Style name="Superscript" element="sup" />
	-->

	<Style name="Marker: Yellow" element="span">
		<Style name="background-color" value="Yellow" />
	</Style>
	<Style name="Marker: Green" element="span">
		<Style name="background-color" value="Lime" />
	</Style>

	<Style name="Strong Emphasis" element="strong" />
	<Style name="Emphasis" element="em" />

	<Style name="Big" element="big" />
	<Style name="Small" element="small" />
	<Style name="Typewriter" element="tt" />

	<Style name="Computer Code" element="code" />
	<Style name="Keyboard Phrase" element="kbd" />
	<Style name="Sample Text" element="samp" />
	<Style name="Variable" element="var" />

	<Style name="Deleted Text" element="del" />
	<Style name="Inserted Text" element="ins" />

	<Style name="Cited Work" element="cite" />
	<Style name="Inline Quotation" element="q" />

	<Style name="Language: RTL" element="span">
		<Attribute name="dir" value="rtl" />
	</Style>
	<Style name="Language: LTR" element="span">
		<Attribute name="dir" value="ltr" />
	</Style>
	<Style name="Language: RTL Strong" element="bdo">
		<Attribute name="dir" value="rtl" />
	</Style>
	<Style name="Language: LTR Strong" element="bdo">
		<Attribute name="dir" value="ltr" />
	</Style>

	<!-- Object Styles -->

	<Style name="Image on Left" element="img">
		<Attribute name="style" value="padding: 5px; margin-right: 5px" />
		<Attribute name="border" value="2" />
		<Attribute name="align" value="left" />
	</Style>
	<Style name="Image on Right" element="img">
		<Attribute name="style" value="padding: 5px; margin-left: 5px" />
		<Attribute name="border" value="2" />
		<Attribute name="align" value="right" />
	</Style>
</Styles>
--- NEW FILE: _documentation.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>FCKeditor - Documentation</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<style type="text/css">
		body { font-family: arial, verdana, sans-serif }
		p { margin-left: 20px }
	</style>
</head>
<body>
	<h1>
		FCKeditor Documentation</h1>
	<p>
		You can find the official documentation for FCKeditor online, at <a href="http://wiki.fckeditor.net/">
			http://wiki.fckeditor.net/</a>.</p>
</body>
</html>

--- NEW FILE: fcktemplates.xml ---
<?xml version="1.0" encoding="utf-8" ?>
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the sample templates definitions file. It makes the "templates"
 * command completely customizable.
 *
 * See FCKConfig.TemplatesXmlPath in the configuration file.
-->
<Templates imagesBasePath="fck_template/images/">
	<Template title="Image and Title" image="template1.gif">
		<Description>One main image with a title and text that surround the image.</Description>
		<Html>
			<![CDATA[
				<img style="MARGIN-RIGHT: 10px" height="100" alt="" width="100" align="left"/>
				<h3>Type the title here</h3>
				Type the text here
			]]>
		</Html>
	</Template>
	<Template title="Strange Template" image="template2.gif">
		<Description>A template that defines two colums, each one with a title, and some text.</Description>
		<Html>
			<![CDATA[
				<table cellspacing="0" cellpadding="0" width="100%" border="0">
					<tbody>
						<tr>
							<td width="50%">
							<h3>Title 1</h3>
							</td>
							<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </td>
							<td width="50%">
							<h3>Title 2</h3>
							</td>
						</tr>
						<tr>
							<td>Text 1</td>
							<td>&nbsp;</td>
							<td>Text 2</td>
						</tr>
					</tbody>
				</table>
				More text goes here.
			]]>
		</Html>
	</Template>
	<Template title="Text and Table" image="template3.gif">
		<Description>A title with some text and a table.</Description>
		<Html>
			<![CDATA[
				<table align="left" width="80%" border="0" cellspacing="0" cellpadding="0"><tr><td>
					<h3>Title goes here</h3>
					<p>
					<table style="FLOAT: right" cellspacing="0" cellpadding="0" width="150" border="1">
						<tbody>
							<tr>
								<td align="center" colspan="3"><strong>Table title</strong></td>
							</tr>
							<tr>
								<td>&nbsp;</td>
								<td>&nbsp;</td>
								<td>&nbsp;</td>
							</tr>
							<tr>
								<td>&nbsp;</td>
								<td>&nbsp;</td>
								<td>&nbsp;</td>
							</tr>
							<tr>
								<td>&nbsp;</td>
								<td>&nbsp;</td>
								<td>&nbsp;</td>
							</tr>
							<tr>
								<td>&nbsp;</td>
								<td>&nbsp;</td>
								<td>&nbsp;</td>
							</tr>
						</tbody>
					</table>
					Type the text here</p>
				</td></tr></table>
			]]>
		</Html>
	</Template>
</Templates>

--- NEW FILE: fckeditor.js ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the integration file for JavaScript.
 *
 * It defines the FCKeditor class that can be used to create editor
 * instances in a HTML page in the client side. For server side
 * operations, use the specific integration system.
 */

// FCKeditor Class
var FCKeditor = function( instanceName, width, height, toolbarSet, value )
{
	// Properties
	this.InstanceName	= instanceName ;
	this.Width			= width			|| '100%' ;
	this.Height			= height		|| '200' ;
	this.ToolbarSet		= toolbarSet	|| 'Default' ;
	this.Value			= value			|| '' ;
	this.BasePath		= FCKeditor.BasePath ;
	this.CheckBrowser	= true ;
	this.DisplayErrors	= true ;

	this.Config			= new Object() ;

	// Events
	this.OnError		= null ;	// function( source, errorNumber, errorDescription )
}

/**
 * This is the default BasePath used by all editor instances.
 */
FCKeditor.BasePath = '/fckeditor/' ;

/**
 * The minimum height used when replacing textareas.
 */
FCKeditor.MinHeight = 200 ;

/**
 * The minimum width used when replacing textareas.
 */
FCKeditor.MinWidth = 750 ;

FCKeditor.prototype.Version			= '2.5.1' ;
FCKeditor.prototype.VersionBuild	= '17566' ;

FCKeditor.prototype.Create = function()
{
	document.write( this.CreateHtml() ) ;
}

FCKeditor.prototype.CreateHtml = function()
{
	// Check for errors
	if ( !this.InstanceName || this.InstanceName.length == 0 )
	{
		this._ThrowError( 701, 'You must specify an instance name.' ) ;
		return '' ;
	}

	var sHtml = '<div>' ;

	if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
	{
		sHtml += '<input type="hidden" id="' + this.InstanceName + '" name="' + this.InstanceName + '" value="' + this._HTMLEncode( this.Value ) + '" style="display:none" />' ;
		sHtml += this._GetConfigHtml() ;
		sHtml += this._GetIFrameHtml() ;
	}
	else
	{
		var sWidth  = this.Width.toString().indexOf('%')  > 0 ? this.Width  : this.Width  + 'px' ;
		var sHeight = this.Height.toString().indexOf('%') > 0 ? this.Height : this.Height + 'px' ;
		sHtml += '<textarea name="' + this.InstanceName + '" rows="4" cols="40" style="width:' + sWidth + ';height:' + sHeight + '">' + this._HTMLEncode( this.Value ) + '<\/textarea>' ;
	}

	sHtml += '</div>' ;

	return sHtml ;
}

FCKeditor.prototype.ReplaceTextarea = function()
{
	if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
	{
		// We must check the elements firstly using the Id and then the name.
		var oTextarea = document.getElementById( this.InstanceName ) ;
		var colElementsByName = document.getElementsByName( this.InstanceName ) ;
		var i = 0;
		while ( oTextarea || i == 0 )
		{
			if ( oTextarea && oTextarea.tagName.toLowerCase() == 'textarea' )
				break ;
			oTextarea = colElementsByName[i++] ;
		}

		if ( !oTextarea )
		{
			alert( 'Error: The TEXTAREA with id or name set to "' + this.InstanceName + '" was not found' ) ;
			return ;
		}

		oTextarea.style.display = 'none' ;
		this._InsertHtmlBefore( this._GetConfigHtml(), oTextarea ) ;
		this._InsertHtmlBefore( this._GetIFrameHtml(), oTextarea ) ;
	}
}

FCKeditor.prototype._InsertHtmlBefore = function( html, element )
{
	if ( element.insertAdjacentHTML )	// IE
		element.insertAdjacentHTML( 'beforeBegin', html ) ;
	else								// Gecko
	{
		var oRange = document.createRange() ;
		oRange.setStartBefore( element ) ;
		var oFragment = oRange.createContextualFragment( html );
		element.parentNode.insertBefore( oFragment, element ) ;
	}
}

FCKeditor.prototype._GetConfigHtml = function()
{
	var sConfig = '' ;
	for ( var o in this.Config )
	{
		if ( sConfig.length > 0 ) sConfig += '&amp;' ;
		sConfig += encodeURIComponent( o ) + '=' + encodeURIComponent( this.Config[o] ) ;
	}

	return '<input type="hidden" id="' + this.InstanceName + '___Config" value="' + sConfig + '" style="display:none" />' ;
}

FCKeditor.prototype._GetIFrameHtml = function()
{
	var sFile = 'fckeditor.html' ;

	try
	{
		if ( (/fcksource=true/i).test( window.top.location.search ) )
			sFile = 'fckeditor.original.html' ;
	}
	catch (e) { /* Ignore it. Much probably we are inside a FRAME where the "top" is in another domain (security error). */ }

	var sLink = this.BasePath + 'editor/' + sFile + '?InstanceName=' + encodeURIComponent( this.InstanceName ) ;
	if (this.ToolbarSet) sLink += '&amp;Toolbar=' + this.ToolbarSet ;

	return '<iframe id="' + this.InstanceName + '___Frame" src="' + sLink + '" width="' + this.Width + '" height="' + this.Height + '" frameborder="0" scrolling="no"></iframe>' ;
}

FCKeditor.prototype._IsCompatibleBrowser = function()
{
	return FCKeditor_IsCompatibleBrowser() ;
}

FCKeditor.prototype._ThrowError = function( errorNumber, errorDescription )
{
	this.ErrorNumber		= errorNumber ;
	this.ErrorDescription	= errorDescription ;

	if ( this.DisplayErrors )
	{
		document.write( '<div style="COLOR: #ff0000">' ) ;
		document.write( '[ FCKeditor Error ' + this.ErrorNumber + ': ' + this.ErrorDescription + ' ]' ) ;
		document.write( '</div>' ) ;
	}

	if ( typeof( this.OnError ) == 'function' )
		this.OnError( this, errorNumber, errorDescription ) ;
}

FCKeditor.prototype._HTMLEncode = function( text )
{
	if ( typeof( text ) != "string" )
		text = text.toString() ;

	text = text.replace(
		/&/g, "&amp;").replace(
		/"/g, "&quot;").replace(
		/</g, "&lt;").replace(
		/>/g, "&gt;") ;

	return text ;
}

;(function()
{
	var textareaToEditor = function( textarea )
	{
		var editor = new FCKeditor( textarea.name ) ;
		
		editor.Width = Math.max( textarea.offsetWidth, FCKeditor.MinWidth ) ;
		editor.Height = Math.max( textarea.offsetHeight, FCKeditor.MinHeight ) ;
		
		return editor ;
	}
	
	/**
	 * Replace all <textarea> elements available in the document with FCKeditor
	 * instances.
	 *
	 *	// Replace all <textarea> elements in the page.
	 *	FCKeditor.ReplaceAllTextareas() ;
	 *
	 *	// Replace all <textarea class="myClassName"> elements in the page.
	 *	FCKeditor.ReplaceAllTextareas( 'myClassName' ) ;
	 *
	 *	// Selectively replace <textarea> elements, based on custom assertions.
	 *	FCKeditor.ReplaceAllTextareas( function( textarea, editor )
	 *		{
	 *			// Custom code to evaluate the replace, returning false if it
	 *			// must not be done.
	 *			// It also passes the "editor" parameter, so the developer can
	 *			// customize the instance.
	 *		} ) ;
	 */
	FCKeditor.ReplaceAllTextareas = function()
	{
		var textareas = document.getElementsByTagName( 'textarea' ) ;

		for ( var i = 0 ; i < textareas.length ; i++ )
		{
			var editor = null ;
			var textarea = textareas[i] ;
			var name = textarea.name ;

			// The "name" attribute must exist.
			if ( !name || name.length == 0 )
				continue ;
			
			if ( typeof arguments[0] == 'string' )
			{
				// The textarea class name could be passed as the function
				// parameter.

				var classRegex = new RegExp( '(?:^| )' + arguments[0] + '(?:$| )' ) ;

				if ( !classRegex.test( textarea.className ) )
					continue ;
			}
			else if ( typeof arguments[0] == 'function' )
			{
				// An assertion function could be passed as the function parameter.
				// It must explicitly return "false" to ignore a specific <textarea>.
				editor = textareaToEditor( textarea ) ;
				if ( arguments[0]( textarea, editor ) === false )
					continue ;
			}

			if ( !editor )
				editor = textareaToEditor( textarea ) ;

			editor.ReplaceTextarea() ;
		}
	}
})() ;

function FCKeditor_IsCompatibleBrowser()
{
	var sAgent = navigator.userAgent.toLowerCase() ;

	// Internet Explorer 5.5+
	if ( /*@cc_on!@*/false && sAgent.indexOf("mac") == -1 )
	{
		var sBrowserVersion = navigator.appVersion.match(/MSIE (.\..)/)[1] ;
		return ( sBrowserVersion >= 5.5 ) ;
	}

	// Gecko (Opera 9 tries to behave like Gecko at this point).
	if ( navigator.product == "Gecko" && navigator.productSub >= 20030210 && !( typeof(opera) == 'object' && opera.postError ) )
		return true ;

	// Opera 9.50+
	if ( window.opera && window.opera.version && parseFloat( window.opera.version() ) >= 9.5 )
			return true ;

	// Safari 3+
	if ( sAgent.indexOf( ' applewebkit/' ) != -1 )
		return ( sAgent.match( / applewebkit\/(\d+)/ )[1] >= 522 ) ;	// Build must be at least 522 (v3)

	return false ;
}

--- NEW FILE: _upgrade.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>FCKeditor - Upgrade</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<style type="text/css">
		body { font-family: arial, verdana, sans-serif }
		p { margin-left: 20px }
	</style>
</head>
<body>
	<h1>
		FCKeditor Upgrade</h1>
	<p>
		Please check the following URL for notes regarding upgrade: <a href="http://wiki.fckeditor.net/Developer%27s_Guide/Upgrade">
			http://wiki.fckeditor.net/Developer%27s_Guide/Upgrade</a></p>
</body>
</html>

--- NEW FILE: fckpackager.xml ---
<?xml version="1.0" encoding="utf-8" ?>
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the configuration file to be used with FCKpackager to generate the
 * compressed code files in the "js" folder.
 *
 * Please check http://www.fckeditor.net for more info.
-->
<Package>
	<Header><![CDATA[/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 * 
 * == BEGIN LICENSE ==
 * 
 * Licensed under the terms of any of the following licenses at your
 * choice:
 * 
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 * 
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 * 
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 * 
 * == END LICENSE ==
 * 
 * This file has been compressed for better performance. The original source
 * can be found at "editor/_source".
 */
]]></Header>
	<Constants removeDeclaration="false">
		<Constant name="FCK_STATUS_NOTLOADED" value="0" />
		<Constant name="FCK_STATUS_ACTIVE" value="1" />
		<Constant name="FCK_STATUS_COMPLETE" value="2" />
		<Constant name="FCK_TRISTATE_OFF" value="0" />
		<Constant name="FCK_TRISTATE_ON" value="1" />
		<Constant name="FCK_TRISTATE_DISABLED" value="-1" />
		<Constant name="FCK_UNKNOWN" value="-9" />
		<Constant name="FCK_TOOLBARITEM_ONLYICON" value="0" />
		<Constant name="FCK_TOOLBARITEM_ONLYTEXT" value="1" />
		<Constant name="FCK_TOOLBARITEM_ICONTEXT" value="2" />
		<Constant name="FCK_EDITMODE_WYSIWYG" value="0" />
		<Constant name="FCK_EDITMODE_SOURCE" value="1" />
		<Constant name="FCK_STYLE_BLOCK" value="0" />
		<Constant name="FCK_STYLE_INLINE" value="1" />
		<Constant name="FCK_STYLE_OBJECT" value="2" />
	</Constants>
	<PackageFile path="editor/js/fckeditorcode_ie.js">
		<File path="editor/_source/fckconstants.js" />
		<File path="editor/_source/fckjscoreextensions.js" />
		<File path="editor/_source/classes/fckiecleanup.js" />
		<File path="editor/_source/internals/fckbrowserinfo.js" />
		<File path="editor/_source/internals/fckurlparams.js" />
		<File path="editor/_source/classes/fckevents.js" />
		<File path="editor/_source/classes/fckdataprocessor.js" />
		<File path="editor/_source/internals/fck.js" />
		<File path="editor/_source/internals/fck_ie.js" />
		<File path="editor/_source/internals/fckconfig.js" />
		<File path="editor/_source/internals/fckdebug.js" />
		<File path="editor/_source/internals/fckdomtools.js" />
		<File path="editor/_source/internals/fcktools.js" />
		<File path="editor/_source/internals/fcktools_ie.js" />
		<File path="editor/_source/fckeditorapi.js" />
		<File path="editor/_source/classes/fckimagepreloader.js" />

		<File path="editor/_source/internals/fckregexlib.js" />
		<File path="editor/_source/internals/fcklistslib.js" />
		<File path="editor/_source/internals/fcklanguagemanager.js" />
		<File path="editor/_source/internals/fckxhtmlentities.js" />
		<File path="editor/_source/internals/fckxhtml.js" />
		<File path="editor/_source/internals/fckxhtml_ie.js" />
		<File path="editor/_source/internals/fckcodeformatter.js" />
		<File path="editor/_source/internals/fckundo.js" />
		<File path="editor/_source/classes/fckeditingarea.js" />
		<File path="editor/_source/classes/fckkeystrokehandler.js" />

		<File path="editor/dtd/fck_xhtml10transitional.js" />
		<File path="editor/_source/classes/fckstyle.js" />
		<File path="editor/_source/internals/fckstyles.js" />
			  
		<File path="editor/_source/internals/fcklisthandler.js" />
		<File path="editor/_source/classes/fckelementpath.js" />
		<File path="editor/_source/classes/fckdomrange.js" />
		<File path="editor/_source/classes/fckdomrange_ie.js" />
		<File path="editor/_source/classes/fckdomrangeiterator.js" />
		<File path="editor/_source/classes/fckdocumentfragment_ie.js" />
		<File path="editor/_source/classes/fckw3crange.js" />
		<File path="editor/_source/classes/fckenterkey.js" />

		<File path="editor/_source/internals/fckdocumentprocessor.js" />
		<File path="editor/_source/internals/fckselection.js" />
		<File path="editor/_source/internals/fckselection_ie.js" />

		<File path="editor/_source/internals/fcktablehandler.js" />
		<File path="editor/_source/internals/fcktablehandler_ie.js" />
		<File path="editor/_source/classes/fckxml.js" />
		<File path="editor/_source/classes/fckxml_ie.js" />

		<File path="editor/_source/commandclasses/fcknamedcommand.js" />
		<File path="editor/_source/commandclasses/fckstylecommand.js" />
		<File path="editor/_source/commandclasses/fck_othercommands.js" />
		<File path="editor/_source/commandclasses/fckshowblocks.js" />
		<File path="editor/_source/commandclasses/fckspellcheckcommand_ie.js" />
		<File path="editor/_source/commandclasses/fcktextcolorcommand.js" />
		<File path="editor/_source/commandclasses/fckpasteplaintextcommand.js" />
		<File path="editor/_source/commandclasses/fckpastewordcommand.js" />
		<File path="editor/_source/commandclasses/fcktablecommand.js" />
		<File path="editor/_source/commandclasses/fckfitwindow.js" />
		<File path="editor/_source/commandclasses/fcklistcommands.js" />
		<File path="editor/_source/commandclasses/fckjustifycommands.js" />
		<File path="editor/_source/commandclasses/fckindentcommands.js" />
		<File path="editor/_source/commandclasses/fckblockquotecommand.js" />
		<File path="editor/_source/commandclasses/fckcorestylecommand.js" />
		<File path="editor/_source/commandclasses/fckremoveformatcommand.js" />
		<File path="editor/_source/internals/fckcommands.js" />

		<File path="editor/_source/classes/fckpanel.js" />
		<File path="editor/_source/classes/fckicon.js" />
		<File path="editor/_source/classes/fcktoolbarbuttonui.js" />
		<File path="editor/_source/classes/fcktoolbarbutton.js" />
		<File path="editor/_source/classes/fckspecialcombo.js" />
		<File path="editor/_source/classes/fcktoolbarspecialcombo.js" />
		<File path="editor/_source/classes/fcktoolbarstylecombo.js" />
		<File path="editor/_source/classes/fcktoolbarfontformatcombo.js" />
		<File path="editor/_source/classes/fcktoolbarfontscombo.js" />
		<File path="editor/_source/classes/fcktoolbarfontsizecombo.js" />
		<File path="editor/_source/classes/fcktoolbarpanelbutton.js" />
		<File path="editor/_source/internals/fcktoolbaritems.js" />
		<File path="editor/_source/classes/fcktoolbar.js" />
		<File path="editor/_source/classes/fcktoolbarbreak_ie.js" />
		<File path="editor/_source/internals/fcktoolbarset.js" />
		<File path="editor/_source/internals/fckdialog.js" />
		<File path="editor/_source/internals/fckdialog_ie.js" />

		<File path="editor/_source/classes/fckmenuitem.js" />
		<File path="editor/_source/classes/fckmenublock.js" />
		<File path="editor/_source/classes/fckmenublockpanel.js" />
		<File path="editor/_source/classes/fckcontextmenu.js" />
		<File path="editor/_source/internals/fck_contextmenu.js" />

		<File path="editor/_source/classes/fckplugin.js" />
		<File path="editor/_source/internals/fckplugins.js" />
	</PackageFile>

	<PackageFile path="editor/js/fckeditorcode_gecko.js">
		<File path="editor/_source/fckconstants.js" />
		<File path="editor/_source/fckjscoreextensions.js" />
		<File path="editor/_source/internals/fckbrowserinfo.js" />
		<File path="editor/_source/internals/fckurlparams.js" />
		<File path="editor/_source/classes/fckevents.js" />
		<File path="editor/_source/classes/fckdataprocessor.js" />
		<File path="editor/_source/internals/fck.js" />
		<File path="editor/_source/internals/fck_gecko.js" />
		<File path="editor/_source/internals/fckconfig.js" />
		<File path="editor/_source/internals/fckdebug.js" />
		<File path="editor/_source/internals/fckdomtools.js" />
		<File path="editor/_source/internals/fcktools.js" />
		<File path="editor/_source/internals/fcktools_gecko.js" />
		<File path="editor/_source/fckeditorapi.js" />
		<File path="editor/_source/classes/fckimagepreloader.js" />

		<File path="editor/_source/internals/fckregexlib.js" />
		<File path="editor/_source/internals/fcklistslib.js" />
		<File path="editor/_source/internals/fcklanguagemanager.js" />
		<File path="editor/_source/internals/fckxhtmlentities.js" />
		<File path="editor/_source/internals/fckxhtml.js" />
		<File path="editor/_source/internals/fckxhtml_gecko.js" />
		<File path="editor/_source/internals/fckcodeformatter.js" />
		<File path="editor/_source/internals/fckundo.js" />
		<File path="editor/_source/classes/fckeditingarea.js" />
		<File path="editor/_source/classes/fckkeystrokehandler.js" />

		<File path="editor/dtd/fck_xhtml10transitional.js" />
		<File path="editor/_source/classes/fckstyle.js" />
		<File path="editor/_source/internals/fckstyles.js" />

		<File path="editor/_source/internals/fcklisthandler.js" />
		<File path="editor/_source/classes/fckelementpath.js" />
		<File path="editor/_source/classes/fckdomrange.js" />
		<File path="editor/_source/classes/fckdomrange_gecko.js" />
		<File path="editor/_source/classes/fckdomrangeiterator.js" />
		<File path="editor/_source/classes/fckdocumentfragment_gecko.js" />
		<File path="editor/_source/classes/fckw3crange.js" />
		<File path="editor/_source/classes/fckenterkey.js" />

		<File path="editor/_source/internals/fckdocumentprocessor.js" />
		<File path="editor/_source/internals/fckselection.js" />
		<File path="editor/_source/internals/fckselection_gecko.js" />

		<File path="editor/_source/internals/fcktablehandler.js" />
		<File path="editor/_source/internals/fcktablehandler_gecko.js" />
		<File path="editor/_source/classes/fckxml.js" />
		<File path="editor/_source/classes/fckxml_gecko.js" />

		<File path="editor/_source/commandclasses/fcknamedcommand.js" />
		<File path="editor/_source/commandclasses/fckstylecommand.js" />
		<File path="editor/_source/commandclasses/fck_othercommands.js" />
		<File path="editor/_source/commandclasses/fckshowblocks.js" />
		<File path="editor/_source/commandclasses/fckspellcheckcommand_gecko.js" />
		<File path="editor/_source/commandclasses/fcktextcolorcommand.js" />
		<File path="editor/_source/commandclasses/fckpasteplaintextcommand.js" />
		<File path="editor/_source/commandclasses/fckpastewordcommand.js" />
		<File path="editor/_source/commandclasses/fcktablecommand.js" />
		<File path="editor/_source/commandclasses/fckfitwindow.js" />
		<File path="editor/_source/commandclasses/fcklistcommands.js" />
		<File path="editor/_source/commandclasses/fckjustifycommands.js" />
		<File path="editor/_source/commandclasses/fckindentcommands.js" />
		<File path="editor/_source/commandclasses/fckblockquotecommand.js" />
		<File path="editor/_source/commandclasses/fckcorestylecommand.js" />
		<File path="editor/_source/commandclasses/fckremoveformatcommand.js" />
		<File path="editor/_source/internals/fckcommands.js" />

		<File path="editor/_source/classes/fckpanel.js" />
		<File path="editor/_source/classes/fckicon.js" />
		<File path="editor/_source/classes/fcktoolbarbuttonui.js" />
		<File path="editor/_source/classes/fcktoolbarbutton.js" />
		<File path="editor/_source/classes/fckspecialcombo.js" />
		<File path="editor/_source/classes/fcktoolbarspecialcombo.js" />
		<File path="editor/_source/classes/fcktoolbarstylecombo.js" />
		<File path="editor/_source/classes/fcktoolbarfontformatcombo.js" />
		<File path="editor/_source/classes/fcktoolbarfontscombo.js" />
		<File path="editor/_source/classes/fcktoolbarfontsizecombo.js" />
		<File path="editor/_source/classes/fcktoolbarpanelbutton.js" />
		<File path="editor/_source/internals/fcktoolbaritems.js" />
		<File path="editor/_source/classes/fcktoolbar.js" />
		<File path="editor/_source/classes/fcktoolbarbreak_gecko.js" />
		<File path="editor/_source/internals/fcktoolbarset.js" />
		<File path="editor/_source/internals/fckdialog.js" />
		<File path="editor/_source/internals/fckdialog_gecko.js" />

		<File path="editor/_source/classes/fckmenuitem.js" />
		<File path="editor/_source/classes/fckmenublock.js" />
		<File path="editor/_source/classes/fckmenublockpanel.js" />
		<File path="editor/_source/classes/fckcontextmenu.js" />
		<File path="editor/_source/internals/fck_contextmenu.js" />

		<File path="editor/_source/classes/fckplugin.js" />
		<File path="editor/_source/internals/fckplugins.js" />
	</PackageFile>

</Package>

--- NEW FILE: fckconfig.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckeditor_php4.php ---
<?php
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the integration file for PHP 4.
 *
 * It defines the FCKeditor class that can be used to create editor
 * instances in PHP pages on server side.
 */

class FCKeditor
{
	var $InstanceName ;
	var $BasePath ;
	var $Width ;
	var $Height ;
	var $ToolbarSet ;
	var $Value ;
	var $Config ;

	// PHP 4 Constructor
	function FCKeditor( $instanceName )
	{
		$this->InstanceName	= $instanceName ;
		$this->BasePath		= '/fckeditor/' ;
		$this->Width		= '100%' ;
		$this->Height		= '200' ;
		$this->ToolbarSet	= 'Default' ;
		$this->Value		= '' ;

		$this->Config		= array() ;
	}

	function Create()
	{
		echo $this->CreateHtml() ;
	}

	function CreateHtml()
	{
		$HtmlValue = htmlspecialchars( $this->Value ) ;

		$Html = '<div>' ;
		
		if ( !isset( $_GET ) ) {
			global $HTTP_GET_VARS ;
		    $_GET = $HTTP_GET_VARS ;
		}

		if ( $this->IsCompatible() )
		{
			if ( isset( $_GET['fcksource'] ) && $_GET['fcksource'] == "true" )
				$File = 'fckeditor.original.html' ;
			else
				$File = 'fckeditor.html' ;

			$Link = "{$this->BasePath}editor/{$File}?InstanceName={$this->InstanceName}" ;

			if ( $this->ToolbarSet != '' )
				$Link .= "&amp;Toolbar={$this->ToolbarSet}" ;

			// Render the linked hidden field.
			$Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}\" name=\"{$this->InstanceName}\" value=\"{$HtmlValue}\" style=\"display:none\" />" ;

			// Render the configurations hidden field.
			$Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}___Config\" value=\"" . $this->GetConfigFieldString() . "\" style=\"display:none\" />" ;

			// Render the editor IFRAME.
			$Html .= "<iframe id=\"{$this->InstanceName}___Frame\" src=\"{$Link}\" width=\"{$this->Width}\" height=\"{$this->Height}\" frameborder=\"0\" scrolling=\"no\"></iframe>" ;
		}
		else
		{
			if ( strpos( $this->Width, '%' ) === false )
				$WidthCSS = $this->Width . 'px' ;
			else
				$WidthCSS = $this->Width ;

			if ( strpos( $this->Height, '%' ) === false )
				$HeightCSS = $this->Height . 'px' ;
			else
				$HeightCSS = $this->Height ;

			$Html .= "<textarea name=\"{$this->InstanceName}\" rows=\"4\" cols=\"40\" style=\"width: {$WidthCSS}; height: {$HeightCSS}\">{$HtmlValue}</textarea>" ;
		}

		$Html .= '</div>' ;

		return $Html ;
	}

	function IsCompatible()
	{
		return FCKeditor_IsCompatibleBrowser() ;
	}

	function GetConfigFieldString()
	{
		$sParams = '' ;
		$bFirst = true ;

		foreach ( $this->Config as $sKey => $sValue )
		{
			if ( $bFirst == false )
				$sParams .= '&amp;' ;
			else
				$bFirst = false ;

			if ( $sValue === true )
				$sParams .= $this->EncodeConfig( $sKey ) . '=true' ;
			else if ( $sValue === false )
				$sParams .= $this->EncodeConfig( $sKey ) . '=false' ;
			else
				$sParams .= $this->EncodeConfig( $sKey ) . '=' . $this->EncodeConfig( $sValue ) ;
		}

		return $sParams ;
	}

	function EncodeConfig( $valueToEncode )
	{
		$chars = array(
			'&' => '%26',
			'=' => '%3D',
			'"' => '%22' ) ;

		return strtr( $valueToEncode,  $chars ) ;
	}
}

?>

--- NEW FILE: myconfig.js ---
FCKConfig.ToolbarSets["editor-toolbar1"] = [
    ['Source','-','Undo','Redo','-','Link','Unlink','-','Bold','Italic',
    '-','JustifyLeft','JustifyCenter','JustifyRight',
    '-','OrderedList','UnorderedList','Outdent','Indent','FitWindow','About']
] ;


FCKConfig.ToolbarSets["editor-toolbar2"] = [
    ['Source','-','Undo','Redo','-','Link','Unlink','-','Bold','Italic','Underline','StrikeThrough',
    '-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull',
    '-','OrderedList','UnorderedList','Outdent','Indent'],
    ['PasteText','PasteWord','-','FontName','FontSize','TextColor','BGColor','-','Rule','-','Image','Table','FitWindow','-','About']
] ;

FCKConfig.ToolbarSets["editor-toolbar3"] = [
    ['Source','Templates','-','Cut','Copy','Paste','PasteText','PasteWord','-',
    'Find','Replace','-','Undo','Redo','-','RemoveFormat','-','Link','Unlink','-',
    'Image','SpecialChar','-','Print','SpellCheck','FitWindow'],
    ['Table','Rule','Bold','Italic','Underline','StrikeThrough','-',
    'Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-',
    'OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor','-','About'],
    ['Style','-','FontFormat','-','FontName','-','FontSize']
] ;
--- NEW FILE: fckeditor_php5.php ---
<?php
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the integration file for PHP 5.
 *
 * It defines the FCKeditor class that can be used to create editor
 * instances in PHP pages on server side.
 */

class FCKeditor
{
	var $InstanceName ;
	var $BasePath ;
	var $Width ;
	var $Height ;
	var $ToolbarSet ;
	var $Value ;
	var $Config ;

	// PHP 5 Constructor (by Marcus Bointon <coolbru at users.sourceforge.net>)
	function __construct( $instanceName )
 	{
		$this->InstanceName	= $instanceName ;
		$this->BasePath		= '/fckeditor/' ;
		$this->Width		= '100%' ;
		$this->Height		= '200' ;
		$this->ToolbarSet	= 'Default' ;
		$this->Value		= '' ;

		$this->Config		= array() ;
	}

	function Create()
	{
		echo $this->CreateHtml() ;
	}

	function CreateHtml()
	{
		$HtmlValue = htmlspecialchars( $this->Value ) ;

		$Html = '<div>' ;

		if ( $this->IsCompatible() )
		{
			if ( isset( $_GET['fcksource'] ) && $_GET['fcksource'] == "true" )
				$File = 'fckeditor.original.html' ;
			else
				$File = 'fckeditor.html' ;

			$Link = "{$this->BasePath}editor/{$File}?InstanceName={$this->InstanceName}" ;

			if ( $this->ToolbarSet != '' )
				$Link .= "&amp;Toolbar={$this->ToolbarSet}" ;

			// Render the linked hidden field.
			$Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}\" name=\"{$this->InstanceName}\" value=\"{$HtmlValue}\" style=\"display:none\" />" ;

			// Render the configurations hidden field.
			$Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}___Config\" value=\"" . $this->GetConfigFieldString() . "\" style=\"display:none\" />" ;

			// Render the editor IFRAME.
			$Html .= "<iframe id=\"{$this->InstanceName}___Frame\" src=\"{$Link}\" width=\"{$this->Width}\" height=\"{$this->Height}\" frameborder=\"0\" scrolling=\"no\"></iframe>" ;
		}
		else
		{
			if ( strpos( $this->Width, '%' ) === false )
				$WidthCSS = $this->Width . 'px' ;
			else
				$WidthCSS = $this->Width ;

			if ( strpos( $this->Height, '%' ) === false )
				$HeightCSS = $this->Height . 'px' ;
			else
				$HeightCSS = $this->Height ;

			$Html .= "<textarea name=\"{$this->InstanceName}\" rows=\"4\" cols=\"40\" style=\"width: {$WidthCSS}; height: {$HeightCSS}\">{$HtmlValue}</textarea>" ;
		}

		$Html .= '</div>' ;

		return $Html ;
	}

	function IsCompatible()
	{
		return FCKeditor_IsCompatibleBrowser() ;
	}

	function GetConfigFieldString()
	{
		$sParams = '' ;
		$bFirst = true ;

		foreach ( $this->Config as $sKey => $sValue )
		{
			if ( $bFirst == false )
				$sParams .= '&amp;' ;
			else
				$bFirst = false ;

			if ( $sValue === true )
				$sParams .= $this->EncodeConfig( $sKey ) . '=true' ;
			else if ( $sValue === false )
				$sParams .= $this->EncodeConfig( $sKey ) . '=false' ;
			else
				$sParams .= $this->EncodeConfig( $sKey ) . '=' . $this->EncodeConfig( $sValue ) ;
		}

		return $sParams ;
	}

	function EncodeConfig( $valueToEncode )
	{
		$chars = array(
			'&' => '%26',
			'=' => '%3D',
			'"' => '%22' ) ;

		return strtr( $valueToEncode,  $chars ) ;
	}
}

?>
--- NEW FILE: license.txt ---
FCKeditor - The text editor for Internet - http://www.fckeditor.net
Copyright (C) 2003-2007 Frederico Caldeira Knabben

Licensed under the terms of any of the following licenses at your
choice:

 - GNU General Public License Version 2 or later (the "GPL")
   http://www.gnu.org/licenses/gpl.html
   (See Appendix A)

 - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
   http://www.gnu.org/licenses/lgpl.html
   (See Appendix B)

 - Mozilla Public License Version 1.1 or later (the "MPL")
   http://www.mozilla.org/MPL/MPL-1.1.html
   (See Appendix C)

You are not required to, but if you want to explicitly declare the
[...1208 lines suppressed...]
     _______________________. All Rights Reserved.

     Contributor(s): ______________________________________.

     Alternatively, the contents of this file may be used under the terms
     of the _____ license (the  "[___] License"), in which case the
     provisions of [______] License are applicable instead of those
     above.  If you wish to allow use of your version of this file only
     under the terms of the [____] License and not to allow others to use
     your version of this file under the MPL, indicate your decision by
     deleting  the provisions above and replace  them with the notice and
     other provisions required by the [___] License.  If you do not delete
     the provisions above, a recipient may use your version of this file
     under either the MPL or the [___] License."

     [NOTE: The text of this Exhibit A may differ slightly from the text of
     the notices in the Source Code files of the Original Code. You should
     use the text of this Exhibit A rather than the text found in the
     Original Code Source Code for Your Modifications.]


--- NEW FILE: _whatsnew.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>FCKeditor ChangeLog - What's New?</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<style type="text/css">
		body { font-family: arial, verdana, sans-serif }
		p { margin-left: 20px }
		h1 { border-bottom: solid 1px gray; padding-bottom: 20px }
	</style>
</head>
<body>
	<h1>
		FCKeditor ChangeLog - What's New?</h1>
	<h3>
		Version 2.5.1</h3>
	<p>
		New Features and Improvements:</p>
	<ul>
		<li><strong>FCKeditor.Net 2.5</strong> compatibility.</li>
		<li>JavaScript integration file:
			<ul>
				<li>The new "<strong>FCKeditor.ReplaceAllTextareas</strong>" function is being introduced,
					making it possible to replace many (or unknown) &lt;textarea&gt; elements in a single
					call. The replacement can be also filtered by CSS class name, or by a custom function
					evaluator. </li>
				<li>It is now possible to set the default BasePath for all editor instances by setting
					<strong>FCKeditor.BasePath</strong>. This is extremely useful when working with
					the ReplaceAllTextareas function. </li>
			</ul>
		</li>
	</ul>
	<p>
		Fixed Bugs:</p>
	<ul>
		<li>[<a href="http://dev.fckeditor.net/ticket/339" target="_blank">#339</a>] [<a
			href="http://dev.fckeditor.net/ticket/681" target="_blank">#681</a>] The SpellerPages
			spell checker will now completely ignore the presence of HTML tags in the text.
		</li>
		<li>[<a href="http://dev.fckeditor.net/ticket/1643" target="_blank">#1643</a>] Resolved
			several "strict warning" messages in Firefox when running FCKeditor. </li>
		<li>[<a href="http://dev.fckeditor.net/ticket/1603" target="_blank">#1603</a>] Certain
			specific markup was making FCKeditor entering in a loop, blocking its execution.
		</li>
		<li>[<a href="http://dev.fckeditor.net/ticket/1664" target="_blank">#1664</a>] The ENTER
			key will not any more swap the order of the tags when hit at the end of paragraphs.
		</li>
	</ul>
	<p>
		<a href="_whatsnew_history.html">See previous versions history</a>
	</p>
</body>
</html>

--- NEW FILE: _whatsnew_history.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
[...3300 lines suppressed...]
				<li>No more over...gif for every button (so the editor loads quicker). </li>
				<li>Buttons states are controlled with CSS styles. (see fck_editor.css).</li>
			</ul>
		</li>
		<li>Internet Explorer 5.0 compatibility, except for the image uploading popup. </li>
		<li>Optimizations when loading the editor. </li>
		<li>[SF BUG-709544] - Toolbar buttons wait for the images to be downloaded to start
			watching and responding the user actions (turn buttons on/off when the user changes
			position inside the editor). </li>
		<li>JavaScript integration is now Object Oriented. CreateFCKeditor function is not available
			anymore. Take a look in test.html. </li>
		<li>Two new configuration options, ImageBrowser and ImageUpload, are available to turn
			on and off the image upload and image browsing options in the Image dialog box.
			This options can be hidden for a specific editor instance throw specific URL parameter
			in the editor&rsquo;s IFRAME (upload=true/false&amp;browse=true/false). All specific
			language integration modules handle this option. For sample see the _test directory.
		</li>
	</ul>
</body>
</html>



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses
	fck_othercommands.js, 1.5, 1.6 fckblockquotecommand.js, NONE,
	1.1 fckcorestylecommand.js, NONE, 1.1 fckfitwindow.js, 1.2,
	1.3 fckindentcommands.js, NONE, 1.1 fckjustifycommands.js,
	NONE, 1.1 fcklistcommands.js, NONE, 1.1 fcknamedcommand.js,
	1.4, 1.5 fckpasteplaintextcommand.js, 1.4,
	1.5 fckpastewordcommand.js, 1.5, 1.6 fckremoveformatcommand.js,
	NONE, 1.1 fckshowblocks.js, NONE,
	1.1 fckspellcheckcommand_gecko.js, 1.3,
	1.4 fckspellcheckcommand_ie.js, 1.3, 1.4 fckstylecommand.js,
	1.4, 1.5 fcktablecommand.js, 1.5, 1.6 fcktextcolorcommand.js,
	1.4, 1.5
Message-ID: <20080209125401.BAB1010FE18@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/_source/commandclasses

Added Files:
	fck_othercommands.js fckblockquotecommand.js 
	fckcorestylecommand.js fckfitwindow.js fckindentcommands.js 
	fckjustifycommands.js fcklistcommands.js fcknamedcommand.js 
	fckpasteplaintextcommand.js fckpastewordcommand.js 
	fckremoveformatcommand.js fckshowblocks.js 
	fckspellcheckcommand_gecko.js fckspellcheckcommand_ie.js 
	fckstylecommand.js fcktablecommand.js fcktextcolorcommand.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fcktablecommand.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckpastewordcommand.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckindentcommands.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckcorestylecommand.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckfitwindow.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckspellcheckcommand_ie.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcknamedcommand.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckjustifycommands.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckstylecommand.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckblockquotecommand.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckspellcheckcommand_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckpasteplaintextcommand.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckshowblocks.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckremoveformatcommand.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcklistcommands.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_othercommands.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktextcolorcommand.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/_source/internals
	fck.js, 1.5, 1.6 fck_contextmenu.js, 1.2, 1.3 fck_gecko.js,
	NONE, 1.1 fck_ie.js, NONE, 1.1 fckbrowserinfo.js, 1.5,
	1.6 fckcodeformatter.js, 1.4, 1.5 fckcommands.js, 1.5,
	1.6 fckconfig.js, 1.4, 1.5 fckdebug.js, 1.4, 1.5 fckdialog.js,
	1.5, 1.6 fckdialog_gecko.js, 1.5, 1.6 fckdialog_ie.js, 1.4,
	1.5 fckdocumentprocessor.js, 1.3, 1.4 fckdomtools.js, NONE,
	1.1 fcklanguagemanager.js, 1.4, 1.5 fcklisthandler.js, NONE,
	1.1 fcklistslib.js, NONE, 1.1 fckplugins.js, 1.4,
	1.5 fckregexlib.js, 1.5, 1.6 fckselection.js, 1.4,
	1.5 fckselection_gecko.js, 1.4, 1.5 fckselection_ie.js, 1.4,
	1.5 fckstyles.js, NONE, 1.1 fcktablehandler.js, 1.5,
	1.6 fcktablehandler_gecko.js, 1.4, 1.5 fcktablehandler_ie.js,
	1.4, 1.5 fcktoolbaritems.js, 1.5, 1.6 fcktoolbarset.js, 1.5,
	1.6 fcktools.js, 1.6, 1.7 fcktools_gecko.js, 1.6,
	1.7 fcktools_ie.js, 1.5, 1.6 fckundo.js, NONE,
	1.1 fckurlparams.js, 1.4, 1.5 fckxhtml.js, 1.6,
	1.7 fckxhtml_gecko.js, 1.4, 1.5 fckxhtml_ie.js, 1.5,
	1.6 fckxhtmlentities.js, 1.4, 1.5
Message-ID: <20080209125401.BD6E710FE19@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/internals
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/_source/internals

Added Files:
	fck.js fck_contextmenu.js fck_gecko.js fck_ie.js 
	fckbrowserinfo.js fckcodeformatter.js fckcommands.js 
	fckconfig.js fckdebug.js fckdialog.js fckdialog_gecko.js 
	fckdialog_ie.js fckdocumentprocessor.js fckdomtools.js 
	fcklanguagemanager.js fcklisthandler.js fcklistslib.js 
	fckplugins.js fckregexlib.js fckselection.js 
	fckselection_gecko.js fckselection_ie.js fckstyles.js 
	fcktablehandler.js fcktablehandler_gecko.js 
	fcktablehandler_ie.js fcktoolbaritems.js fcktoolbarset.js 
	fcktools.js fcktools_gecko.js fcktools_ie.js fckundo.js 
	fckurlparams.js fckxhtml.js fckxhtml_gecko.js fckxhtml_ie.js 
	fckxhtmlentities.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckbrowserinfo.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarset.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktools_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktools_ie.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdialog_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcklisthandler.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdialog.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckstyles.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckxhtml_ie.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcklanguagemanager.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckcommands.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktools.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckregexlib.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdomtools.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckurlparams.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckcodeformatter.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckselection.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbaritems.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktablehandler.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_ie.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckplugins.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktablehandler_ie.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckselection_ie.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckxhtmlentities.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktablehandler_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckxhtml_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcklistslib.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdocumentprocessor.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckselection_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_contextmenu.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckxhtml.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckundo.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckconfig.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdebug.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdialog_ie.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_about
	logo_fckeditor.gif, 1.2, 1.3 logo_fredck.gif, 1.2, 1.3
Message-ID: <20080209125401.CEB2410FE1D@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_about
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/fck_about

Added Files:
	logo_fckeditor.gif logo_fredck.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: logo_fckeditor.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: logo_fredck.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images
	ButtonArrow.gif, 1.2, 1.3 Folder.gif, 1.2, 1.3 Folder32.gif,
	1.2, 1.3 FolderOpened.gif, 1.2, 1.3 FolderOpened32.gif, 1.2,
	1.3 FolderUp.gif, 1.2, 1.3 spacer.gif, 1.2, 1.3
Message-ID: <20080209125402.2CA4910FE2A@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/browser/default/images

Added Files:
	ButtonArrow.gif Folder.gif Folder32.gif FolderOpened.gif 
	FolderOpened32.gif FolderUp.gif spacer.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: spacer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: FolderUp.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: FolderOpened.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: Folder32.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: FolderOpened32.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ButtonArrow.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: Folder.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash
	fck_flash.js, 1.3, 1.4 fck_flash_preview.html, 1.2, 1.3
Message-ID: <20080209125401.E292D10FE20@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/fck_flash

Added Files:
	fck_flash.js fck_flash_preview.html 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_flash_preview.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Preview page for the Flash dialog window.
-->
<html>
	<head>
		<title></title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta name="robots" content="noindex, nofollow">
		<link href="../common/fck_dialog_common.css" rel="stylesheet" type="text/css" />
		<script language="javascript">

// Sets the Skin CSS
document.write( '<link href="' + window.parent.FCKConfig.SkinPath + 'fck_dialog.css" type="text/css" rel="stylesheet">' ) ;

if ( window.parent.FCKConfig.BaseHref.length > 0 )
	document.write( '<base href="' + window.parent.FCKConfig.BaseHref + '">' ) ;

window.onload = function()
{
	window.parent.SetPreviewElement( document.body ) ;
}

		</script>
	</head>
	<body style="COLOR: #000000; BACKGROUND-COLOR: #ffffff"></body>
</html>

--- NEW FILE: fck_flash.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp
	basexml.asp, NONE, 1.1 class_upload.asp, NONE,
	1.1 commands.asp, NONE, 1.1 config.asp, NONE,
	1.1 connector.asp, NONE, 1.1 io.asp, NONE, 1.1 upload.asp,
	NONE, 1.1 util.asp, NONE, 1.1
Message-ID: <20080209125402.4F6F510FE2D@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/connectors/asp

Added Files:
	basexml.asp class_upload.asp commands.asp config.asp 
	connector.asp io.asp upload.asp util.asp 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: config.asp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: class_upload.asp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: basexml.asp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: io.asp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: connector.asp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: util.asp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: commands.asp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: upload.asp ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops
	fck_document_preview.html, 1.3, 1.4
Message-ID: <20080209125401.E283310FE1F@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/fck_docprops

Added Files:
	fck_document_preview.html 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_document_preview.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Preview shown in the "Document Properties" dialog window.
-->
<html>
	<head>
		<title>Document Properties - Preview</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta name="robots" content="noindex, nofollow">
		<script language="javascript">

var eBase = parent.FCK.EditorDocument.getElementsByTagName( 'BASE' ) ;
if ( eBase.length > 0 && eBase[0].href.length > 0 )
{
	document.write( '<base href="' + eBase[0].href + '">' ) ;
}

window.onload = function()
{
	if ( typeof( parent.OnPreviewLoad ) == 'function' )
		parent.OnPreviewLoad( window, document.body ) ;
}

function SetBaseHRef( baseHref )
{
	var eBase = document.createElement( 'BASE' ) ;
	eBase.href = baseHref ;

	var eHead = document.getElementsByTagName( 'HEAD' )[0] ;
	eHead.appendChild( eBase ) ;
}

function SetLinkColor( color )
{
	if ( color && color.length > 0 )
		document.getElementById('eLink').style.color = color ;
	else
		document.getElementById('eLink').style.color = window.document.linkColor ;
}

function SetVisitedColor( color )
{
	if ( color && color.length > 0 )
		document.getElementById('eVisited').style.color = color ;
	else
		document.getElementById('eVisited').style.color = window.document.vlinkColor ;
}

function SetActiveColor( color )
{
	if ( color && color.length > 0 )
		document.getElementById('eActive').style.color = color ;
	else
		document.getElementById('eActive').style.color = window.document.alinkColor ;
}
		</script>
	</head>
	<body>
		<table width="100%" height="100%" cellpadding="0" cellspacing="0" border="0">
			<tr>
				<td align="center" valign="middle">
					Normal Text
				</td>
				<td id="eLink" align="center" valign="middle">
					<u>Link Text</u>
				</td>
			</tr>
			<tr>
				<td id="eVisited" valign="middle" align="center">
					<u>Visited Link</u>
				</td>
				<td id="eActive" valign="middle" align="center">
					<u>Active Link</u>
				</td>
			</tr>
		</table>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
		<br>
	</body>
</html>



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode/_sample
	sample.config.js, NONE, 1.1 sample.html, NONE, 1.1
Message-ID: <20080209125402.9D19510FE7C@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode/_sample
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/plugins/bbcode/_sample

Added Files:
	sample.config.js sample.html 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: sample.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Sample page.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>FCKeditor - BBCode Sample</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="robots" content="noindex, nofollow" />
	<link href="../../../../_samples/sample.css" rel="stylesheet" type="text/css" />
	<script type="text/javascript" src="../../../../fckeditor.js"></script>
</head>
<body>
	<h1>
		FCKeditor - BBCode Sample</h1>
	<p>
		This is a sample of custom Data Processor implementation for (very) basic BBCode
		syntax. Only <strong>[b]</strong>, <strong>[i]</strong>, <strong>[u]</strong> and
		<strong>[url]</strong> may be used. It may be extended, but this is out of this
		sample purpose.
	</p>
	<p>
		Note that the input and output of the editor is not HTML, but BBCode
	</p>
	<hr />
	<form action="../../../../_samples/html/sampleposteddata.asp" method="post" target="_blank">
		<script type="text/javascript">
<!--
// Automatically calculates the editor base path based on the _samples directory.
// This is usefull only for these samples. A real application should use something like this:
// oFCKeditor.BasePath = '/fckeditor/' ;	// '/fckeditor/' is the default value.
var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('editor')) ;

var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ;
oFCKeditor.BasePath	= sBasePath ;

// Set the custom configurations file path (in this way the original file is mantained).
oFCKeditor.Config['CustomConfigurationsPath'] = sBasePath + 'editor/plugins/bbcode/_sample/sample.config.js' ;

oFCKeditor.Value = 'This is some [b]sample text[/b]. You are using [url=http://www.fckeditor.net/]FCKeditor[/url].' ;
oFCKeditor.Create() ;
//-->
		</script>
		<br />
		<input type="submit" value="Submit" />
	</form>
</body>
</html>

--- NEW FILE: sample.config.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/common/images
	locked.gif, 1.2, 1.3 reset.gif, 1.2, 1.3 unlocked.gif, 1.2, 1.3
Message-ID: <20080209125401.D2C2110FE1E@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/common/images
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/common/images

Added Files:
	locked.gif reset.gif unlocked.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: reset.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: locked.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: unlocked.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors
	test.html, NONE, 1.1 uploadtest.html, NONE, 1.1
Message-ID: <20080209125402.73FFC10FE72@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/connectors

Added Files:
	test.html uploadtest.html 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: test.html ---
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Test page for the File Browser connectors.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>FCKeditor - Connectors Tests</title>
	<script type="text/javascript">

function BuildBaseUrl( command )
{
	var sUrl =
		document.getElementById('cmbConnector').value +
		'?Command=' + command +
		'&Type=' + document.getElementById('cmbType').value +
		'&CurrentFolder=' + encodeURIComponent(document.getElementById('txtFolder').value) ;

	return sUrl ;
}

function SetFrameUrl( url )
{
	document.getElementById('eRunningFrame').src = url ;

	document.getElementById('eUrl').innerHTML = url ;
}

function GetFolders()
{
	SetFrameUrl( BuildBaseUrl( 'GetFolders' ) ) ;
	return false ;
}

function GetFoldersAndFiles()
{
	SetFrameUrl( BuildBaseUrl( 'GetFoldersAndFiles' ) ) ;
	return false ;
}

function CreateFolder()
{
	var sFolder = prompt( 'Type the folder name:', 'Test Folder' ) ;

	if ( ! sFolder )
		return false ;

	var sUrl = BuildBaseUrl( 'CreateFolder' ) ;
	sUrl += '&NewFolderName=' + encodeURIComponent( sFolder ) ;

	SetFrameUrl( sUrl ) ;
	return false ;
}

function OnUploadCompleted( errorNumber, fileName )
{
	switch ( errorNumber )
	{
		case 0 :
			alert( 'File uploaded with no errors' ) ;
			break ;
		case 201 :
			GetFoldersAndFiles() ;
			alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ;
			break ;
		case 202 :
			alert( 'Invalid file' ) ;
			break ;
		default :
			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
			break ;
	}
}

this.frames.frmUpload = this ;

function SetAction()
{
	var sUrl = BuildBaseUrl( 'FileUpload' ) ;
	document.getElementById('eUrl').innerHTML = sUrl ;
	document.getElementById('frmUpload').action = sUrl ;
}

	</script>
</head>
<body>
	<table height="100%" cellspacing="0" cellpadding="0" width="100%" border="0">
		<tr>
			<td>
				<table cellspacing="0" cellpadding="0" border="0">
					<tr>
						<td>
							Connector:<br />
							<select id="cmbConnector" name="cmbConnector">
								<option value="asp/connector.asp" selected="selected">ASP</option>
								<option value="aspx/connector.aspx">ASP.Net</option>
								<option value="cfm/connector.cfm">ColdFusion</option>
								<option value="lasso/connector.lasso">Lasso</option>
								<option value="perl/connector.cgi">Perl</option>
								<option value="php/connector.php">PHP</option>
								<option value="py/connector.py">Python</option>
							</select>
						</td>
						<td>
							&nbsp;&nbsp;&nbsp;</td>
						<td>
							Current Folder<br />
							<input id="txtFolder" type="text" value="/" name="txtFolder" /></td>
						<td>
							&nbsp;&nbsp;&nbsp;</td>
						<td>
							Resource Type<br />
							<select id="cmbType" name="cmbType">
								<option value="File" selected="selected">File</option>
								<option value="Image">Image</option>
								<option value="Flash">Flash</option>
								<option value="Media">Media</option>
								<option value="Invalid">Invalid Type (for testing)</option>
							</select>
						</td>
					</tr>
				</table>
				<br />
				<table cellspacing="0" cellpadding="0" border="0">
					<tr>
						<td valign="top">
							<a href="#" onclick="GetFolders();">Get Folders</a></td>
						<td>
							&nbsp;&nbsp;&nbsp;</td>
						<td valign="top">
							<a href="#" onclick="GetFoldersAndFiles();">Get Folders and Files</a></td>
						<td>
							&nbsp;&nbsp;&nbsp;</td>
						<td valign="top">
							<a href="#" onclick="CreateFolder();">Create Folder</a></td>
						<td>
							&nbsp;&nbsp;&nbsp;</td>
						<td valign="top">
							<form id="frmUpload" action="" target="eRunningFrame" method="post" enctype="multipart/form-data">
								File Upload<br />
								<input id="txtFileUpload" type="file" name="NewFile" />
								<input type="submit" value="Upload" onclick="SetAction();" />
							</form>
						</td>
					</tr>
				</table>
				<br />
				URL: <span id="eUrl"></span>
			</td>
		</tr>
		<tr>
			<td height="100%" valign="top">
				<iframe id="eRunningFrame" src="javascript:void(0)" name="eRunningFrame" width="100%"
					height="100%"></iframe>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: uploadtest.html ---
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Test page for the "File Uploaders".
-->
<html>
	<head>
		<title>FCKeditor - Uploaders Tests</title>
		<script type="text/javascript">

function SendFile()
{
	var sUploaderUrl = cmbUploaderUrl.value ;

	if ( sUploaderUrl.length == 0 )
		sUploaderUrl = txtCustomUrl.value ;

	if ( sUploaderUrl.length == 0 )
	{
		alert( 'Please provide your custom URL or select a default one' ) ;
		return ;
	}

	eURL.innerHTML = sUploaderUrl ;
	txtUrl.value = '' ;

	frmUpload.action = sUploaderUrl;
	if (document.getElementById('cmbType').value) {
		frmUpload.action = frmUpload.action + '?Type='+document.getElementById('cmbType').value;
	}
	frmUpload.submit() ;
}

function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
{
	switch ( errorNumber )
	{
		case 0 :	// No errors
			txtUrl.value = fileUrl ;
			alert( 'File uploaded with no errors' ) ;
			break ;
		case 1 :	// Custom error
			alert( customMsg ) ;
			break ;
		case 10 :	// Custom warning
			txtUrl.value = fileUrl ;
			alert( customMsg ) ;
			break ;
		case 201 :
			txtUrl.value = fileUrl ;
			alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ;
			break ;
		case 202 :
			alert( 'Invalid file' ) ;
			break ;
		case 203 :
			alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ;
			break ;
		default :
			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
			break ;
	}
}

		</script>
	</head>
	<body>
		<table cellSpacing="0" cellPadding="0" width="100%" border="0" height="100%">
			<tr>
				<td>
					<table cellSpacing="0" cellPadding="0" width="100%" border="0">
						<tr>
							<td nowrap>
								Select the "File Uploader" to use:<br>
								<select id="cmbUploaderUrl">
									<option selected value="asp/upload.asp">ASP</option>
									<option value="aspx/upload.aspx">ASP.Net</option>
									<option value="cfm/upload.cfm">ColdFusion</option>
									<option value="lasso/upload.lasso">Lasso</option>
									<option value="perl/upload.cgi">Perl</option>
									<option value="php/upload.php">PHP</option>
									<option value="py/upload.py">Python</option>
									<option value="">(Custom)</option>
								</select>
							</td>
						<td>
							Resource Type<br />
							<select id="cmbType" name="cmbType">
								<option value="">None</option>
								<option value="File">File</option>
								<option value="Image">Image</option>
								<option value="Flash">Flash</option>
								<option value="Media">Media</option>
								<option value="Invalid">Invalid Type (for testing)</option>
							</select>
						</td>
							<td nowrap>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
							<td width="100%">
								Custom Uploader URL:<BR>
								<input id="txtCustomUrl" style="WIDTH: 100%; BACKGROUND-COLOR: #dcdcdc" disabled type="text">
							</td>
						</tr>
					</table>
					<br>
					<table cellSpacing="0" cellPadding="0" width="100%" border="0">
						<tr>
							<td noWrap>
								<form id="frmUpload" target="UploadWindow" enctype="multipart/form-data" action="" method="post">
									Upload a new file:<br>
									<input type="file" name="NewFile"><br>
									<input type="button" value="Send it to the Server" onclick="SendFile();">
								</form>
							</td>
							<td style="WIDTH: 16px">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
							<td vAlign="top" width="100%">
								Uploaded File URL:<br>
								<INPUT id="txtUrl" style="WIDTH: 100%" readonly type="text">
							</td>
						</tr>
					</table>
					<br>
					Post URL: <span id="eURL">&nbsp;</span>
				</td>
			</tr>
			<tr>
				<td height="100%">
					<iframe name="UploadWindow" width="100%" height="100%" src="javascript:void(0)"></iframe>
				</td>
			</tr>
		</table>
	</body>
</html>



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/autogrow
	fckplugin.js, 1.3, 1.4
Message-ID: <20080209125402.962F010FE7B@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/autogrow
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/plugins/autogrow

Added Files:
	fckplugin.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckplugin.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php
	basexml.php, NONE, 1.1 commands.php, NONE, 1.1 config.php,
	NONE, 1.1 connector.php, NONE, 1.1 io.php, NONE,
	1.1 phpcompat.php, NONE, 1.1 upload.php, NONE, 1.1 util.php,
	NONE, 1.1
Message-ID: <20080209125402.73CC310FE70@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/connectors/php

Added Files:
	basexml.php commands.php config.php connector.php io.php 
	phpcompat.php upload.php util.php 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: connector.php ---
<?php
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the File Manager Connector for PHP.
 */

ob_start() ;

require('./config.php') ;
require('./util.php') ;
require('./io.php') ;
require('./basexml.php') ;
require('./commands.php') ;
require('./phpcompat.php') ;

if ( !$Config['Enabled'] )
	SendError( 1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file' ) ;

DoResponse() ;

function DoResponse()
{
    if (!isset($_GET)) {
        global $_GET;
    }
	if ( !isset( $_GET['Command'] ) || !isset( $_GET['Type'] ) || !isset( $_GET['CurrentFolder'] ) )
		return ;

	// Get the main request informaiton.
	$sCommand		= $_GET['Command'] ;
	$sResourceType	= $_GET['Type'] ;
	$sCurrentFolder	= GetCurrentFolder() ;

	// Check if it is an allowed command 
	if ( ! IsAllowedCommand( $sCommand ) ) 
		SendError( 1, 'The "' . $sCommand . '" command isn\'t allowed' ) ;

	// Check if it is an allowed type.
	if ( !IsAllowedType( $sResourceType ) )
		SendError( 1, 'Invalid type specified' ) ;

	// File Upload doesn't have to Return XML, so it must be intercepted before anything.
	if ( $sCommand == 'FileUpload' )
	{
		FileUpload( $sResourceType, $sCurrentFolder, $sCommand ) ;
		return ;
	}

	CreateXmlHeader( $sCommand, $sResourceType, $sCurrentFolder ) ;

	// Execute the required command.
	switch ( $sCommand )
	{
		case 'GetFolders' :
			GetFolders( $sResourceType, $sCurrentFolder ) ;
			break ;
		case 'GetFoldersAndFiles' :
			GetFoldersAndFiles( $sResourceType, $sCurrentFolder ) ;
			break ;
		case 'CreateFolder' :
			CreateFolder( $sResourceType, $sCurrentFolder ) ;
			break ;
	}

	CreateXmlFooter() ;

	exit ;
}
?>
--- NEW FILE: commands.php ---
<?php
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the File Manager Connector for PHP.
 */

function GetFolders( $resourceType, $currentFolder )
{
	// Map the virtual path to the local server path.
	$sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'GetFolders' ) ;

	// Array that will hold the folders names.
	$aFolders	= array() ;

	$oCurrentFolder = opendir( $sServerDir ) ;

	while ( $sFile = readdir( $oCurrentFolder ) )
	{
		if ( $sFile != '.' && $sFile != '..' && is_dir( $sServerDir . $sFile ) )
			$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
	}

	closedir( $oCurrentFolder ) ;

	// Open the "Folders" node.
	echo "<Folders>" ;

	natcasesort( $aFolders ) ;
	foreach ( $aFolders as $sFolder )
		echo $sFolder ;

	// Close the "Folders" node.
	echo "</Folders>" ;
}

function GetFoldersAndFiles( $resourceType, $currentFolder )
{
	// Map the virtual path to the local server path.
	$sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'GetFoldersAndFiles' ) ;

	// Arrays that will hold the folders and files names.
	$aFolders	= array() ;
	$aFiles		= array() ;

	$oCurrentFolder = opendir( $sServerDir ) ;

	while ( $sFile = readdir( $oCurrentFolder ) )
	{
		if ( $sFile != '.' && $sFile != '..' )
		{
			if ( is_dir( $sServerDir . $sFile ) )
				$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
			else
			{
				$iFileSize = @filesize( $sServerDir . $sFile ) ;
				if ( !$iFileSize ) {
					$iFileSize = 0 ;
				}
				if ( $iFileSize > 0 )
				{
					$iFileSize = round( $iFileSize / 1024 ) ;
					if ( $iFileSize < 1 ) $iFileSize = 1 ;
				}

				$aFiles[] = '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
			}
		}
	}

	// Send the folders
	natcasesort( $aFolders ) ;
	echo '<Folders>' ;

	foreach ( $aFolders as $sFolder )
		echo $sFolder ;

	echo '</Folders>' ;

	// Send the files
	natcasesort( $aFiles ) ;
	echo '<Files>' ;

	foreach ( $aFiles as $sFiles )
		echo $sFiles ;

	echo '</Files>' ;
}

function CreateFolder( $resourceType, $currentFolder )
{
	if (!isset($_GET)) {
		global $_GET;
	}
	$sErrorNumber	= '0' ;
	$sErrorMsg		= '' ;

	if ( isset( $_GET['NewFolderName'] ) )
	{
		$sNewFolderName = $_GET['NewFolderName'] ;
		$sNewFolderName = SanitizeFolderName( $sNewFolderName ) ;

		if ( strpos( $sNewFolderName, '..' ) !== FALSE )
			$sErrorNumber = '102' ;		// Invalid folder name.
		else
		{
			// Map the virtual path to the local server path of the current folder.
			$sServerDir = ServerMapFolder( $resourceType, $currentFolder, 'CreateFolder' ) ;

			if ( is_writable( $sServerDir ) )
			{
				$sServerDir .= $sNewFolderName ;

				$sErrorMsg = CreateServerFolder( $sServerDir ) ;

				switch ( $sErrorMsg )
				{
					case '' :
						$sErrorNumber = '0' ;
						break ;
					case 'Invalid argument' :
					case 'No such file or directory' :
						$sErrorNumber = '102' ;		// Path too long.
						break ;
					default :
						$sErrorNumber = '110' ;
						break ;
				}
			}
			else
				$sErrorNumber = '103' ;
		}
	}
	else
		$sErrorNumber = '102' ;

	// Create the "Error" node.
	echo '<Error number="' . $sErrorNumber . '" originalDescription="' . ConvertToXmlAttribute( $sErrorMsg ) . '" />' ;
}

function FileUpload( $resourceType, $currentFolder, $sCommand )
{
	if (!isset($_FILES)) {
		global $_FILES;
	}
	$sErrorNumber = '0' ;
	$sFileName = '' ;

	if ( isset( $_FILES['NewFile'] ) && !is_null( $_FILES['NewFile']['tmp_name'] ) )
	{
		global $Config ;

		$oFile = $_FILES['NewFile'] ;

		// Map the virtual path to the local server path.
		$sServerDir = ServerMapFolder( $resourceType, $currentFolder, $sCommand ) ;

		// Get the uploaded file name.
		$sFileName = $oFile['name'] ;
		$sFileName = SanitizeFileName( $sFileName ) ;

		$sOriginalFileName = $sFileName ;

		// Get the extension.
		$sExtension = substr( $sFileName, ( strrpos($sFileName, '.') + 1 ) ) ;
		$sExtension = strtolower( $sExtension ) ;

		if ( isset( $Config['SecureImageUploads'] ) )
		{
			if ( !IsImageValid( $oFile['tmp_name'], $sExtension ) )
			{
				$sErrorNumber = '202' ;
			}
		}
		
		if ( isset( $Config['HtmlExtensions'] ) )
		{
			if ( !IsHtmlExtension( $sExtension, $Config['HtmlExtensions'] ) && DetectHtml( $oFile['tmp_name'] ) )
			{
				$sErrorNumber = '202' ;
			}
		}

		// Check if it is an allowed extension.
		if ( !$sErrorNumber && IsAllowedExt( $sExtension, $resourceType ) )
		{
			$iCounter = 0 ;

			while ( true )
			{
				$sFilePath = $sServerDir . $sFileName ;

				if ( is_file( $sFilePath ) )
				{
					$iCounter++ ;
					$sFileName = RemoveExtension( $sOriginalFileName ) . '(' . $iCounter . ').' . $sExtension ;
					$sErrorNumber = '201' ;
				}
				else
				{
					move_uploaded_file( $oFile['tmp_name'], $sFilePath ) ;

					if ( is_file( $sFilePath ) )
					{
						$oldumask = umask(0) ;
						chmod( $sFilePath, 0777 ) ;
						umask( $oldumask ) ;
					}

					break ;
				}
			}
		}
		else
			$sErrorNumber = '202' ;
	}
	else
		$sErrorNumber = '202' ;


	$sFileUrl = CombinePaths( GetResourceTypePath( $resourceType, $sCommand ) , $currentFolder ) ;
	$sFileUrl = CombinePaths( $sFileUrl, $sFileName ) ;

	SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName ) ;

	exit ;
}
?>
--- NEW FILE: upload.php ---
<?php
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the "File Uploader" for PHP.
 */

require('./config.php') ;
require('./util.php') ;
require('./io.php') ;
require('./commands.php') ;
require('./phpcompat.php') ;

function SendError( $number, $text )
{
	SendUploadResults( $number, '', '', $text ) ;
}


// Check if this uploader has been enabled.
if ( !$Config['Enabled'] )
	SendUploadResults( '1', '', '', 'This file uploader is disabled. Please check the "editor/filemanager/connectors/php/config.php" file' ) ;

$sCommand = 'QuickUpload' ;

// The file type (from the QueryString, by default 'File').
$sType = isset( $_GET['Type'] ) ? $_GET['Type'] : 'File' ;

$sCurrentFolder	= GetCurrentFolder() ; 

// Is enabled the upload?
if ( ! IsAllowedCommand( $sCommand ) ) 
	SendUploadResults( '1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed' ) ;

// Check if it is an allowed type.
if ( !IsAllowedType( $sType ) )
    SendUploadResults( 1, '', '', 'Invalid type specified' ) ;


FileUpload( $sType, $sCurrentFolder, $sCommand )

?>
--- NEW FILE: basexml.php ---
<?php
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * These functions define the base of the XML response sent by the PHP
 * connector.
 */

function SetXmlHeaders()
{
	ob_end_clean() ;

	// Prevent the browser from caching the result.
	// Date in the past
	header('Expires: Mon, 26 Jul 1997 05:00:00 GMT') ;
	// always modified
	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT') ;
	// HTTP/1.1
	header('Cache-Control: no-store, no-cache, must-revalidate') ;
	header('Cache-Control: post-check=0, pre-check=0', false) ;
	// HTTP/1.0
	header('Pragma: no-cache') ;

	// Set the response format.
	header( 'Content-Type: text/xml; charset=utf-8' ) ;
}

function CreateXmlHeader( $command, $resourceType, $currentFolder )
{
	SetXmlHeaders() ;

	// Create the XML document header.
	echo '<?xml version="1.0" encoding="utf-8" ?>' ;

	// Create the main "Connector" node.
	echo '<Connector command="' . $command . '" resourceType="' . $resourceType . '">' ;

	// Add the current folder node.
	echo '<CurrentFolder path="' . ConvertToXmlAttribute( $currentFolder ) . '" url="' . ConvertToXmlAttribute( GetUrlFromPath( $resourceType, $currentFolder, $command ) ) . '" />' ;

	$GLOBALS['HeaderSent'] = true ;
}

function CreateXmlFooter()
{
	echo '</Connector>' ;
}

function SendError( $number, $text )
{
	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
	{ 
		SendErrorNode( $number, $text ) ;
		CreateXmlFooter() ;
	}
	else
	{
		SetXmlHeaders() ;

		// Create the XML document header
		echo '<?xml version="1.0" encoding="utf-8" ?>' ;

		echo '<Connector>' ;
		
		SendErrorNode( $number, $text ) ;
		
		echo '</Connector>' ;
	}
	exit ;
}

function SendErrorNode(  $number, $text )
{
	echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
}
?>
--- NEW FILE: config.php ---
<?php
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Configuration file for the File Manager Connector for PHP.
 */

include ('../../../../../lib-common.php');
global $Config ;

// SECURITY: You must explicitly enable this "connector". (Set it to "true").
// WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only
//		authenticated users can access this file or use some kind of session checking.
$Config['Enabled'] = true ;


// Path to user files relative to the document root.
// $Config['UserFilesPath'] = '/userfiles/' ;
$Config['UserFilesPath'] = $_CONF['site_url'] . $_CONF_FCK['imagelibrary'] . '/' ;



// Fill the following value it you prefer to specify the absolute path for the
// user files directory. Useful if you are using a virtual directory, symbolic
// link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
// Attention: The above 'UserFilesPath' must point to the same directory.
//$Config['UserFilesAbsolutePath'] = '' ;
$Config['UserFilesAbsolutePath'] = $_CONF['path_html'] . $_CONF_FCK['imagelibrary'] . '/';

// Due to security issues with Apache modules, it is recommended to leave the
// following setting enabled.
$Config['ForceSingleExtension'] = true ;

// Perform additional checks for image files
// if set to true, validate image size (using getimagesize)
$Config['SecureImageUploads'] = true;

// What the user can do with this connector
$Config['ConfigAllowedCommands'] = array('QuickUpload', 'FileUpload', 'GetFolders', 'GetFoldersAndFiles', 'CreateFolder') ;

// Allowed Resource Types
$Config['ConfigAllowedTypes'] = array('File', 'Image', 'Flash', 'Media') ;

// For security, HTML is allowed in the first Kb of data for files having the
// following extensions only.
$Config['HtmlExtensions'] = array("html", "htm", "xml", "xsd", "txt", "js") ;

/*
	Configuration settings for each Resource Type

	- AllowedExtensions: the possible extensions that can be allowed.
		If it is empty then any file type can be uploaded.
	- DeniedExtensions: The extensions that won't be allowed.
		If it is empty then no restrictions are done here.

	For a file to be uploaded it has to fulfill both the AllowedExtensions
	and DeniedExtensions (that's it: not being denied) conditions.

	- FileTypesPath: the virtual folder relative to the document root where
		these resources will be located.
		Attention: It must start and end with a slash: '/'

	- FileTypesAbsolutePath: the physical path to the above folder. It must be
		an absolute path.
		If it's an empty string then it will be autocalculated.
		Useful if you are using a virtual directory, symbolic link or alias.
		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
		Attention: The above 'FileTypesPath' must point to the same directory.
		Attention: It must end with a slash: '/'

	 - QuickUploadPath: the virtual folder relative to the document root where
		these resources will be uploaded using the Upload tab in the resources
		dialogs.
		Attention: It must start and end with a slash: '/'

	 - QuickUploadAbsolutePath: the physical path to the above folder. It must be
		an absolute path.
		If it's an empty string then it will be autocalculated.
		Useful if you are using a virtual directory, symbolic link or alias.
		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
		Attention: The above 'QuickUploadPath' must point to the same directory.
		Attention: It must end with a slash: '/'

	 	NOTE: by default, QuickUploadPath and QuickUploadAbsolutePath point to
	 	"userfiles" directory to maintain backwards compatibility with older versions of FCKeditor.
	 	This is fine, but you in some cases you will be not able to browse uploaded files using file browser.
	 	Example: if you click on "image button", select "Upload" tab and send image
	 	to the server, image will appear in FCKeditor correctly, but because it is placed
	 	directly in /userfiles/ directory, you'll be not able to see it in built-in file browser.
	 	The more expected behaviour would be to send images directly to "image" subfolder.
	 	To achieve that, simply change
			$Config['QuickUploadPath']['Image']			= $Config['UserFilesPath'] ;
			$Config['QuickUploadAbsolutePath']['Image']	= $Config['UserFilesAbsolutePath'] ;
		into:
			$Config['QuickUploadPath']['Image']			= $Config['FileTypesPath']['Image'] ;
			$Config['QuickUploadAbsolutePath']['Image'] 	= $Config['FileTypesAbsolutePath']['Image'] ;

*/

$Config['AllowedExtensions']['File']	= array('7z', 'aiff', 'asf', 'avi', 'bmp', 'csv', 'doc', 'fla', 'flv', 'gif', 'gz', 'gzip', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'ods', 'odt', 'pdf', 'png', 'ppt', 'pxd', 'qt', 'ram', 'rar', 'rm', 'rmi', 'rmvb', 'rtf', 'sdc', 'sitd', 'swf', 'sxc', 'sxw', 'tar', 'tgz', 'tif', 'tiff', 'txt', 'vsd', 'wav', 'wma', 'wmv', 'xls', 'xml', 'zip') ;
$Config['DeniedExtensions']['File']		= array() ;
$Config['FileTypesPath']['File']		= $Config['UserFilesPath'] . 'file/' ;
$Config['FileTypesAbsolutePath']['File']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/' ;
$Config['QuickUploadPath']['File']		= $Config['UserFilesPath'] ;
$Config['QuickUploadAbsolutePath']['File']= $Config['UserFilesAbsolutePath'] ;

$Config['AllowedExtensions']['Image']	= array('bmp','gif','jpeg','jpg','png') ;
$Config['DeniedExtensions']['Image']	= array() ;
$Config['FileTypesPath']['Image']		= $Config['UserFilesPath'] . 'Image/' ;
$Config['FileTypesAbsolutePath']['Image']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/' ;
$Config['QuickUploadPath']['Image']		= $Config['UserFilesPath'] ;
$Config['QuickUploadAbsolutePath']['Image']= $Config['UserFilesAbsolutePath'] ;

$Config['AllowedExtensions']['Flash']	= array('swf','flv') ;
$Config['DeniedExtensions']['Flash']	= array() ;
$Config['FileTypesPath']['Flash']		= $Config['UserFilesPath'] . 'Flash/' ;
$Config['FileTypesAbsolutePath']['Flash']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'flash/' ;
$Config['QuickUploadPath']['Flash']		= $Config['UserFilesPath'] ;
$Config['QuickUploadAbsolutePath']['Flash']= $Config['UserFilesAbsolutePath'] ;

$Config['AllowedExtensions']['Media']	= array('aiff', 'asf', 'avi', 'bmp', 'fla', 'flv', 'gif', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'png', 'qt', 'ram', 'rm', 'rmi', 'rmvb', 'swf', 'tif', 'tiff', 'wav', 'wma', 'wmv') ;
$Config['DeniedExtensions']['Media']	= array() ;
$Config['FileTypesPath']['Media']		= $Config['UserFilesPath'] . 'Media/' ;
$Config['FileTypesAbsolutePath']['Media']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'media/' ;
$Config['QuickUploadPath']['Media']		= $Config['UserFilesPath'] ;
$Config['QuickUploadAbsolutePath']['Media']= $Config['UserFilesAbsolutePath'] ;

?>
--- NEW FILE: util.php ---
<?php
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Utility functions for the File Manager Connector for PHP.
 */

function RemoveFromStart( $sourceString, $charToRemove )
{
	$sPattern = '|^' . $charToRemove . '+|' ;
	return preg_replace( $sPattern, '', $sourceString ) ;
}

function RemoveFromEnd( $sourceString, $charToRemove )
{
	$sPattern = '|' . $charToRemove . '+$|' ;
	return preg_replace( $sPattern, '', $sourceString ) ;
}

function ConvertToXmlAttribute( $value )
{
	if ( defined( 'PHP_OS' ) ) 
	{
		$os = PHP_OS ;
	}
	else
	{
		$os = php_uname() ;
	}
	
	if ( strtoupper( substr( $os, 0, 3 ) ) === 'WIN' ) 
	{
		return ( utf8_encode( htmlspecialchars( $value ) ) ) ;
	} 
	else 
	{
		return ( htmlspecialchars( $value ) ) ;
	}	
}

/**
 * Check whether given extension is in html etensions list
 *
 * @param string $ext
 * @param array $htmlExtensions
 * @return boolean
 */
function IsHtmlExtension( $ext, $htmlExtensions )
{
	if ( !$htmlExtensions || !is_array( $htmlExtensions ) )
	{
		return false ;
	}
	$lcaseHtmlExtensions = array() ;
	foreach ( $htmlExtensions as $key => $val )
	{
		$lcaseHtmlExtensions[$key] = strtolower( $val ) ;
	}
	return in_array( $ext, $lcaseHtmlExtensions ) ;
}

/**
 * Detect HTML in the first KB to prevent against potential security issue with 
 * IE/Safari/Opera file type auto detection bug.
 * Returns true if file contain insecure HTML code at the beginning.
 * 
 * @param string $filePath absolute path to file
 * @return boolean
 */ 
function DetectHtml( $filePath )
{
	$fp = fopen( $filePath, 'rb' ) ;
	$chunk = fread( $fp, 1024 ) ;
	fclose( $fp ) ;

	$chunk = strtolower( $chunk ) ;

	if (!$chunk) 
	{
		return false ;
	}

	$chunk = trim( $chunk ) ;

	if ( preg_match( "/<!DOCTYPE\W*X?HTML/sim", $chunk ) ) 
	{
		return true;
	}	

	$tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' ) ;

	foreach( $tags as $tag ) 
	{
		if( false !== strpos( $chunk, $tag ) ) 
		{
			return true ;
		}
	}

	//type = javascript
	if ( preg_match( '!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk ) ) 
	{
		return true ;
	}

	//href = javascript
	//src = javascript
	//data = javascript
	if ( preg_match( '!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk ) )
	{
		return true ;
	}
	
	//url(javascript
	if ( preg_match( '!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk ) ) 
	{
		return true ;
	}			

	return false ;	
}

/**
 * Check file content.
 * Currently this function validates only image files.
 * Returns false if file is invalid.
 * 
 * @param string $filePath absolute path to file
 * @param string $extension file extension
 * @param integer $detectionLevel 0 = none, 1 = use getimagesize for images, 2 = use DetectHtml for images
 * @return boolean
 */ 
function IsImageValid( $filePath, $extension )
{
	$imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'swf', 'psd', 'bmp', 'iff');

	// version_compare is available since PHP4 >= 4.0.7
	if ( function_exists( 'version_compare' ) ) {
		$sCurrentVersion = phpversion();
		if ( version_compare( $sCurrentVersion, "4.2.0" ) >= 0 ) {
			$imageCheckExtensions[] = "tiff";
			$imageCheckExtensions[] = "tif";
		}
		if ( version_compare( $sCurrentVersion, "4.3.0" ) >= 0 ) {
			$imageCheckExtensions[] = "swc";
		}
		if ( version_compare( $sCurrentVersion, "4.3.2" ) >= 0 ) {
			$imageCheckExtensions[] = "jpc";
			$imageCheckExtensions[] = "jp2";
			$imageCheckExtensions[] = "jpx";
			$imageCheckExtensions[] = "jb2";
			$imageCheckExtensions[] = "xbm";
			$imageCheckExtensions[] = "wbmp";
		}
	}
	
	if ( !in_array( $extension, $imageCheckExtensions ) ) {
		return true;
	}
	
	if ( @getimagesize( $filePath ) === false ) {
		return false ;
	}		
	
	return true;
}

?>
--- NEW FILE: io.php ---
<?php
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the File Manager Connector for PHP.
 */
function CombinePaths( $sBasePath, $sFolder )
{
	return RemoveFromEnd( $sBasePath, '/' ) . '/' . RemoveFromStart( $sFolder, '/' ) ;
}
function GetResourceTypePath( $resourceType, $sCommand )
{
	global $Config ;

	if ( $sCommand == "QuickUpload") 
		return $Config['QuickUploadPath'][$resourceType] ;
	else
		return $Config['FileTypesPath'][$resourceType] ;
}

function GetResourceTypeDirectory( $resourceType, $sCommand )
{
	global $Config ;
	if ( $sCommand == "QuickUpload") 
	{
		if ( strlen( $Config['QuickUploadAbsolutePath'][$resourceType] ) > 0 )
			return $Config['QuickUploadAbsolutePath'][$resourceType] ;

		// Map the "UserFiles" path to a local directory.
		return Server_MapPath( $Config['QuickUploadPath'][$resourceType] ) ;
	}
	else
	{
		if ( strlen( $Config['FileTypesAbsolutePath'][$resourceType] ) > 0 )
			return $Config['FileTypesAbsolutePath'][$resourceType] ;

		// Map the "UserFiles" path to a local directory.
		return Server_MapPath( $Config['FileTypesPath'][$resourceType] ) ;
	}
}

function GetUrlFromPath( $resourceType, $folderPath, $sCommand )
{
	return CombinePaths( GetResourceTypePath( $resourceType, $sCommand ), $folderPath ) ;
}

function RemoveExtension( $fileName )
{
	return substr( $fileName, 0, strrpos( $fileName, '.' ) ) ;
}

function ServerMapFolder( $resourceType, $folderPath, $sCommand )
{
	// Get the resource type directory.
	$sResourceTypePath = GetResourceTypeDirectory( $resourceType, $sCommand ) ;

	// Ensure that the directory exists.
	$sErrorMsg = CreateServerFolder( $sResourceTypePath ) ;
	if ( $sErrorMsg != '' )
		SendError( 1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})" ) ;

	// Return the resource type directory combined with the required path.
	return CombinePaths( $sResourceTypePath , $folderPath ) ;
}

function GetParentFolder( $folderPath )
{
	$sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-" ;
	return preg_replace( $sPattern, '', $folderPath ) ;
}

function CreateServerFolder( $folderPath, $lastFolder = null )
{
	$sParent = GetParentFolder( $folderPath ) ;

	// Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
	while ( strpos($folderPath, '//') !== false )
	{
		$folderPath = str_replace( '//', '/', $folderPath ) ;
	}

	// Check if the parent exists, or create it.
	if ( !file_exists( $sParent ) )
	{
		//prevents agains infinite loop when we can't create root folder
		if ( !is_null( $lastFolder ) && $lastFolder === $sParent) {
			return "Can't create $folderPath directory" ;
		}
		
		$sErrorMsg = CreateServerFolder( $sParent, $folderPath ) ;
		if ( $sErrorMsg != '' )
			return $sErrorMsg ;
	}

	if ( !file_exists( $folderPath ) )
	{
		// Turn off all error reporting.
		error_reporting( 0 ) ;

		$php_errormsg = '' ;
		// Enable error tracking to catch the error.
		ini_set( 'track_errors', '1' ) ;

		// To create the folder with 0777 permissions, we need to set umask to zero.
		$oldumask = umask(0) ;
		mkdir( $folderPath, 0777 ) ;
		umask( $oldumask ) ;

		$sErrorMsg = $php_errormsg ;

		// Restore the configurations.
		ini_restore( 'track_errors' ) ;
		ini_restore( 'error_reporting' ) ;

		return $sErrorMsg ;
	}
	else
		return '' ;
}

function GetRootPath()
{
    if (!isset($_SERVER)) {
        global $_SERVER;
    }
	$sRealPath = realpath( './' ) ;

	$sSelfPath = $_SERVER['PHP_SELF'] ;
	$sSelfPath = substr( $sSelfPath, 0, strrpos( $sSelfPath, '/' ) ) ;

	$sSelfPath = str_replace( '/', DIRECTORY_SEPARATOR, $sSelfPath ) ;
	
	$position = strpos( $sRealPath, $sSelfPath ) ;

	// This can check only that this script isn't run from a virtual dir
	// But it avoids the problems that arise if it isn't checked
	if ( $position === false || $position <> strlen( $sRealPath ) - strlen( $sSelfPath ) )
		SendError( 1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".' ) ;

	return substr( $sRealPath, 0, $position ) ;
}

// Emulate the asp Server.mapPath function.
// given an url path return the physical directory that it corresponds to
function Server_MapPath( $path )
{
	// This function is available only for Apache
	if ( function_exists( 'apache_lookup_uri' ) )
	{
		$info = apache_lookup_uri( $path ) ;
		return $info->filename . $info->path_info ;
	}

	// This isn't correct but for the moment there's no other solution
	// If this script is under a virtual directory or symlink it will detect the problem and stop
	return GetRootPath() . $path ;
}

function IsAllowedExt( $sExtension, $resourceType )
{
	global $Config ;
	// Get the allowed and denied extensions arrays.
	$arAllowed	= $Config['AllowedExtensions'][$resourceType] ;
	$arDenied	= $Config['DeniedExtensions'][$resourceType] ;

	if ( count($arAllowed) > 0 && !in_array( $sExtension, $arAllowed ) ) 
		return false ;

	if ( count($arDenied) > 0 && in_array( $sExtension, $arDenied ) ) 
		return false ;

	return true ;
}

function IsAllowedType( $resourceType )
{
	global $Config ;
	if ( !in_array( $resourceType, $Config['ConfigAllowedTypes'] ) )
		return false ;
	
	return true ;
}

function IsAllowedCommand( $sCommand )
{
	global $Config ;

	if ( !in_array( $sCommand, $Config['ConfigAllowedCommands'] ) )
		return false ;
	
	return true ;
}

function GetCurrentFolder()
{
    if (!isset($_GET)) {
        global $_GET;
    }
	$sCurrentFolder	= isset( $_GET['CurrentFolder'] ) ? $_GET['CurrentFolder'] : '/' ;

	// Check the current folder syntax (must begin and start with a slash).
	if ( ! ereg( '/$', $sCurrentFolder ) ) $sCurrentFolder .= '/' ;
	if ( strpos( $sCurrentFolder, '/' ) !== 0 ) $sCurrentFolder = '/' . $sCurrentFolder ;

	// Ensure the folder path has no double-slashes
	while ( strpos ($sCurrentFolder, '//') !== false ) {
		$sCurrentFolder = str_replace ('//', '/', $sCurrentFolder) ;
	}

	// Check for invalid folder paths (..)
	if ( strpos( $sCurrentFolder, '..' ) )
		SendError( 102, '' ) ;

	return $sCurrentFolder ;
}

// Do a cleanup of the folder name to avoid possible problems
function SanitizeFolderName( $sNewFolderName )
{
	$sNewFolderName = stripslashes( $sNewFolderName ) ;

	// Remove . \ / | : ? * " < >
	$sNewFolderName = preg_replace( '/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>/', '_', $sNewFolderName ) ;

	return $sNewFolderName ;
}

// Do a cleanup of the file name to avoid possible problems
function SanitizeFileName( $sNewFileName )
{
	global $Config ;

	$sNewFileName = stripslashes( $sNewFileName ) ;

	// Replace dots in the name with underscores (only one dot can be there... security issue).
	if ( $Config['ForceSingleExtension'] )
		$sNewFileName = preg_replace( '/\\.(?![^.]*$)/', '_', $sNewFileName ) ;

	// Remove \ / | : ? * " < >
	$sNewFileName = preg_replace( '/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>/', '_', $sNewFileName ) ;

	return $sNewFileName ;
}

// This is the function that sends the results of the uploading process.
function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' )
{
	echo '<script type="text/javascript">' ;
	$rpl = array( '\\' => '\\\\', '"' => '\\"' ) ;
	echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr( $fileUrl, $rpl ) . '","' . strtr( $fileName, $rpl ) . '", "' . strtr( $customMsg, $rpl ) . '") ;' ;
	echo '</script>' ;
	exit ;
}

?>
--- NEW FILE: phpcompat.php ---
<?php

if ( !isset( $_SERVER ) ) {
    $_SERVER = $HTTP_SERVER_VARS ;
}
if ( !isset( $_GET ) ) {
    $_GET = $HTTP_GET_VARS ;
}
if ( !isset( $_FILES ) ) {
    $_FILES = $HTTP_POST_FILES ;
}

if ( !defined( 'DIRECTORY_SEPARATOR' ) ) {
    define( 'DIRECTORY_SEPARATOR',
        strtoupper(substr(PHP_OS, 0, 3) == 'WIN') ? '\\' : '/'
    ) ;
}


From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_link
	fck_link.js, 1.5, 1.6
Message-ID: <20080209125402.0C27410FE23@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_link
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/fck_link

Added Files:
	fck_link.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_link.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages
	blank.html, 1.2, 1.3 controlWindow.js, 1.2, 1.3 controls.html,
	1.2, 1.3 spellChecker.js, 1.2, 1.3 spellchecker.html, 1.3,
	1.4 spellerStyle.css, 1.2, 1.3 wordWindow.js, 1.2, 1.3
Message-ID: <20080209125402.110D110FE24@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/fck_spellerpages/spellerpages

Added Files:
	blank.html controlWindow.js controls.html spellChecker.js 
	spellchecker.html spellerStyle.css wordWindow.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: spellChecker.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: controls.html ---
<html>
	<head>
		<link rel="stylesheet" type="text/css" href="spellerStyle.css" />
		<script type="text/javascript" src="controlWindow.js"></script>
		<script type="text/javascript">
var spellerObject;
var controlWindowObj;

if( parent.opener ) {
	spellerObject = parent.opener.speller;
}

function ignore_word() {
	if( spellerObject ) {
		spellerObject.ignoreWord();
	}
}

function ignore_all() {
	if( spellerObject ) {
		spellerObject.ignoreAll();
	}
}

function replace_word() {
	if( spellerObject ) {
		spellerObject.replaceWord();
	}
}

function replace_all() {
	if( spellerObject ) {
		spellerObject.replaceAll();
	}
}

function end_spell() {
	if( spellerObject ) {
		spellerObject.terminateSpell();
	}
}

function undo() {
	if( spellerObject ) {
		spellerObject.undo();
	}
}

function suggText() {
	if( controlWindowObj ) {
		controlWindowObj.setSuggestedText();
	}
}

var FCKLang = window.parent.parent.FCKLang ;	// by FredCK

function init_spell() {
	// By FredCK (fckLang attributes have been added to the HTML source of this page)
	window.parent.parent.OnSpellerControlsLoad( this ) ;

	var controlForm = document.spellcheck;

	// create a new controlWindow object
 	controlWindowObj = new controlWindow( controlForm );

	// call the init_spell() function in the parent frameset
	if( parent.frames.length ) {
		parent.init_spell( controlWindowObj );
	} else {
		alert( 'This page was loaded outside of a frameset. It might not display properly' );
	}
}

</script>
	</head>
	<body class="controlWindowBody" onLoad="init_spell();" style="OVERFLOW: hidden" scroll="no">	<!-- by FredCK -->
		<form name="spellcheck">
			<table border="0" cellpadding="0" cellspacing="0" border="0" align="center">
				<tr>
					<td colspan="3" class="normalLabel"><span fckLang="DlgSpellNotInDic">Not in dictionary:</span></td>
				</tr>
				<tr>
					<td colspan="3"><input class="readonlyInput" type="text" name="misword" readonly /></td>
				</tr>
				<tr>
					<td colspan="3" height="5"></td>
				</tr>
				<tr>
					<td class="normalLabel"><span fckLang="DlgSpellChangeTo">Change to:</span></td>
				</tr>
				<tr valign="top">
					<td>
						<table border="0" cellpadding="0" cellspacing="0" border="0">
							<tr>
								<td class="normalLabel">
									<input class="textDefault" type="text" name="txtsugg" />
								</td>
							</tr>
							<tr>
								<td>
									<select class="suggSlct" name="sugg" size="7" onChange="suggText();" onDblClick="replace_word();">
										<option></option>
									</select>
								</td>
							</tr>
						</table>
					</td>
					<td>&nbsp;&nbsp;</td>
					<td>
						<table border="0" cellpadding="0" cellspacing="0" border="0">
							<tr>
								<td>
									<input class="buttonDefault" type="button" fckLang="DlgSpellBtnIgnore" value="Ignore" onClick="ignore_word();">
								</td>
								<td>&nbsp;&nbsp;</td>
								<td>
									<input class="buttonDefault" type="button" fckLang="DlgSpellBtnIgnoreAll" value="Ignore All" onClick="ignore_all();">
								</td>
							</tr>
							<tr>
								<td colspan="3" height="5"></td>
							</tr>
							<tr>
								<td>
									<input class="buttonDefault" type="button" fckLang="DlgSpellBtnReplace" value="Replace" onClick="replace_word();">
								</td>
								<td>&nbsp;&nbsp;</td>
								<td>
									<input class="buttonDefault" type="button" fckLang="DlgSpellBtnReplaceAll" value="Replace All" onClick="replace_all();">
								</td>
							</tr>
							<tr>
								<td colspan="3" height="5"></td>
							</tr>
							<tr>
								<td>
									<input class="buttonDefault" type="button" name="btnUndo" fckLang="DlgSpellBtnUndo" value="Undo" onClick="undo();"
										disabled>
								</td>
								<td>&nbsp;&nbsp;</td>
								<td>
									<!-- by FredCK
									<input class="buttonDefault" type="button" value="Close" onClick="end_spell();">
									-->
								</td>
							</tr>
						</table>
					</td>
				</tr>
			</table>
		</form>
	</body>
</html>

--- NEW FILE: wordWindow.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: spellerStyle.css ---
.blend {
	font-family: courier new;
	font-size: 10pt;
	border: 0;
	margin-bottom:-1;
}
.normalLabel {
	font-size:8pt;
}
.normalText {
	font-family:arial, helvetica, sans-serif;
	font-size:10pt;
	color:000000;
	background-color:FFFFFF;
}
.plainText {
	font-family: courier new, courier, monospace;
	font-size: 10pt;
	color:000000;
	background-color:FFFFFF;
}
.controlWindowBody {
	font-family:arial, helvetica, sans-serif;
	font-size:8pt;
	padding: 7px ;		/* by FredCK */
	margin: 0px ;		/* by FredCK */
	/* color:000000;				by FredCK */
	/* background-color:DADADA;		by FredCK */
}
.readonlyInput {
	background-color:DADADA;
	color:000000;
	font-size:8pt;
	width:392px;
}
.textDefault {
	font-size:8pt;
	width: 200px;
}
.buttonDefault {
	width:90px;
	height:22px;
	font-size:8pt;
}
.suggSlct {
	width:200px;
	margin-top:2;
	font-size:8pt;
}
--- NEW FILE: spellchecker.html ---

<script>

var wordWindow = null;
var controlWindow = null;

function init_spell( spellerWindow ) {

	if( spellerWindow ) {
		if( spellerWindow.windowType == "wordWindow" ) {
			wordWindow = spellerWindow;
		} else if ( spellerWindow.windowType == "controlWindow" ) {
			controlWindow = spellerWindow;
		}
	}

	if( controlWindow && wordWindow ) {
		// populate the speller object and start it off!
		var speller = opener.speller;
		wordWindow.speller = speller;
		speller.startCheck( wordWindow, controlWindow );
	}
}

// encodeForPost
function encodeForPost( str ) {
	var s = new String( str );
	s = encodeURIComponent( s );
	// additionally encode single quotes to evade any PHP
	// magic_quotes_gpc setting (it inserts escape characters and
	// therefore skews the btye positions of misspelled words)
	return s.replace( /\'/g, '%27' );
}

// post the text area data to the script that populates the speller
function postWords() {
	var bodyDoc = window.frames[0].document;
	bodyDoc.open();
	bodyDoc.write('<html>');
	bodyDoc.write('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">');
	bodyDoc.write('<link rel="stylesheet" type="text/css" href="spellerStyle.css"/>');
	if (opener) {
		var speller = opener.speller;
		bodyDoc.write('<body class="normalText" onLoad="document.forms[0].submit();">');
		bodyDoc.write('<p>' + window.parent.FCKLang.DlgSpellProgress + '<\/p>');		// by FredCK
		bodyDoc.write('<form action="'+speller.spellCheckScript+'" method="post">');
		for( var i = 0; i < speller.textInputs.length; i++ ) {
			bodyDoc.write('<input type="hidden" name="textinputs[]" value="'+encodeForPost(speller.textInputs[i].value)+'">');
		}
		bodyDoc.write('<\/form>');
		bodyDoc.write('<\/body>');
	} else {
		bodyDoc.write('<body class="normalText">');
		bodyDoc.write('<p><b>This page cannot be displayed<\/b><\/p><p>The window was not opened from another window.<\/p>');
		bodyDoc.write('<\/body>');
	}
	bodyDoc.write('<\/html>');
	bodyDoc.close();
}
</script>

<html>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<head>
<title>Speller Pages</title>
</head>
<frameset rows="*,201" onLoad="postWords();">
<frame src="blank.html">
<frame src="controls.html">
</frameset>
</html>

--- NEW FILE: controlWindow.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: blank.html ---



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/dragresizetable
	fckplugin.js, NONE, 1.1
Message-ID: <20080209125402.AEAEF10FE7E@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/dragresizetable
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/plugins/dragresizetable

Added Files:
	fckplugin.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckplugin.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images/icons
	ai.gif, 1.2, 1.3 avi.gif, 1.2, 1.3 bmp.gif, 1.2, 1.3 cs.gif,
	1.2, 1.3 default.icon.gif, 1.2, 1.3 dll.gif, 1.2, 1.3 doc.gif,
	1.2, 1.3 exe.gif, 1.2, 1.3 fla.gif, 1.2, 1.3 gif.gif, 1.2,
	1.3 htm.gif, 1.2, 1.3 html.gif, 1.2, 1.3 jpg.gif, 1.2,
	1.3 js.gif, 1.2, 1.3 mdb.gif, 1.2, 1.3 mp3.gif, 1.2,
	1.3 pdf.gif, 1.2, 1.3 png.gif, NONE, 1.1 ppt.gif, 1.2,
	1.3 rdp.gif, 1.2, 1.3 swf.gif, 1.2, 1.3 swt.gif, 1.2,
	1.3 txt.gif, 1.2, 1.3 vsd.gif, 1.2, 1.3 xls.gif, 1.2,
	1.3 xml.gif, 1.2, 1.3 zip.gif, 1.2, 1.3
Message-ID: <20080209125402.3C1E510FE2B@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images/icons
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/browser/default/images/icons

Added Files:
	ai.gif avi.gif bmp.gif cs.gif default.icon.gif dll.gif doc.gif 
	exe.gif fla.gif gif.gif htm.gif html.gif jpg.gif js.gif 
	mdb.gif mp3.gif pdf.gif png.gif ppt.gif rdp.gif swf.gif 
	swt.gif txt.gif vsd.gif xls.gif xml.gif zip.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: default.icon.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mdb.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: png.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: bmp.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: exe.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cs.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ai.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: html.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mp3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: htm.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dll.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: gif.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: zip.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fla.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: js.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: xls.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: swf.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: swt.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: xml.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: avi.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: txt.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: doc.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ppt.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: vsd.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rdp.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: pdf.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jpg.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_select
	fck_select.js, 1.4, 1.5
Message-ID: <20080209125402.121A110FE25@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_select
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/fck_select

Added Files:
	fck_select.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_select.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs]
 Geeklog-1.x/public_html/fckeditor/editor/_source/classes fckcontextmenu.js,
 1.2, 1.3 fckdataprocessor.js, NONE, 1.1 fckdocumentfragment_gecko.js, NONE,
 1.1 fckdocumentfragment_ie.js, NONE, 1.1 fckdomrange.js, NONE,
 1.1 fckdomrange_gecko.js, NONE, 1.1 fckdomrange_ie.js, NONE,
 1.1 fckdomrangeiterator.js, NONE, 1.1 fckeditingarea.js, 1.3,
 1.4 fckelementpath.js, NONE, 1.1 fckenterkey.js, NONE, 1.1 fckevents.js, 1.4,
 1.5 fckicon.js, 1.2, 1.3 fckiecleanup.js, 1.2, 1.3 fckimagepreloader.js,
 NONE, 1.1 fckkeystrokehandler.js, NONE, 1.1 fckmenublock.js, 1.3,
 1.4 fckmenublockpanel.js, 1.2, 1.3 fckmenuitem.js, 1.3, 1.4 fckpanel.js, 1.3,
 1.4 fckplugin.js, 1.4, 1.5 fckspecialcombo.js, 1.5, 1.6 fckstyle.js, NONE,
 1.1 fcktoolbar.js, 1.5, 1.6 fcktoolbarbreak_gecko.js, 1.4,
 1.5 fcktoolbarbreak_ie.js, 1.5, 1.6 fcktoolbarbutton.js, 1.4,
 1.5 fcktoolbarbuttonui.js, 1.3, 1.4 fcktoolbarfontformatcombo.js, 1.4,
 1.5 fcktoolbarfontscombo.js, 1.4, 1.5 fcktoolbarfontsizecombo.js, 1.4,
 1.5 fcktoolbarpanelbutton.js, 1.4, 1.5 fcktoolbarspecialcombo.js, 1.4,
 1.5 f cktoolbarstylecombo.js, 1.4, 1.5 fckw3crange.js, NONE, 1.1 fckxml.js,
 NONE, 1.1 fckxml_gecko.js, 1.4, 1.5 fckxml_ie.js, 1.4, 1.5
Message-ID: <20080209125401.ABB9210FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/_source/classes

Added Files:
	fckcontextmenu.js fckdataprocessor.js 
	fckdocumentfragment_gecko.js fckdocumentfragment_ie.js 
	fckdomrange.js fckdomrange_gecko.js fckdomrange_ie.js 
	fckdomrangeiterator.js fckeditingarea.js fckelementpath.js 
	fckenterkey.js fckevents.js fckicon.js fckiecleanup.js 
	fckimagepreloader.js fckkeystrokehandler.js fckmenublock.js 
	fckmenublockpanel.js fckmenuitem.js fckpanel.js fckplugin.js 
	fckspecialcombo.js fckstyle.js fcktoolbar.js 
	fcktoolbarbreak_gecko.js fcktoolbarbreak_ie.js 
	fcktoolbarbutton.js fcktoolbarbuttonui.js 
	fcktoolbarfontformatcombo.js fcktoolbarfontscombo.js 
	fcktoolbarfontsizecombo.js fcktoolbarpanelbutton.js 
	fcktoolbarspecialcombo.js fcktoolbarstylecombo.js 
	fckw3crange.js fckxml.js fckxml_gecko.js fckxml_ie.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckmenuitem.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckmenublock.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckelementpath.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarpanelbutton.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckw3crange.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckpanel.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarbutton.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarfontscombo.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarbreak_ie.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckenterkey.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckspecialcombo.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckcontextmenu.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarfontsizecombo.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbar.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckiecleanup.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdomrange.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckimagepreloader.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarfontformatcombo.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdocumentfragment_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdocumentfragment_ie.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckxml_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckxml_ie.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckicon.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckmenublockpanel.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarbuttonui.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckkeystrokehandler.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckstyle.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdomrangeiterator.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdomrange_ie.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckplugin.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckevents.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdataprocessor.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarspecialcombo.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarbreak_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckdomrange_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fcktoolbarstylecombo.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckeditingarea.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckxml.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/lang
	_translationstatus.txt, 1.6, 1.7 af.js, NONE, 1.1 ar.js, 1.5,
	1.6 bg.js, 1.5, 1.6 bn.js, 1.2, 1.3 bs.js, 1.5, 1.6 ca.js, 1.6,
	1.7 cs.js, 1.5, 1.6 da.js, 1.5, 1.6 de.js, 1.5, 1.6 el.js, 1.6,
	1.7 en-au.js, 1.5, 1.6 en-ca.js, 1.2, 1.3 en-uk.js, 1.5,
	1.6 en.js, 1.5, 1.6 eo.js, 1.5, 1.6 es.js, 1.6, 1.7 et.js, 1.5,
	1.6 eu.js, 1.5, 1.6 fa.js, 1.5, 1.6 fi.js, 1.5, 1.6 fo.js, 1.3,
	1.4 fr.js, 1.6, 1.7 gl.js, 1.5, 1.6 he.js, 1.5, 1.6 hi.js, 1.2,
	1.3 hr.js, 1.5, 1.6 hu.js, 1.5, 1.6 it.js, 1.5, 1.6 ja.js, 1.5,
	1.6 km.js, 1.2, 1.3 ko.js, 1.5, 1.6 lt.js, 1.5, 1.6 lv.js, 1.2,
	1.3 mn.js, 1.3, 1.4 ms.js, 1.3, 1.4 nb.js, NONE, 1.1 nl.js,
	1.5, 1.6 no.js, 1.5, 1.6 pl.js, 1.5, 1.6 pt-br.js, 1.6,
	1.7 pt.js, 1.6, 1.7 ro.js, 1.5, 1.6 ru.js, 1.5, 1.6 sk.js, 1.5,
	1.6 sl.js, 1.5, 1.6 sr-latn.js, 1.5, 1.6 sr.js, 1.5, 1.6 sv.js,
	1.5, 1.6 th.js, 1.5, 1.6 tr.js, 1.5, 1.6 uk.js, 1.5, 1.6 vi.js,
	1.3, 1.4 zh-cn.js, 1.5, 1.6 zh.js, 1.5, 1.6
Message-ID: <20080209125402.935EA10FE7A@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/lang
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/lang

Added Files:
	_translationstatus.txt af.js ar.js bg.js bn.js bs.js ca.js 
	cs.js da.js de.js el.js en-au.js en-ca.js en-uk.js en.js eo.js 
	es.js et.js eu.js fa.js fi.js fo.js fr.js gl.js he.js hi.js 
	hr.js hu.js it.js ja.js km.js ko.js lt.js lv.js mn.js ms.js 
	nb.js nl.js no.js pl.js pt-br.js pt.js ro.js ru.js sk.js sl.js 
	sr-latn.js sr.js sv.js th.js tr.js uk.js vi.js zh-cn.js zh.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: ar.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: th.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: lt.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: km.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ru.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: pt-br.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ms.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: zh-cn.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fr.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ro.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: pl.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sl.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: it.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cs.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: hu.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: en-uk.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: eu.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: de.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: af.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ca.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: lv.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: bg.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fi.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sr-latn.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mn.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fo.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: hi.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: uk.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sr.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nl.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: no.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nb.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: _translationstatus.txt ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Translations Status.
 */

af.js      Found: 397   Missing: 15
ar.js      Found: 412   Missing: 0
bg.js      Found: 374   Missing: 38
bn.js      Found: 381   Missing: 31
bs.js      Found: 226   Missing: 186
ca.js      Found: 412   Missing: 0
cs.js      Found: 412   Missing: 0
da.js      Found: 382   Missing: 30
de.js      Found: 412   Missing: 0
el.js      Found: 397   Missing: 15
en-au.js   Found: 412   Missing: 0
en-ca.js   Found: 412   Missing: 0
en-uk.js   Found: 412   Missing: 0
eo.js      Found: 346   Missing: 66
es.js      Found: 412   Missing: 0
et.js      Found: 412   Missing: 0
eu.js      Found: 382   Missing: 30
fa.js      Found: 398   Missing: 14
fi.js      Found: 412   Missing: 0
fo.js      Found: 397   Missing: 15
fr.js      Found: 412   Missing: 0
gl.js      Found: 382   Missing: 30
he.js      Found: 412   Missing: 0
hi.js      Found: 412   Missing: 0
hr.js      Found: 412   Missing: 0
hu.js      Found: 412   Missing: 0
it.js      Found: 397   Missing: 15
ja.js      Found: 412   Missing: 0
km.js      Found: 371   Missing: 41
ko.js      Found: 369   Missing: 43
lt.js      Found: 377   Missing: 35
lv.js      Found: 382   Missing: 30
mn.js      Found: 226   Missing: 186
ms.js      Found: 352   Missing: 60
nb.js      Found: 396   Missing: 16
nl.js      Found: 412   Missing: 0
no.js      Found: 396   Missing: 16
pl.js      Found: 412   Missing: 0
pt-br.js   Found: 412   Missing: 0
pt.js      Found: 382   Missing: 30
ro.js      Found: 411   Missing: 1
ru.js      Found: 412   Missing: 0
sk.js      Found: 397   Missing: 15
sl.js      Found: 412   Missing: 0
sr-latn.js Found: 369   Missing: 43
sr.js      Found: 369   Missing: 43
sv.js      Found: 397   Missing: 15
th.js      Found: 394   Missing: 18
tr.js      Found: 397   Missing: 15
uk.js      Found: 398   Missing: 14
vi.js      Found: 397   Missing: 15
zh-cn.js   Found: 412   Missing: 0
zh.js      Found: 412   Missing: 0

--- NEW FILE: eo.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: hr.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: en-au.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: da.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: vi.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: tr.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: en-ca.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: el.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: zh.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: bn.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ja.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sk.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: en.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: pt.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: et.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: he.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: gl.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: es.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fa.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: bs.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sv.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_template/images
	template1.gif, 1.2, 1.3 template2.gif, 1.2, 1.3 template3.gif,
	1.2, 1.3
Message-ID: <20080209125402.15A3B10FE26@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_template/images
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/fck_template/images

Added Files:
	template1.gif template2.gif template3.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: template3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: template2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: template1.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dtd
	fck_dtd_test.html, NONE, 1.1 fck_xhtml10strict.js, NONE,
	1.1 fck_xhtml10transitional.js, NONE, 1.1
Message-ID: <20080209125402.1779210FE27@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dtd
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dtd

Added Files:
	fck_dtd_test.html fck_xhtml10strict.js 
	fck_xhtml10transitional.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_xhtml10strict.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_dtd_test.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>DTD Test Page</title>
	<script type="text/javascript">

	// Define an object for this test page, so the assignment to FCK.DTD works
	var FCK = {} ;
	</script>
	<script type="text/javascript" src="../_source/internals/fcktools.js"></script>
	<script type="text/javascript" src="fck_xhtml10transitional.js"></script>
</head>
<body>
	<h1>
		DTD Contents
	</h1>
	<table border="1">
		<script type="text/javascript">

    alert(FCK.DTD);

for ( var p in FCK.DTD )
{
	document.write( '<tr><td><b>' + p + '</b></td><td>' ) ;

	var isFirst = true ;

	for ( var c in FCK.DTD[p] )
	{
		if ( !isFirst )
			document.write( ', ' ) ;
		isFirst = false ;

		document.write( c ) ;
	}


	document.write( '</td></tr>' ) ;
}
		</script>
	</table>
</body>
</html>

--- NEW FILE: fck_xhtml10transitional.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor
	fckdebug.html, 1.4, 1.5 fckdialog.html, 1.4,
	1.5 fckeditor.html, 1.5, 1.6 fckeditor.original.html, 1.5, 1.6
Message-ID: <20080209125402.1E51710FE28@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor

Added Files:
	fckdebug.html fckdialog.html fckeditor.html 
	fckeditor.original.html 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckdialog.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This page is used by all dialog box as the container.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
		<meta name="robots" content="noindex, nofollow" />
		<script type="text/javascript">

// On some Gecko browsers (probably over slow connections) the
// "dialogArguments" are not set so we must get it from the opener window.
if ( !window.dialogArguments )
	window.dialogArguments = window.opener.FCKLastDialogInfo ;

// Sets the Skin CSS
document.write( '<link href="' + window.dialogArguments.Editor.FCKConfig.SkinPath + 'fck_dialog.css" type="text/css" rel="stylesheet">' ) ;

// Sets the language direction.
window.document.dir = window.dialogArguments.Editor.FCKLang.Dir ;

// IE does not set the window name in showModalDialog(), let's set it here.
if ( window.dialogArguments.Editor.FCKBrowserInfo.IsIE )
	window.name = window.dialogArguments.DialogName ;

var sTitle = window.dialogArguments.Title ;
document.write( '<title>' + sTitle + '<\/title>' ) ;

function LoadInnerDialog()
{
	if ( window.onresize )
		window.onresize() ;

	// First of all, translate the dialog box contents.
	window.dialogArguments.Editor.FCKLanguageManager.TranslatePage( document ) ;

	window.frames["frmMain"].document.location.href = window.dialogArguments.Page ;
}

function InnerDialogLoaded()
{
	var oInnerDoc = document.getElementById('frmMain').contentWindow.document ;

	// Set the language direction.
	oInnerDoc.dir = window.dialogArguments.Editor.FCKLang.Dir ;

	// Sets the Skin CSS.
	oInnerDoc.write( '<link href="' + window.dialogArguments.Editor.FCKConfig.SkinPath + 'fck_dialog.css" type="text/css" rel="stylesheet">' ) ;

	SetOnKeyDown( oInnerDoc ) ;
	DisableContextMenu( oInnerDoc ) ;

	return window.dialogArguments.Editor ;
}

function SetOkButton( showIt )
{
	document.getElementById('btnOk').style.visibility = ( showIt ? '' : 'hidden' ) ;
}

var bAutoSize = false ;

function SetAutoSize( autoSize )
{
	bAutoSize = autoSize ;
	RefreshSize() ;
}

function RefreshSize()
{
	if ( bAutoSize )
	{
		var oInnerDoc = document.getElementById('frmMain').contentWindow.document ;

		var iFrameHeight ;
		if ( document.all )
			iFrameHeight = oInnerDoc.body.offsetHeight ;
		else
			iFrameHeight = document.getElementById('frmMain').contentWindow.innerHeight ;

		var iInnerHeight = oInnerDoc.body.scrollHeight ;

		var iDiff = iInnerHeight - iFrameHeight ;

		if ( iDiff > 0 )
		{
			if ( document.all )
				window.dialogHeight = ( parseInt( window.dialogHeight, 10 ) + iDiff ) + 'px' ;
			else
				window.resizeBy( 0, iDiff ) ;
		}
	}
}

// Kludge for #1316: Safari seems to have a bug with the time when RefreshSize() is executed - it thinks frmMain's innerHeight 
// is 0 if we query the value too soon after the page is loaded in some circumstances.
if ( window.dialogArguments.Editor.FCKBrowserInfo.IsSafari )
{
	window.OriginalRefreshSize = RefreshSize ;

	RefreshSize = function()
	{
		window.setTimeout( window.OriginalRefreshSize, 1 );
	}
}

function Ok()
{
	if ( window.frames["frmMain"].Ok && window.frames["frmMain"].Ok() )
		Cancel() ;
}

function Cancel( dontFireChange )
{
	if ( !dontFireChange && !window.dialogArguments.Editor.FCK.EditMode )
	{
		// All dialog windows, by default, will fire the "OnSelectionChange"
		// event, no matter the Ok or Cancel button has been pressed.
		window.dialogArguments.Editor.FCK.Events.FireEvent( 'OnSelectionChange' ) ;
	}
	window.close() ;
}

// Object that holds all available tabs.
var oTabs = new Object() ;

function TabDiv_OnClick()
{
	SetSelectedTab( this.TabCode ) ;
}

function AddTab( tabCode, tabText, startHidden )
{
	if ( typeof( oTabs[ tabCode ] ) != 'undefined' )
		return ;

	var eTabsRow = document.getElementById( 'Tabs' ) ;

	var oCell = eTabsRow.insertCell(  eTabsRow.cells.length - 1 ) ;
	oCell.noWrap = true ;

	var oDiv = document.createElement( 'DIV' ) ;
	oDiv.className = 'PopupTab' ;
	oDiv.innerHTML = tabText ;
	oDiv.TabCode = tabCode ;
	oDiv.onclick = TabDiv_OnClick ;

	if ( startHidden )
		oDiv.style.display = 'none' ;

	eTabsRow = document.getElementById( 'TabsRow' ) ;

	oCell.appendChild( oDiv ) ;

	if ( eTabsRow.style.display == 'none' )
	{
		var eTitleArea = document.getElementById( 'TitleArea' ) ;
		eTitleArea.className = 'PopupTitle' ;

		oDiv.className = 'PopupTabSelected' ;
		eTabsRow.style.display = '' ;

		if ( ! window.dialogArguments.Editor.FCKBrowserInfo.IsIE )
			window.onresize() ;
	}

	oTabs[ tabCode ] = oDiv ;
}

function SetSelectedTab( tabCode )
{
	for ( var sCode in oTabs )
	{
		if ( sCode == tabCode )
			oTabs[sCode].className = 'PopupTabSelected' ;
		else
			oTabs[sCode].className = 'PopupTab' ;
	}

	if ( typeof( window.frames["frmMain"].OnDialogTabChange ) == 'function' )
		window.frames["frmMain"].OnDialogTabChange( tabCode ) ;
}

function SetTabVisibility( tabCode, isVisible )
{
	var oTab = oTabs[ tabCode ] ;
	oTab.style.display = isVisible ? '' : 'none' ;

	if ( ! isVisible && oTab.className == 'PopupTabSelected' )
	{
		for ( var sCode in oTabs )
		{
			if ( oTabs[sCode].style.display != 'none' )
			{
				SetSelectedTab( sCode ) ;
				break ;
			}
		}
	}
}

function SetOnKeyDown( targetDocument )
{
	targetDocument.onkeydown = function ( e )
	{
		e = e || event || this.parentWindow.event ;
		switch ( e.keyCode )
		{
			case 13 :		// ENTER
				var oTarget = e.srcElement || e.target ;
				if ( oTarget.tagName == 'TEXTAREA' )
					return true ;
				Ok() ;
				return false ;
			case 27 :		// ESC
				Cancel() ;
				return false ;
				break ;
		}
		return true ;
	}
}
SetOnKeyDown( document ) ;

function DisableContextMenu( targetDocument )
{
	if ( window.dialogArguments.Editor.FCKBrowserInfo.IsIE ) return ;

	// Disable Right-Click
	var oOnContextMenu = function( e )
	{
		var sTagName = e.target.tagName ;
		if ( ! ( ( sTagName == "INPUT" && e.target.type == "text" ) || sTagName == "TEXTAREA" ) )
			e.preventDefault() ;
	}
	targetDocument.addEventListener( 'contextmenu', oOnContextMenu, true ) ;
}
DisableContextMenu( document ) ;

if ( ! window.dialogArguments.Editor.FCKBrowserInfo.IsIE )
{
	window.onresize = function()
	{
		var oFrame = document.getElementById("frmMain") ;

		if ( ! oFrame )
		return ;

		oFrame.height = 0 ;

		var oCell = document.getElementById("FrameCell") ;
		var iHeight = oCell.offsetHeight ;

		oFrame.height = iHeight - 2 ;
	}
}

if ( window.dialogArguments.Editor.FCKBrowserInfo.IsIE )
{
	function Window_OnBeforeUnload()
	{
		for ( var t in oTabs )
			oTabs[t] = null ;

		window.dialogArguments.Editor = null ;
	}
	window.attachEvent( "onbeforeunload", Window_OnBeforeUnload ) ;
}

function Window_OnClose()
{
	window.dialogArguments.Editor.FCKFocusManager.Unlock() ;
}

if ( window.addEventListener )
	window.addEventListener( 'unload', Window_OnClose, false ) ;

		</script>
	</head>
	<body onload="LoadInnerDialog();" class="PopupBody">
		<table height="100%" cellspacing="0" cellpadding="0" width="100%" border="0">
			<tr>
				<td id="TitleArea" class="PopupTitle PopupTitleBorder">
					<script type="text/javascript">
document.write( sTitle ) ;
					</script>
				</td>
			</tr>
			<tr id="TabsRow" style="DISPLAY: none">
				<td class="PopupTabArea">
					<table border="0" cellpadding="0" cellspacing="0" width="100%">
						<tr id="Tabs" onselectstart="return false;">
							<td class="PopupTabEmptyArea">&nbsp;</td>
							<td class="PopupTabEmptyArea" width="100%">&nbsp;</td>
						</tr>
					</table>
				</td>
			</tr>
			<tr>
				<td id="FrameCell" height="100%" valign="top">
					<iframe id="frmMain" src="javascript:void(0)" name="frmMain" frameborder="0" height="100%" width="100%" scrolling="auto">
					</iframe>
				</td>
			</tr>
			<tr>
				<td class="PopupButtons">
					<table border="0" cellpadding="0" cellspacing="0">
						<tr>
							<td width="100%">&nbsp;</td>
							<td nowrap="nowrap">
								<input id="btnOk" style="VISIBILITY: hidden;" type="button" value="Ok" class="Button" onclick="Ok();" fckLang="DlgBtnOK" />
								&nbsp; 
								<input id="btnCancel" type="button" value="Cancel" class="Button" onclick="Cancel();" fckLang="DlgBtnCancel" />
							</td>
						</tr>
					</table>
				</td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: fckeditor.original.html ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckeditor.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Main page that holds the editor.
-->
<html>
<head>
	<title>FCKeditor</title>
	<meta name="robots" content="noindex, nofollow">
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
	<meta http-equiv="Cache-Control" content="public" />
	<script type="text/javascript">

// Instead of loading scripts and CSSs using inline tags, all scripts are
// loaded by code. In this way we can guarantee the correct processing order,
// otherwise external scripts and inline scripts could be executed in an
// unwanted order (IE).

function LoadScript( url )
{
	document.write( '<scr' + 'ipt type="text/javascript" src="' + url + '"><\/scr' + 'ipt>' ) ;
}

function LoadCss( url )
{
	document.write( '<link href="' + url + '" type="text/css" rel="stylesheet" />' ) ;
}

// Main editor scripts.
var sSuffix = ( /*@cc_on!@*/false ) ? 'ie' : 'gecko' ;

LoadScript( 'js/fckeditorcode_' + sSuffix + '.js' ) ;

// Base configuration file.
LoadScript( '../fckconfig.js' ) ;

	</script>
	<script type="text/javascript">

if ( FCKBrowserInfo.IsIE )
{
	// Remove IE mouse flickering.
	try
	{
		document.execCommand( 'BackgroundImageCache', false, true ) ;
	}
	catch (e)
	{
		// We have been reported about loading problems caused by the above
		// line. For safety, let's just ignore errors.
	}

	// Create the default cleanup object used by the editor.
	FCK.IECleanup = new FCKIECleanup( window ) ;
	FCK.IECleanup.AddItem( FCKTempBin, FCKTempBin.Reset ) ;
	FCK.IECleanup.AddItem( FCK, FCK_Cleanup ) ;
}

// The first function to be called on selection change must the the styles
// change checker, because the result of its processing may be used by another
// functions listening to the same event.
FCK.Events.AttachEvent( 'OnSelectionChange', function() { FCKStyles.CheckSelectionChanges() ; } ) ;

// The config hidden field is processed immediately, because
// CustomConfigurationsPath may be set in the page.
FCKConfig.ProcessHiddenField() ;

// Load the custom configurations file (if defined).
if ( FCKConfig.CustomConfigurationsPath.length > 0 )
	LoadScript( FCKConfig.CustomConfigurationsPath ) ;

	</script>
	<script type="text/javascript">

// Load configurations defined at page level.
FCKConfig_LoadPageConfig() ;

FCKConfig_PreProcess() ;

// Load the active skin CSS.
LoadCss( FCKConfig.SkinPath + 'fck_editor.css' ) ;

// Load the language file.
FCKLanguageManager.Initialize() ;
LoadScript( 'lang/' + FCKLanguageManager.ActiveLanguage.Code + '.js' ) ;

	</script>
	<script type="text/javascript">

// Initialize the editing area context menu.
FCK_ContextMenu_Init() ;

FCKPlugins.Load() ;

	</script>
	<script type="text/javascript">

// Set the editor interface direction.
window.document.dir = FCKLang.Dir ;

	</script>
	<script type="text/javascript">

window.onload = function()
{
	InitializeAPI() ;

	if ( FCKBrowserInfo.IsIE )
		FCK_PreloadImages() ;
	else
		LoadToolbarSetup() ;
}

function LoadToolbarSetup()
{
	FCKeditorAPI._FunctionQueue.Add( LoadToolbar ) ;
}

function LoadToolbar()
{
	var oToolbarSet = FCK.ToolbarSet = FCKToolbarSet_Create() ;

	if ( oToolbarSet.IsLoaded )
		StartEditor() ;
	else
	{
		oToolbarSet.OnLoad = StartEditor ;
		oToolbarSet.Load( FCKURLParams['Toolbar'] || 'Default' ) ;
	}
}

function StartEditor()
{
	// Remove the onload listener.
	FCK.ToolbarSet.OnLoad = null ;

	FCKeditorAPI._FunctionQueue.Remove( LoadToolbar ) ;

	FCK.Events.AttachEvent( 'OnStatusChange', WaitForActive ) ;

	// Start the editor.
	FCK.StartEditor() ;
}

function WaitForActive( editorInstance, newStatus )
{
	if ( newStatus == FCK_STATUS_ACTIVE )
	{
		if ( FCKBrowserInfo.IsGecko )
			FCKTools.RunFunction( window.onresize ) ;

		_AttachFormSubmitToAPI() ;

		FCK.SetStatus( FCK_STATUS_COMPLETE ) ;

		// Call the special "FCKeditor_OnComplete" function that should be present in
		// the HTML page where the editor is located.
		if ( typeof( window.parent.FCKeditor_OnComplete ) == 'function' )
			window.parent.FCKeditor_OnComplete( FCK ) ;
	}
}

// Gecko browsers doens't calculate well that IFRAME size so we must
// recalculate it every time the window size changes.
if ( FCKBrowserInfo.IsGecko )
{
	function Window_OnResize()
	{
		if ( FCKBrowserInfo.IsOpera )
			return ;

		var oCell = document.getElementById( 'xEditingArea' ) ;

		var eInnerElement = oCell.firstChild ;
		if ( eInnerElement )
		{
			eInnerElement.style.height = 0 ;
			eInnerElement.style.height = oCell.scrollHeight - 2 ;
		}
	}
	window.onresize = Window_OnResize ;
}

	</script>
</head>
<body>
	<table width="100%" cellpadding="0" cellspacing="0" style="height: 100%; table-layout: fixed">
		<tr id="xToolbarRow" style="display: none">
			<td id="xToolbarSpace" style="overflow: hidden">
				<table width="100%" cellpadding="0" cellspacing="0">
					<tr id="xCollapsed" style="display: none">
						<td id="xExpandHandle" class="TB_Expand" colspan="3">
							<img class="TB_ExpandImg" alt="" src="images/spacer.gif" width="8" height="4" /></td>
					</tr>
					<tr id="xExpanded" style="display: none">
						<td id="xTBLeftBorder" class="TB_SideBorder" style="width: 1px; display: none;"></td>
						<td id="xCollapseHandle" style="display: none" class="TB_Collapse" valign="bottom">
							<img class="TB_CollapseImg" alt="" src="images/spacer.gif" width="8" height="4" /></td>
						<td id="xToolbar" class="TB_ToolbarSet"></td>
						<td class="TB_SideBorder" style="width: 1px"></td>
					</tr>
				</table>
			</td>
		</tr>
		<tr>
			<td id="xEditingArea" valign="top" style="height: 100%"></td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fckdebug.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the Debug window.
 * It automatically popups if the Debug = true in the configuration file.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>FCKeditor Debug Window</title>
	<meta name="robots" content="noindex, nofollow" />
	<script type="text/javascript">

var oWindow ;
var oDiv ;

if ( !window.FCKMessages )
	window.FCKMessages = new Array() ;

window.onload = function()
{
	oWindow = document.getElementById('xOutput').contentWindow ;
	oWindow.document.open() ;
	oWindow.document.write( '<div id="divMsg"><\/div>' ) ;
	oWindow.document.close() ;
	oDiv	= oWindow.document.getElementById('divMsg') ;
}

function Output( message, color, noParse )
{
	if ( !noParse && message != null && isNaN( message ) )
		message = message.replace(/</g, "&lt;") ;

	if ( color )
		message = '<font color="' + color + '">' + message + '<\/font>' ;

	window.FCKMessages[ window.FCKMessages.length ] = message ;
	StartTimer() ;
}

function OutputObject( anyObject, color )
{
	var message ;

	if ( anyObject != null )
	{
		message = 'Properties of: ' + anyObject + '</b><blockquote>' ;

		for (var prop in anyObject)
		{
			try
			{
				var sVal = anyObject[ prop ] != null ? anyObject[ prop ] + '' : '[null]' ;
				message += '<b>' + prop + '</b> : ' + sVal.replace(/</g, '&lt;') + '<br>' ;
			}
			catch (e)
			{
				try
				{
					message += '<b>' + prop + '</b> : [' + typeof( anyObject[ prop ] ) + ']<br>' ;
				}
				catch (e)
				{
					message += '<b>' + prop + '</b> : [-error-]<br>' ;
				}
			}
		}

		message += '</blockquote><b>' ;
	} else
		message = 'OutputObject : Object is "null".' ;

	Output( message, color, true ) ;
}

function StartTimer()
{
	window.setTimeout( 'CheckMessages()', 100 ) ;
}

function CheckMessages()
{
	if ( window.FCKMessages.length > 0 )
	{
		// Get the first item in the queue
		var sMessage = window.FCKMessages[0] ;

		// Removes the first item from the queue
		var oTempArray = new Array() ;
		for ( i = 1 ; i < window.FCKMessages.length ; i++ )
			oTempArray[ i - 1 ] = window.FCKMessages[ i ] ;
		window.FCKMessages = oTempArray ;

		var d = new Date() ;
		var sTime =
			( d.getHours() + 100 + '' ).substr( 1,2 ) + ':' +
			( d.getMinutes() + 100 + '' ).substr( 1,2 ) + ':' +
			( d.getSeconds() + 100 + '' ).substr( 1,2 ) + ':' +
			( d.getMilliseconds() + 1000 + '' ).substr( 1,3 ) ;

		var oMsgDiv = oWindow.document.createElement( 'div' ) ;
		oMsgDiv.innerHTML = sTime + ': <b>' + sMessage + '<\/b>' ;
		oDiv.appendChild( oMsgDiv ) ;
		oMsgDiv.scrollIntoView() ;
	}
}

function Clear()
{
	oDiv.innerHTML = '' ;
}
	</script>
</head>
<body style="margin: 10px">
	<table style="height: 100%" cellspacing="5" cellpadding="0" width="100%" border="0">
		<tr>
			<td>
				<table cellspacing="0" cellpadding="0" width="100%" border="0">
					<tr>
						<td style="font-weight: bold; font-size: 1.2em;">
							FCKeditor Debug Window</td>
						<td align="right">
							<input type="button" value="Clear" onclick="Clear();" /></td>
					</tr>
				</table>
			</td>
		</tr>
		<tr style="height: 100%">
			<td style="border: #696969 1px solid">
				<iframe id="xOutput" width="100%" height="100%" scrolling="auto" src="javascript:void(0)"
					frameborder="0"></iframe>
			</td>
		</tr>
	</table>
</body>
</html>



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/lang
	de.js, 1.3, 1.4 en.js, 1.4, 1.5 fr.js, 1.4, 1.5 it.js, 1.4,
	1.5 pl.js, 1.2, 1.3
Message-ID: <20080209125402.B8A7A10FE80@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/lang
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/plugins/placeholder/lang

Added Files:
	de.js en.js fr.js it.js pl.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: en.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: pl.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: de.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fr.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: it.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts
	spellchecker.cfm, 1.2, 1.3 spellchecker.php, 1.2,
	1.3 spellchecker.pl, 1.2, 1.3
Message-ID: <20080209125402.0A61510FE22@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog/fck_spellerpages/spellerpages/server-scripts

Added Files:
	spellchecker.cfm spellchecker.php spellchecker.pl 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: spellchecker.pl ---
#!/usr/bin/perl

use CGI qw/ :standard /;
use File::Temp qw/ tempfile tempdir /;

# my $spellercss = '/speller/spellerStyle.css';					# by FredCK
my $spellercss = '../spellerStyle.css';							# by FredCK
# my $wordWindowSrc = '/speller/wordWindow.js';					# by FredCK
my $wordWindowSrc = '../wordWindow.js';							# by FredCK
my @textinputs = param( 'textinputs[]' ); # array
# my $aspell_cmd = 'aspell';									# by FredCK (for Linux)
my $aspell_cmd = '"C:\Program Files\Aspell\bin\aspell.exe"';	# by FredCK (for Windows)
my $lang = 'en_US';
# my $aspell_opts = "-a --lang=$lang --encoding=utf-8";			# by FredCK
my $aspell_opts = "-a --lang=$lang --encoding=utf-8 -H --rem-sgml-check=alt";		# by FredCK
my $input_separator = "A";

# set the 'wordtext' JavaScript variable to the submitted text.
sub printTextVar {
	for( my $i = 0; $i <= $#textinputs; $i++ ) {
	        print "textinputs[$i] = decodeURIComponent('" . escapeQuote( $textinputs[$i] ) . "')\n";
	}
}

sub printTextIdxDecl {
	my $idx = shift;
	print "words[$idx] = [];\n";
	print "suggs[$idx] = [];\n";
}

sub printWordsElem {
	my( $textIdx, $wordIdx, $word ) = @_;
	print "words[$textIdx][$wordIdx] = '" . escapeQuote( $word ) . "';\n";
}

sub printSuggsElem {
	my( $textIdx, $wordIdx, @suggs ) = @_;
	print "suggs[$textIdx][$wordIdx] = [";
	for my $i ( 0..$#suggs ) {
		print "'" . escapeQuote( $suggs[$i] ) . "'";
		if( $i < $#suggs ) {
			print ", ";
		}
	}
	print "];\n";
}

sub printCheckerResults {
	my $textInputIdx = -1;
	my $wordIdx = 0;
	my $unhandledText;
	# create temp file
	my $dir = tempdir( CLEANUP => 1 );
	my( $fh, $tmpfilename ) = tempfile( DIR => $dir );

	# temp file was created properly?

	# open temp file, add the submitted text.
	for( my $i = 0; $i <= $#textinputs; $i++ ) {
		$text = url_decode( $textinputs[$i] );
		# Strip all tags for the text. (by FredCK - #339 / #681)
		$text =~ s/<[^>]+>/ /g;
		@lines = split( /\n/, $text );
		print $fh "\%\n"; # exit terse mode
		print $fh "^$input_separator\n";
		print $fh "!\n";  # enter terse mode
		for my $line ( @lines ) {
			# use carat on each line to escape possible aspell commands
			print $fh "^$line\n";
		}

	}
	# exec aspell command
	my $cmd = "$aspell_cmd $aspell_opts < $tmpfilename 2>&1";
	open ASPELL, "$cmd |" or handleError( "Could not execute `$cmd`\\n$!" ) and return;
	# parse each line of aspell return
	for my $ret ( <ASPELL> ) {
		chomp( $ret );
		# if '&', then not in dictionary but has suggestions
		# if '#', then not in dictionary and no suggestions
		# if '*', then it is a delimiter between text inputs
		if( $ret =~ /^\*/ ) {
			$textInputIdx++;
			printTextIdxDecl( $textInputIdx );
			$wordIdx = 0;

		} elsif( $ret =~ /^(&|#)/ ) {
			my @tokens = split( " ", $ret, 5 );
			printWordsElem( $textInputIdx, $wordIdx, $tokens[1] );
			my @suggs = ();
			if( $tokens[4] ) {
				@suggs = split( ", ", $tokens[4] );
			}
			printSuggsElem( $textInputIdx, $wordIdx, @suggs );
			$wordIdx++;
		} else {
			$unhandledText .= $ret;
		}
	}
	close ASPELL or handleError( "Error executing `$cmd`\\n$unhandledText" ) and return;
}

sub escapeQuote {
	my $str = shift;
	$str =~ s/'/\\'/g;
	return $str;
}

sub handleError {
	my $err = shift;
	print "error = '" . escapeQuote( $err ) . "';\n";
}

sub url_decode {
	local $_ = @_ ? shift : $_;
	defined or return;
	# change + signs to spaces
	tr/+/ /;
	# change hex escapes to the proper characters
	s/%([a-fA-F0-9]{2})/pack "H2", $1/eg;
	return $_;
}

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Display HTML
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

print <<EOF;
Content-type: text/html; charset=utf-8

<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="$spellercss"/>
<script src="$wordWindowSrc"></script>
<script type="text/javascript">
var suggs = new Array();
var words = new Array();
var textinputs = new Array();
var error;
EOF

printTextVar();

printCheckerResults();

print <<EOF;
var wordWindowObj = new wordWindow();
wordWindowObj.originalSpellings = words;
wordWindowObj.suggestions = suggs;
wordWindowObj.textInputs = textinputs;


function init_spell() {
	// check if any error occured during server-side processing
	if( error ) {
		alert( error );
	} else {
		// call the init_spell() function in the parent frameset
		if (parent.frames.length) {
			parent.init_spell( wordWindowObj );
		} else {
			error = "This page was loaded outside of a frameset. ";
			error += "It might not display properly";
			alert( error );
		}
	}
}

</script>

</head>
<body onLoad="init_spell();">

<script type="text/javascript">
wordWindowObj.writeBody();
</script>

</body>
</html>
EOF



--- NEW FILE: spellchecker.php ---
<?php
header('Content-type: text/html; charset=utf-8');

// The following variables values must reflect your installation needs.

$aspell_prog	= '"C:\Program Files\Aspell\bin\aspell.exe"';	// by FredCK (for Windows)
//$aspell_prog	= 'aspell';										// by FredCK (for Linux)

$lang			= 'en_US';
$aspell_opts	= "-a --lang=$lang --encoding=utf-8 -H --rem-sgml-check=alt";		// by FredCK

$tempfiledir	= "./";

$spellercss		= '../spellerStyle.css';						// by FredCK
$word_win_src	= '../wordWindow.js';							// by FredCK

$textinputs		= $_POST['textinputs']; # array
$input_separator = "A";

# set the JavaScript variable to the submitted text.
# textinputs is an array, each element corresponding to the (url-encoded)
# value of the text control submitted for spell-checking
function print_textinputs_var() {
	global $textinputs;
	foreach( $textinputs as $key=>$val ) {
		# $val = str_replace( "'", "%27", $val );
		echo "textinputs[$key] = decodeURIComponent(\"" . $val . "\");\n";
	}
}

# make declarations for the text input index
function print_textindex_decl( $text_input_idx ) {
	echo "words[$text_input_idx] = [];\n";
	echo "suggs[$text_input_idx] = [];\n";
}

# set an element of the JavaScript 'words' array to a misspelled word
function print_words_elem( $word, $index, $text_input_idx ) {
	echo "words[$text_input_idx][$index] = '" . escape_quote( $word ) . "';\n";
}


# set an element of the JavaScript 'suggs' array to a list of suggestions
function print_suggs_elem( $suggs, $index, $text_input_idx ) {
	echo "suggs[$text_input_idx][$index] = [";
	foreach( $suggs as $key=>$val ) {
		if( $val ) {
			echo "'" . escape_quote( $val ) . "'";
			if ( $key+1 < count( $suggs )) {
				echo ", ";
			}
		}
	}
	echo "];\n";
}

# escape single quote
function escape_quote( $str ) {
	return preg_replace ( "/'/", "\\'", $str );
}


# handle a server-side error.
function error_handler( $err ) {
	echo "error = '" . escape_quote( $err ) . "';\n";
}

## get the list of misspelled words. Put the results in the javascript words array
## for each misspelled word, get suggestions and put in the javascript suggs array
function print_checker_results() {

	global $aspell_prog;
	global $aspell_opts;
	global $tempfiledir;
	global $textinputs;
	global $input_separator;
	$aspell_err = "";
	# create temp file
	$tempfile = tempnam( $tempfiledir, 'aspell_data_' );

	# open temp file, add the submitted text.
	if( $fh = fopen( $tempfile, 'w' )) {
		for( $i = 0; $i < count( $textinputs ); $i++ ) {
			$text = urldecode( $textinputs[$i] );

			// Strip all tags for the text. (by FredCK - #339 / #681)
			$text = preg_replace( "/<[^>]+>/", " ", $text ) ;

			$lines = explode( "\n", $text );
			fwrite ( $fh, "%\n" ); # exit terse mode
			fwrite ( $fh, "^$input_separator\n" );
			fwrite ( $fh, "!\n" ); # enter terse mode
			foreach( $lines as $key=>$value ) {
				# use carat on each line to escape possible aspell commands
				fwrite( $fh, "^$value\n" );
			}
		}
		fclose( $fh );

		# exec aspell command - redirect STDERR to STDOUT
		$cmd = "$aspell_prog $aspell_opts < $tempfile 2>&1";
		if( $aspellret = shell_exec( $cmd )) {
			$linesout = explode( "\n", $aspellret );
			$index = 0;
			$text_input_index = -1;
			# parse each line of aspell return
			foreach( $linesout as $key=>$val ) {
				$chardesc = substr( $val, 0, 1 );
				# if '&', then not in dictionary but has suggestions
				# if '#', then not in dictionary and no suggestions
				# if '*', then it is a delimiter between text inputs
				# if '@' then version info
				if( $chardesc == '&' || $chardesc == '#' ) {
					$line = explode( " ", $val, 5 );
					print_words_elem( $line[1], $index, $text_input_index );
					if( isset( $line[4] )) {
						$suggs = explode( ", ", $line[4] );
					} else {
						$suggs = array();
					}
					print_suggs_elem( $suggs, $index, $text_input_index );
					$index++;
				} elseif( $chardesc == '*' ) {
					$text_input_index++;
					print_textindex_decl( $text_input_index );
					$index = 0;
				} elseif( $chardesc != '@' && $chardesc != "" ) {
					# assume this is error output
					$aspell_err .= $val;
				}
			}
			if( $aspell_err ) {
				$aspell_err = "Error executing `$cmd`\\n$aspell_err";
				error_handler( $aspell_err );
			}
		} else {
			error_handler( "System error: Aspell program execution failed (`$cmd`)" );
		}
	} else {
		error_handler( "System error: Could not open file '$tempfile' for writing" );
	}

	# close temp file, delete file
	unlink( $tempfile );
}


?>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="<?php echo $spellercss ?>" />
<script language="javascript" src="<?php echo $word_win_src ?>"></script>
<script language="javascript">
var suggs = new Array();
var words = new Array();
var textinputs = new Array();
var error;
<?php

print_textinputs_var();

print_checker_results();

?>

var wordWindowObj = new wordWindow();
wordWindowObj.originalSpellings = words;
wordWindowObj.suggestions = suggs;
wordWindowObj.textInputs = textinputs;

function init_spell() {
	// check if any error occured during server-side processing
	if( error ) {
		alert( error );
	} else {
		// call the init_spell() function in the parent frameset
		if (parent.frames.length) {
			parent.init_spell( wordWindowObj );
		} else {
			alert('This page was loaded outside of a frameset. It might not display properly');
		}
	}
}



</script>

</head>
<!-- <body onLoad="init_spell();">		by FredCK -->
<body onLoad="init_spell();" bgcolor="#ffffff">

<script type="text/javascript">
wordWindowObj.writeBody();
</script>

</body>
</html>



--- NEW FILE: spellchecker.cfm ---
<cfsetting enablecfoutputonly="true">
<!---
This code uses a CF User Defined Function and should work in CF version 5.0
and up without alteration.

Also if you are hosting your site at an ISP, you will have to check with them
to see if the use of <CFEXECUTE> is allowed. In most cases ISP will not allow
the use of that tag for security reasons. Clients would be able to access each
others files in certain cases.
--->

<!--- The following variables values must reflect your installation. --->
<cfset aspell_dir	  = "C:\Program Files\Aspell\bin">
<cfset lang         = "en_US">
<cfset aspell_opts  = "-a --lang=#lang# --encoding=utf-8 -H --rem-sgml-check=alt">
<cfset tempfile_in  = GetTempFile(GetTempDirectory(), "spell_")>
<cfset tempfile_out = GetTempFile(GetTempDirectory(), "spell_")>
<cfset spellercss   = "../spellerStyle.css">
<cfset word_win_src = "../wordWindow.js">

<cfset form.checktext = form["textinputs[]"]>

<!--- make no difference between URL and FORM scopes --->
<cfparam name="url.checktext"  default="">
<cfparam name="form.checktext" default="#url.checktext#">

<!--- Takes care of those pesky smart quotes from MS apps, replaces them with regular quotes --->
<cfset submitted_text = ReplaceList(form.checktext,"%u201C,%u201D","%22,%22")>

<!--- submitted_text now is ready for processing --->

<!--- use carat on each line to escape possible aspell commands --->
<cfset text = "">
<cfset CRLF = Chr(13) & Chr(10)>

<cfloop list="#submitted_text#" index="field" delimiters=",">
	<cfset text = text & "%"  & CRLF
                      & "^A" & CRLF
                      & "!"  & CRLF>
	<!--- Strip all tags for the text. (by FredCK - #339 / #681) --->
	<cfset field = REReplace(URLDecode(field), "<[^>]+>", " ", "all")>
	<cfloop list="#field#" index="line" delimiters="#CRLF#">
		<cfset text = ListAppend(text, "^" & Trim(JSStringFormat(line)), CRLF)>
	</cfloop>
</cfloop>

<!--- create temp file from the submitted text, this will be passed to aspell to be check for misspelled words --->
<cffile action="write" file="#tempfile_in#" output="#text#" charset="utf-8">

<!--- execute aspell in an UTF-8 console and redirect output to a file. UTF-8 encoding is lost if done differently --->
<cfexecute name="cmd.exe" arguments='/c type "#tempfile_in#" | "#aspell_dir#\aspell.exe" #aspell_opts# > "#tempfile_out#"' timeout="100"/>

<!--- read output file for further processing --->
<cffile action="read" file="#tempfile_out#" variable="food" charset="utf-8">

<!--- remove temp files --->
<cffile action="delete" file="#tempfile_in#">
<cffile action="delete" file="#tempfile_out#">

<cfset texts = StructNew()>
<cfset texts.textinputs = "">
<cfset texts.words      = "">
<cfset texts.abort      = "">

<!--- Generate Text Inputs --->
<cfset i = 0>
<cfloop list="#submitted_text#" index="textinput">
  <cfset texts.textinputs = ListAppend(texts.textinputs, 'textinputs[#i#] = decodeURIComponent("#textinput#");', CRLF)>
  <cfset i = i + 1>
</cfloop>

<!--- Generate Words Lists --->
<cfset word_cnt  = 0>
<cfset input_cnt = -1>
<cfloop list="#food#" index="aspell_line" delimiters="#CRLF#">
    <cfset leftChar = Left(aspell_line, 1)>
	<cfif leftChar eq "*">
			<cfset input_cnt   = input_cnt + 1>
			<cfset word_cnt    = 0>
			<cfset texts.words = ListAppend(texts.words, "words[#input_cnt#] = [];", CRLF)>
			<cfset texts.words = ListAppend(texts.words, "suggs[#input_cnt#] = [];", CRLF)>
    <cfelse>
        <cfif leftChar eq "&" or leftChar eq "##">
			<!--- word that misspelled --->
			<cfset bad_word    = Trim(ListGetAt(aspell_line, 2, " "))>
			<cfset bad_word    = Replace(bad_word, "'", "\'", "ALL")>
			<!--- sugestions --->
			<cfset sug_list    = Trim(ListRest(aspell_line, ":"))>
			<cfset sug_list    = ListQualify(Replace(sug_list, "'", "\'", "ALL"), "'")>
			<!--- javascript --->
			<cfset texts.words = ListAppend(texts.words, "words[#input_cnt#][#word_cnt#] = '#bad_word#';", CRLF)>
			<cfset texts.words = ListAppend(texts.words, "suggs[#input_cnt#][#word_cnt#] = [#sug_list#];", CRLF)>
			<cfset word_cnt    = word_cnt + 1>
		</cfif>
     </cfif>
</cfloop>

<cfif texts.words eq "">
  <cfset texts.abort = "alert('Spell check complete.\n\nNo misspellings found.'); top.window.close();">
</cfif>

<cfcontent type="text/html; charset=utf-8">

<cfoutput><html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="#spellercss#" />
<script language="javascript" src="#word_win_src#"></script>
<script language="javascript">
var suggs      = new Array();
var words      = new Array();
var textinputs = new Array();
var error;

#texts.textinputs##CRLF#
#texts.words#
#texts.abort#

var wordWindowObj = new wordWindow();
wordWindowObj.originalSpellings = words;
wordWindowObj.suggestions = suggs;
wordWindowObj.textInputs = textinputs;

function init_spell() {
	// check if any error occured during server-side processing
	if( error ) {
		alert( error );
	} else {
		// call the init_spell() function in the parent frameset
		if (parent.frames.length) {
			parent.init_spell( wordWindowObj );
		} else {
			alert('This page was loaded outside of a frameset. It might not display properly');
		}
	}
}
</script>

</head>
<body onLoad="init_spell();">

<script type="text/javascript">
wordWindowObj.writeBody();
</script>

</body>
</html></cfoutput>
<cfsetting enablecfoutputonly="false">



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/images/smiley/msn
	angel_smile.gif, 1.2, 1.3 angry_smile.gif, 1.2,
	1.3 broken_heart.gif, 1.2, 1.3 cake.gif, 1.2,
	1.3 confused_smile.gif, 1.2, 1.3 cry_smile.gif, 1.2,
	1.3 devil_smile.gif, 1.2, 1.3 embaressed_smile.gif, 1.2,
	1.3 envelope.gif, 1.2, 1.3 heart.gif, 1.2, 1.3 kiss.gif, 1.2,
	1.3 lightbulb.gif, 1.2, 1.3 omg_smile.gif, 1.2,
	1.3 regular_smile.gif, 1.2, 1.3 sad_smile.gif, 1.2,
	1.3 shades_smile.gif, 1.2, 1.3 teeth_smile.gif, 1.2,
	1.3 thumbs_down.gif, 1.2, 1.3 thumbs_up.gif, 1.2,
	1.3 tounge_smile.gif, 1.2, 1.3 whatchutalkingabout_smile.gif,
	1.2, 1.3 wink_smile.gif, 1.2, 1.3
Message-ID: <20080209125402.86F9310FE78@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/images/smiley/msn
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/images/smiley/msn

Added Files:
	angel_smile.gif angry_smile.gif broken_heart.gif cake.gif 
	confused_smile.gif cry_smile.gif devil_smile.gif 
	embaressed_smile.gif envelope.gif heart.gif kiss.gif 
	lightbulb.gif omg_smile.gif regular_smile.gif sad_smile.gif 
	shades_smile.gif teeth_smile.gif thumbs_down.gif thumbs_up.gif 
	tounge_smile.gif whatchutalkingabout_smile.gif wink_smile.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: thumbs_down.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: shades_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: regular_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: heart.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: tounge_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: devil_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: whatchutalkingabout_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: teeth_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: omg_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: thumbs_up.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: lightbulb.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: embaressed_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: broken_heart.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: confused_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: kiss.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cry_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: angry_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cake.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: angel_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: wink_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sad_smile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: envelope.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js
	common.js, 1.3, 1.4 fckxml.js, 1.2, 1.3
Message-ID: <20080209125402.4F89710FE2E@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/browser/default/js

Added Files:
	common.js fckxml.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: common.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckxml.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default
	browser.css, 1.2, 1.3 browser.html, 1.2,
	1.3 frmactualfolder.html, 1.2, 1.3 frmcreatefolder.html, 1.2,
	1.3 frmfolders.html, 1.2, 1.3 frmresourceslist.html, 1.3,
	1.4 frmresourcetype.html, 1.2, 1.3 frmupload.html, 1.2, 1.3
Message-ID: <20080209125402.2322D10FE29@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/browser/default

Added Files:
	browser.css browser.html frmactualfolder.html 
	frmcreatefolder.html frmfolders.html frmresourceslist.html 
	frmresourcetype.html frmupload.html 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: frmfolders.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This page shows the list of folders available in the parent folder
 * of the current folder.
-->
<html>
	<head>
		<link href="browser.css" type="text/css" rel="stylesheet">
		<script type="text/javascript" src="js/common.js"></script>
		<script language="javascript">

var sActiveFolder ;

var bIsLoaded = false ;
var iIntervalId ;

var oListManager = new Object() ;

oListManager.Init = function()
{
	this.Table = document.getElementById('tableFiles') ;
	this.UpRow = document.getElementById('trUp') ;

	this.TableRows = new Object() ;
}

oListManager.Clear = function()
{
	// Remove all other rows available.
	while ( this.Table.rows.length > 1 )
		this.Table.deleteRow(1) ;

	// Reset the TableRows collection.
	this.TableRows = new Object() ;
}

oListManager.AddItem = function( folderName, folderPath )
{
	// Create the new row.
	var oRow = this.Table.insertRow(-1) ;
	oRow.className = 'FolderListFolder' ;

	// Build the link to view the folder.
	var sLink = '<a href="#" onclick="OpenFolder(\'' + folderPath + '\');return false;">' ;

	// Add the folder icon cell.
	var oCell = oRow.insertCell(-1) ;
	oCell.width = 16 ;
	oCell.innerHTML = sLink + '<img alt="" src="images/spacer.gif" width="16" height="16" border="0"></a>' ;

	// Add the folder name cell.
	oCell = oRow.insertCell(-1) ;
	oCell.noWrap = true ;
	oCell.innerHTML = '&nbsp;' + sLink + folderName + '</a>' ;

	this.TableRows[ folderPath ] = oRow ;
}

oListManager.ShowUpFolder = function( upFolderPath )
{
	this.UpRow.style.display = ( upFolderPath != null ? '' : 'none' ) ;

	if ( upFolderPath != null )
	{
		document.getElementById('linkUpIcon').onclick = document.getElementById('linkUp').onclick = function()
		{
			LoadFolders( upFolderPath ) ;
			return false ;
		}
	}
}

function CheckLoaded()
{
	if ( window.top.IsLoadedActualFolder
		&& window.top.IsLoadedCreateFolder
		&& window.top.IsLoadedUpload
		&& window.top.IsLoadedResourcesList )
	{
		window.clearInterval( iIntervalId ) ;
		bIsLoaded = true ;
		OpenFolder( sActiveFolder ) ;
	}
}

function OpenFolder( folderPath )
{
	sActiveFolder = folderPath ;

	if ( ! bIsLoaded )
	{
		if ( ! iIntervalId )
			iIntervalId = window.setInterval( CheckLoaded, 100 ) ;
		return ;
	}

	// Change the style for the select row (to show the opened folder).
	for ( var sFolderPath in oListManager.TableRows )
	{
		oListManager.TableRows[ sFolderPath ].className =
			( sFolderPath == folderPath ? 'FolderListCurrentFolder' : 'FolderListFolder' ) ;
	}

	// Set the current folder in all frames.
	window.parent.frames['frmActualFolder'].SetCurrentFolder( oConnector.ResourceType, folderPath ) ;
	window.parent.frames['frmCreateFolder'].SetCurrentFolder( oConnector.ResourceType, folderPath ) ;
	window.parent.frames['frmUpload'].SetCurrentFolder( oConnector.ResourceType, folderPath ) ;

	// Load the resources list for this folder.
	window.parent.frames['frmResourcesList'].LoadResources( oConnector.ResourceType, folderPath ) ;
}

function LoadFolders( folderPath )
{
	// Clear the folders list.
	oListManager.Clear() ;

	// Get the parent folder path.
	var sParentFolderPath ;
	if ( folderPath != '/' )
		sParentFolderPath = folderPath.substring( 0, folderPath.lastIndexOf( '/', folderPath.length - 2 ) + 1 ) ;

	// Show/Hide the Up Folder.
	oListManager.ShowUpFolder( sParentFolderPath ) ;

	if ( folderPath != '/' )
	{
		sActiveFolder = folderPath ;
		oConnector.CurrentFolder = sParentFolderPath ;
		oConnector.SendCommand( 'GetFolders', null, GetFoldersCallBack ) ;
	}
	else
		OpenFolder( '/' ) ;
}

function GetFoldersCallBack( fckXml )
{
	if ( oConnector.CheckError( fckXml ) != 0 )
		return ;

	// Get the current folder path.
	var oNode = fckXml.SelectSingleNode( 'Connector/CurrentFolder' ) ;
	var sCurrentFolderPath = oNode.attributes.getNamedItem('path').value ;

	var oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ;

	for ( var i = 0 ; i < oNodes.length ; i++ )
	{
		var sFolderName = oNodes[i].attributes.getNamedItem('name').value ;
		oListManager.AddItem( sFolderName, sCurrentFolderPath + sFolderName + '/' ) ;
	}

	OpenFolder( sActiveFolder ) ;
}

function SetResourceType( type )
{
	oConnector.ResourceType = type ;
	LoadFolders( '/' ) ;
}

window.onload = function()
{
	oListManager.Init() ;
	LoadFolders( '/' ) ;
}
		</script>
	</head>
	<body class="FileArea" bottomMargin="10" leftMargin="10" topMargin="10" rightMargin="10">
		<table id="tableFiles" cellSpacing="0" cellPadding="0" width="100%" border="0">
			<tr id="trUp" style="DISPLAY: none">
				<td width="16"><a id="linkUpIcon" href="#"><img alt="" src="images/FolderUp.gif" width="16" height="16" border="0"></a></td>
				<td nowrap width="100%">&nbsp;<a id="linkUp" href="#">..</a></td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: frmactualfolder.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This page shows the actual folder path.
-->
<html>
	<head>
		<link href="browser.css" type="text/css" rel="stylesheet">
		<script type="text/javascript">

function OnResize()
{
	divName.style.width = "1px" ;
	divName.style.width = tdName.offsetWidth + "px" ;
}

function SetCurrentFolder( resourceType, folderPath )
{
	document.getElementById('tdName').innerHTML = folderPath ;
}

window.onload = function()
{
	window.top.IsLoadedActualFolder = true ;
}

		</script>
	</head>
	<body bottomMargin="0" topMargin="0">
		<table height="100%" cellSpacing="0" cellPadding="0" width="100%" border="0">
			<tr>
				<td>
					<button style="WIDTH: 100%" type="button">
						<table cellSpacing="0" cellPadding="0" width="100%" border="0">
							<tr>
								<td><img height="32" alt="" src="images/FolderOpened32.gif" width="32"></td>
								<td>&nbsp;</td>
								<td id="tdName" width="100%" nowrap class="ActualFolder">/</td>
								<td>&nbsp;</td>
								<td><img height="8" src="images/ButtonArrow.gif" width="12"></td>
								<td>&nbsp;</td>
							</tr>
						</table>
					</button>
				</td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: browser.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This page compose the File Browser dialog frameset.
-->
<html>
	<head>
		<title>FCKeditor - Resources Browser</title>
		<link href="browser.css" type="text/css" rel="stylesheet">
		<script type="text/javascript" src="js/fckxml.js"></script>
		<script language="javascript">

function GetUrlParam( paramName )
{
	var oRegex = new RegExp( '[\?&]' + paramName + '=([^&]+)', 'i' ) ;
	var oMatch = oRegex.exec( window.top.location.search ) ;

	if ( oMatch && oMatch.length > 1 )
		return decodeURIComponent( oMatch[1] ) ;
	else
		return '' ;
}

var oConnector = new Object() ;
oConnector.CurrentFolder	= '/' ;

var sConnUrl = GetUrlParam( 'Connector' ) ;

// Gecko has some problems when using relative URLs (not starting with slash).
if ( sConnUrl.substr(0,1) != '/' && sConnUrl.indexOf( '://' ) < 0 )
	sConnUrl = window.location.href.replace( /browser.html.*$/, '' ) + sConnUrl ;

oConnector.ConnectorUrl = sConnUrl + ( sConnUrl.indexOf('?') != -1 ? '&' : '?' ) ;

var sServerPath = GetUrlParam( 'ServerPath' ) ;
if ( sServerPath.length > 0 )
	oConnector.ConnectorUrl += 'ServerPath=' + encodeURIComponent( sServerPath ) + '&' ;

oConnector.ResourceType		= GetUrlParam( 'Type' ) ;
oConnector.ShowAllTypes		= ( oConnector.ResourceType.length == 0 ) ;

if ( oConnector.ShowAllTypes )
	oConnector.ResourceType = 'File' ;

oConnector.SendCommand = function( command, params, callBackFunction )
{
	var sUrl = this.ConnectorUrl + 'Command=' + command ;
	sUrl += '&Type=' + this.ResourceType ;
	sUrl += '&CurrentFolder=' + encodeURIComponent( this.CurrentFolder ) ;

	if ( params ) sUrl += '&' + params ;

	// Add a random salt to avoid getting a cached version of the command execution
	sUrl += '&uuid=' + new Date().getTime() ;

	var oXML = new FCKXml() ;

	if ( callBackFunction )
		oXML.LoadUrl( sUrl, callBackFunction ) ;	// Asynchronous load.
	else
		return oXML.LoadUrl( sUrl ) ;

	return null ;
}

oConnector.CheckError = function( responseXml )
{
	var iErrorNumber = 0 ;
	var oErrorNode = responseXml.SelectSingleNode( 'Connector/Error' ) ;

	if ( oErrorNode )
	{
		iErrorNumber = parseInt( oErrorNode.attributes.getNamedItem('number').value, 10 ) ;

		switch ( iErrorNumber )
		{
			case 0 :
				break ;
			case 1 :	// Custom error. Message placed in the "text" attribute.
				alert( oErrorNode.attributes.getNamedItem('text').value ) ;
				break ;
			case 101 :
				alert( 'Folder already exists' ) ;
				break ;
			case 102 :
				alert( 'Invalid folder name' ) ;
				break ;
			case 103 :
				alert( 'You have no permissions to create the folder' ) ;
				break ;
			case 110 :
				alert( 'Unknown error creating folder' ) ;
				break ;
			default :
				alert( 'Error on your request. Error number: ' + iErrorNumber ) ;
				break ;
		}
	}
	return iErrorNumber ;
}

var oIcons = new Object() ;

oIcons.AvailableIconsArray = [
	'ai','avi','bmp','cs','dll','doc','exe','fla','gif','htm','html','jpg','js',
	'mdb','mp3','pdf','png','ppt','rdp','swf','swt','txt','vsd','xls','xml','zip' ] ;

oIcons.AvailableIcons = new Object() ;

for ( var i = 0 ; i < oIcons.AvailableIconsArray.length ; i++ )
	oIcons.AvailableIcons[ oIcons.AvailableIconsArray[i] ] = true ;

oIcons.GetIcon = function( fileName )
{
	var sExtension = fileName.substr( fileName.lastIndexOf('.') + 1 ).toLowerCase() ;

	if ( this.AvailableIcons[ sExtension ] == true )
		return sExtension ;
	else
		return 'default.icon' ;
}

function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
{
	window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;
}

		</script>
	</head>
	<frameset cols="150,*" class="Frame" framespacing="3" bordercolor="#f1f1e3" frameborder="1">
		<frameset rows="50,*" framespacing="0">
			<frame src="frmresourcetype.html" scrolling="no" frameborder="0">
			<frame name="frmFolders" src="frmfolders.html" scrolling="auto" frameborder="1">
		</frameset>
		<frameset rows="50,*,50" framespacing="0">
			<frame name="frmActualFolder" src="frmactualfolder.html" scrolling="no" frameborder="0">
			<frame name="frmResourcesList" src="frmresourceslist.html" scrolling="auto" frameborder="1">
			<frameset cols="150,*,0" framespacing="0" frameborder="0">
				<frame name="frmCreateFolder" src="frmcreatefolder.html" scrolling="no" frameborder="0">
				<frame name="frmUpload" src="frmupload.html" scrolling="no" frameborder="0">
				<frame name="frmUploadWorker" src="javascript:void(0)" scrolling="no" frameborder="0">
			</frameset>
		</frameset>
	</frameset>
</html>

--- NEW FILE: frmresourcetype.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This page shows the list of available resource types.
-->
<html>
	<head>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<link href="browser.css" type="text/css" rel="stylesheet">
		<script type="text/javascript" src="js/common.js"></script>
		<script language="javascript">

function SetResourceType( type )
{
	window.parent.frames["frmFolders"].SetResourceType( type ) ;
}

var aTypes = [
	['File','File'],
	['Image','Image'],
	['Flash','Flash'],
	['Media','Media']
] ;

window.onload = function()
{
	for ( var i = 0 ; i < aTypes.length ; i++ )
	{
		if ( oConnector.ShowAllTypes || aTypes[i][0] == oConnector.ResourceType )
			AddSelectOption( document.getElementById('cmbType'), aTypes[i][1], aTypes[i][0] ) ;
	}
}

		</script>
	</head>
	<body bottomMargin="0" topMargin="0">
		<table height="100%" cellSpacing="0" cellPadding="0" width="100%" border="0">
			<tr>
				<td nowrap>
					Resource Type<BR>
					<select id="cmbType" style="WIDTH: 100%" onchange="SetResourceType(this.value);">
					</select>
				</td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: frmresourceslist.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This page shows all resources available in a folder in the File Browser.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<link href="browser.css" type="text/css" rel="stylesheet" />
	<script type="text/javascript" src="js/common.js"></script>
	<script type="text/javascript">

var oListManager = new Object() ;

oListManager.Clear = function()
{
	document.body.innerHTML = '' ;
}

function ProtectPath(path)
{
	path = path.replace( /\\/g, '\\\\') ;
	path = path.replace( /'/g, '\\\'') ;
	return path ;
}

oListManager.GetFolderRowHtml = function( folderName, folderPath )
{
	// Build the link to view the folder.
	var sLink = '<a href="#" onclick="OpenFolder(\'' + ProtectPath( folderPath ) + '\');return false;">' ;

	return '<tr>' +
			'<td width="16">' +
				sLink +
				'<img alt="" src="images/Folder.gif" width="16" height="16" border="0"><\/a>' +
			'<\/td><td nowrap colspan="2">&nbsp;' +
				sLink +
				folderName +
				'<\/a>' +
		'<\/td><\/tr>' ;
}

oListManager.GetFileRowHtml = function( fileName, fileUrl, fileSize )
{
	// Build the link to view the folder.
	var sLink = '<a href="#" onclick="OpenFile(\'' + ProtectPath( fileUrl ) + '\');return false;">' ;

	// Get the file icon.
	var sIcon = oIcons.GetIcon( fileName ) ;

	return '<tr>' +
			'<td width="16">' +
				sLink +
				'<img alt="" src="images/icons/' + sIcon + '.gif" width="16" height="16" border="0"><\/a>' +
			'<\/td><td>&nbsp;' +
				sLink +
				fileName +
				'<\/a>' +
			'<\/td><td align="right" nowrap>&nbsp;' +
				fileSize +
				' KB' +
		'<\/td><\/tr>' ;
}

function OpenFolder( folderPath )
{
	// Load the resources list for this folder.
	window.parent.frames['frmFolders'].LoadFolders( folderPath ) ;
}

function OpenFile( fileUrl )
{
	window.top.opener.SetUrl( encodeURI( fileUrl ) ) ;
	window.top.close() ;
	window.top.opener.focus() ;
}

function LoadResources( resourceType, folderPath )
{
	oListManager.Clear() ;
	oConnector.ResourceType = resourceType ;
	oConnector.CurrentFolder = folderPath ;
	oConnector.SendCommand( 'GetFoldersAndFiles', null, GetFoldersAndFilesCallBack ) ;
}

function Refresh()
{
	LoadResources( oConnector.ResourceType, oConnector.CurrentFolder ) ;
}

function GetFoldersAndFilesCallBack( fckXml )
{
	if ( oConnector.CheckError( fckXml ) != 0 )
		return ;

	// Get the current folder path.
	var oFolderNode = fckXml.SelectSingleNode( 'Connector/CurrentFolder' ) ;
	if ( oFolderNode == null )
	{
		alert( 'The server didn\'t reply with a proper XML data. Please check your configuration.' ) ;
		return ;
	}
	var sCurrentFolderPath	= oFolderNode.attributes.getNamedItem('path').value ;
	var sCurrentFolderUrl	= oFolderNode.attributes.getNamedItem('url').value ;

//	var dTimer = new Date() ;

	var oHtml = new StringBuilder( '<table id="tableFiles" cellspacing="1" cellpadding="0" width="100%" border="0">' ) ;

	// Add the Folders.
	var oNodes ;
	oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ;
	for ( var i = 0 ; i < oNodes.length ; i++ )
	{
		var sFolderName = oNodes[i].attributes.getNamedItem('name').value ;
		oHtml.Append( oListManager.GetFolderRowHtml( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ) ;
	}

	// Add the Files.
	oNodes = fckXml.SelectNodes( 'Connector/Files/File' ) ;
	for ( var j = 0 ; j < oNodes.length ; j++ )
	{
		var oNode = oNodes[j] ;
		var sFileName = oNode.attributes.getNamedItem('name').value ;
		var sFileSize = oNode.attributes.getNamedItem('size').value ;

		// Get the optional "url" attribute. If not available, build the url.
		var oFileUrlAtt = oNodes[j].attributes.getNamedItem('url') ;
		var sFileUrl = oFileUrlAtt != null ? oFileUrlAtt.value : sCurrentFolderUrl + sFileName ;

		oHtml.Append( oListManager.GetFileRowHtml( sFileName, sFileUrl, sFileSize ) ) ;
	}

	oHtml.Append( '<\/table>' ) ;

	document.body.innerHTML = oHtml.ToString() ;

//	window.top.document.title = 'Finished processing in ' + ( ( ( new Date() ) - dTimer ) / 1000 ) + ' seconds' ;

}

window.onload = function()
{
	window.top.IsLoadedResourcesList = true ;
}
	</script>
</head>
<body class="FileArea">
</body>
</html>

--- NEW FILE: frmcreatefolder.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Page used to create new folders in the current folder.
-->
<html>
	<head>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<link href="browser.css" type="text/css" rel="stylesheet">
		<script type="text/javascript" src="js/common.js"></script>
		<script language="javascript">

function SetCurrentFolder( resourceType, folderPath )
{
	oConnector.ResourceType = resourceType ;
	oConnector.CurrentFolder = folderPath ;
}

function CreateFolder()
{
	var sFolderName ;

	while ( true )
	{
		sFolderName = prompt( 'Type the name of the new folder:', '' ) ;

		if ( sFolderName == null )
			return ;
		else if ( sFolderName.length == 0 )
			alert( 'Please type the folder name' ) ;
		else
			break ;
	}

	oConnector.SendCommand( 'CreateFolder', 'NewFolderName=' + encodeURIComponent( sFolderName) , CreateFolderCallBack ) ;
}

function CreateFolderCallBack( fckXml )
{
	if ( oConnector.CheckError( fckXml ) == 0 )
		window.parent.frames['frmResourcesList'].Refresh() ;

	/*
	// Get the current folder path.
	var oNode = fckXml.SelectSingleNode( 'Connector/Error' ) ;
	var iErrorNumber = parseInt( oNode.attributes.getNamedItem('number').value ) ;

	switch ( iErrorNumber )
	{
		case 0 :
			window.parent.frames['frmResourcesList'].Refresh() ;
			break ;
		case 101 :
			alert( 'Folder already exists' ) ;
			break ;
		case 102 :
			alert( 'Invalid folder name' ) ;
			break ;
		case 103 :
			alert( 'You have no permissions to create the folder' ) ;
			break ;
		case 110 :
			alert( 'Unknown error creating folder' ) ;
			break ;
		default :
			alert( 'Error creating folder. Error number: ' + iErrorNumber ) ;
			break ;
	}
	*/
}

window.onload = function()
{
	window.top.IsLoadedCreateFolder = true ;
}
		</script>
	</head>
	<body bottomMargin="0" topMargin="0">
		<table height="100%" cellSpacing="0" cellPadding="0" width="100%" border="0">
			<tr>
				<td>
					<button type="button" style="WIDTH: 100%" onclick="CreateFolder();">
						<table cellSpacing="0" cellPadding="0" border="0">
							<tr>
								<td><img height="16" alt="" src="images/Folder.gif" width="16"></td>
								<td>&nbsp;</td>
								<td nowrap>Create New Folder</td>
							</tr>
						</table>
					</button>
				</td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: browser.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * CSS styles used by all pages that compose the File Browser.
 */

body
{
	background-color: #f1f1e3;
}

form
{
	margin: 0px 0px 0px 0px ;
	padding: 0px 0px 0px 0px ;
}

.Frame
{
	background-color: #f1f1e3;
	border-color: #f1f1e3;
	border-right: thin inset;
	border-top: thin inset;
	border-left: thin inset;
	border-bottom: thin inset;
}

body.FileArea
{

	background-color: #ffffff;
	margin: 10px;
}

body, td, input, select
{
	font-size: 11px;
	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
}

.ActualFolder
{
	font-weight: bold;
	font-size: 14px;
}

.PopupButtons
{
	border-top: #d5d59d 1px solid;
	background-color: #e3e3c7;
	padding: 7px 10px 7px 10px;
}

.Button, button
{
	border-right: #737357 1px solid;
	border-top: #737357 1px solid;
	border-left: #737357 1px solid;
	color: #3b3b1f;
	border-bottom: #737357 1px solid;
	background-color: #c7c78f;
}

.FolderListCurrentFolder img
{
	background-image: url(images/FolderOpened.gif);
}

.FolderListFolder img
{
	background-image: url(images/Folder.gif);
}
--- NEW FILE: frmupload.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Page used to upload new files in the current folder.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
		<title>File Upload</title>
		<link href="browser.css" type="text/css" rel="stylesheet" />
		<script type="text/javascript" src="js/common.js"></script>
		<script type="text/javascript">

function SetCurrentFolder( resourceType, folderPath )
{
	var sUrl = oConnector.ConnectorUrl + 'Command=FileUpload' ;
	sUrl += '&Type=' + resourceType ;
	sUrl += '&CurrentFolder=' + encodeURIComponent( folderPath ) ;

	document.getElementById('frmUpload').action = sUrl ;
}

function OnSubmit()
{
	if ( document.getElementById('NewFile').value.length == 0 )
	{
		alert( 'Please select a file from your computer' ) ;
		return false ;
	}

	// Set the interface elements.
	document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder (Upload in progress, please wait...)' ;
	document.getElementById('btnUpload').disabled = true ;

	return true ;
}

function OnUploadCompleted( errorNumber, data )
{
	// Reset the Upload Worker Frame.
	window.parent.frames['frmUploadWorker'].location = 'javascript:void(0)' ;

	// Reset the upload form (On IE we must do a little trick to avoid problems).
	if ( document.all )
		document.getElementById('NewFile').outerHTML = '<input id="NewFile" name="NewFile" style="WIDTH: 100%" type="file">' ;
	else
		document.getElementById('frmUpload').reset() ;

	// Reset the interface elements.
	document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder' ;
	document.getElementById('btnUpload').disabled = false ;

	switch ( errorNumber )
	{
		case 0 :
			window.parent.frames['frmResourcesList'].Refresh() ;
			break ;
		case 1 :	// Custom error.
			alert( data ) ;
			break ;
		case 201 :
			window.parent.frames['frmResourcesList'].Refresh() ;
			alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + data + '"' ) ;
			break ;
		case 202 :
			alert( 'Invalid file' ) ;
			break ;
		default :
			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
			break ;
	}
}

window.onload = function()
{
	window.top.IsLoadedUpload = true ;
}
		</script>
	</head>
	<body bottommargin="0" topmargin="0">
		<form id="frmUpload" action="" target="frmUploadWorker" method="post" enctype="multipart/form-data" onsubmit="return OnSubmit();">
			<table height="100%" cellspacing="0" cellpadding="0" width="100%" border="0">
				<tr>
					<td nowrap="nowrap">
						<span id="eUploadMessage">Upload a new file in this folder</span><br>
						<table cellspacing="0" cellpadding="0" width="100%" border="0">
							<tr>
								<td width="100%"><input id="NewFile" name="NewFile" style="WIDTH: 100%" type="file"></td>
								<td nowrap="nowrap">&nbsp;<input id="btnUpload" type="submit" value="Upload"></td>
							</tr>
						</table>
					</td>
				</tr>
			</table>
		</form>
	</body>
</html>



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/aspx
	config.ascx, NONE, 1.1 connector.aspx, NONE, 1.1 upload.aspx,
	NONE, 1.1
Message-ID: <20080209125402.532E210FE6A@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/aspx
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/connectors/aspx

Added Files:
	config.ascx connector.aspx upload.aspx 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: config.ascx ---
<%@ Control Language="C#" EnableViewState="false" AutoEventWireup="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Config" %>
<%--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Configuration file for the File Browser Connector for ASP.NET.
--%>
<script runat="server">
	
	/**
	 * This function must check the user session to be sure that he/she is
	 * authorized to upload and access files in the File Browser.
	 */
	private bool CheckAuthentication()
	{
		// WARNING : DO NOT simply return "true". By doing so, you are allowing
		// "anyone" to upload and list the files in your server. You must implement
		// some kind of session validation here. Even something very simple as...
		//
		//		return ( Session[ "IsAuthorized" ] != null && (bool)Session[ "IsAuthorized" ] == true );
		//
		// ... where Session[ "IsAuthorized" ] is set to "true" as soon as the
		// user logs in your system.

		return false;
	}

	public override void SetConfig()
	{
		// SECURITY: You must explicitly enable this "connector". (Set it to "true").
		Enabled = CheckAuthentication();

		// URL path to user files.
		UserFilesPath = "/userfiles/";

		// The connector tries to resolve the above UserFilesPath automatically.
		// Use the following setting it you prefer to explicitely specify the
		// absolute path. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
		// Attention: The above 'UserFilesPath' URL must point to the same directory.
		UserFilesAbsolutePath = "";

		// Due to security issues with Apache modules, it is recommended to leave the
		// following setting enabled.
		ForceSingleExtension = true;

		// Allowed Resource Types
		AllowedTypes = new string[] { "File", "Image", "Flash", "Media" };

		// For security, HTML is allowed in the first Kb of data for files having the
		// following extensions only.
		HtmlExtensions = new string[] { "html", "htm", "xml", "xsd", "txt", "js" };

		TypeConfig[ "File" ].AllowedExtensions			= new string[] { "7z", "aiff", "asf", "avi", "bmp", "csv", "doc", "fla", "flv", "gif", "gz", "gzip", "jpeg", "jpg", "mid", "mov", "mp3", "mp4", "mpc", "mpeg", "mpg", "ods", "odt", "pdf", "png", "ppt", "pxd", "qt", "ram", "rar", "rm", "rmi", "rmvb", "rtf", "sdc", "sitd", "swf", "sxc", "sxw", "tar", "tgz", "tif", "tiff", "txt", "vsd", "wav", "wma", "wmv", "xls", "xml", "zip" };
		TypeConfig[ "File" ].DeniedExtensions			= new string[] { };
		TypeConfig[ "File" ].FilesPath					= "%UserFilesPath%file/";
		TypeConfig[ "File" ].FilesAbsolutePath			= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%file/" );
		TypeConfig[ "File" ].QuickUploadPath			= "%UserFilesPath%";
		TypeConfig[ "File" ].QuickUploadAbsolutePath	= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%" );

		TypeConfig[ "Image" ].AllowedExtensions			= new string[] { "bmp", "gif", "jpeg", "jpg", "png" };
		TypeConfig[ "Image" ].DeniedExtensions			= new string[] { };
		TypeConfig[ "Image" ].FilesPath					= "%UserFilesPath%image/";
		TypeConfig[ "Image" ].FilesAbsolutePath			= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%image/" );
		TypeConfig[ "Image" ].QuickUploadPath			= "%UserFilesPath%";
		TypeConfig[ "Image" ].QuickUploadAbsolutePath	= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%" );

		TypeConfig[ "Flash" ].AllowedExtensions			= new string[] { "swf", "flv" };
		TypeConfig[ "Flash" ].DeniedExtensions			= new string[] { };
		TypeConfig[ "Flash" ].FilesPath					= "%UserFilesPath%flash/";
		TypeConfig[ "Flash" ].FilesAbsolutePath			= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%flash/" );
		TypeConfig[ "Flash" ].QuickUploadPath			= "%UserFilesPath%";
		TypeConfig[ "Flash" ].QuickUploadAbsolutePath	= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%" );

		TypeConfig[ "Media" ].AllowedExtensions			= new string[] { "aiff", "asf", "avi", "bmp", "fla", "flv", "gif", "jpeg", "jpg", "mid", "mov", "mp3", "mp4", "mpc", "mpeg", "mpg", "png", "qt", "ram", "rm", "rmi", "rmvb", "swf", "tif", "tiff", "wav", "wma", "wmv" };
		TypeConfig[ "Media" ].DeniedExtensions			= new string[] { };
		TypeConfig[ "Media" ].FilesPath					= "%UserFilesPath%media/";
		TypeConfig[ "Media" ].FilesAbsolutePath			= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%media/" );
		TypeConfig[ "Media" ].QuickUploadPath			= "%UserFilesPath%";
		TypeConfig[ "Media" ].QuickUploadAbsolutePath	= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%" );
	}
	
</script>

--- NEW FILE: upload.aspx ---
<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Uploader" AutoEventWireup="false" %>
<%@ Register Src="config.ascx" TagName="Config" TagPrefix="FCKeditor" %>
<%--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the Uploader for ASP.NET.
 *
 * The code of this page if included in the FCKeditor.Net package,
 * in the FredCK.FCKeditorV2.dll assemblyfile. So to use it you must
 * include that DLL in your "bin" directory.
 *
 * To download the FCKeditor.Net package, go to our official web site:
 * http://www.fckeditor.net
--%>
<FCKeditor:Config id="Config" runat="server"></FCKeditor:Config>
--- NEW FILE: connector.aspx ---
<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Connector" AutoEventWireup="false" %>
<%@ Register Src="config.ascx" TagName="Config" TagPrefix="FCKeditor" %>
<%--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the File Browser Connector for ASP.NET.
 *
 * The code of this page if included in the FCKeditor.Net package,
 * in the FredCK.FCKeditorV2.dll assembly file. So to use it you must
 * include that DLL in your "bin" directory.
 *
 * To download the FCKeditor.Net package, go to our official web site:
 * http://www.fckeditor.net
--%>
<FCKeditor:Config id="Config" runat="server"></FCKeditor:Config>


From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder
	fck_placeholder.html, 1.4, 1.5 fckplugin.js, 1.4,
	1.5 placeholder.gif, 1.3, 1.4
Message-ID: <20080209125402.AFA6610FE7F@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/plugins/placeholder

Added Files:
	fck_placeholder.html fckplugin.js placeholder.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: placeholder.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckplugin.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fck_placeholder.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Placeholder Plugin.
-->
<html>
	<head>
		<title>Placeholder Properties</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta content="noindex, nofollow" name="robots">
		<script language="javascript">

var oEditor = window.parent.InnerDialogLoaded() ;
var FCKLang = oEditor.FCKLang ;
var FCKPlaceholders = oEditor.FCKPlaceholders ;

window.onload = function ()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage( document ) ;

	LoadSelected() ;

	// Show the "Ok" button.
	window.parent.SetOkButton( true ) ;
}

var eSelected = oEditor.FCKSelection.GetSelectedElement() ;

function LoadSelected()
{
	if ( !eSelected )
		return ;

	if ( eSelected.tagName == 'SPAN' && eSelected._fckplaceholder )
		document.getElementById('txtName').value = eSelected._fckplaceholder ;
	else
		eSelected == null ;
}

function Ok()
{
	var sValue = document.getElementById('txtName').value ;

	if ( eSelected && eSelected._fckplaceholder == sValue )
		return true ;

	if ( sValue.length == 0 )
	{
		alert( FCKLang.PlaceholderErrNoName ) ;
		return false ;
	}

	if ( FCKPlaceholders.Exist( sValue ) )
	{
		alert( FCKLang.PlaceholderErrNameInUse ) ;
		return false ;
	}

	FCKPlaceholders.Add( sValue ) ;
	return true ;
}

		</script>
	</head>
	<body scroll="no" style="OVERFLOW: hidden">
		<table height="100%" cellSpacing="0" cellPadding="0" width="100%" border="0">
			<tr>
				<td>
					<table cellSpacing="0" cellPadding="0" align="center" border="0">
						<tr>
							<td>
								<span fckLang="PlaceholderDlgName">Placeholder Name</span><br>
								<input id="txtName" type="text">
							</td>
						</tr>
					</table>
				</td>
			</tr>
		</table>
	</body>
</html>


From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/lasso
	config.lasso, NONE, 1.1 connector.lasso, NONE,
	1.1 upload.lasso, NONE, 1.1
Message-ID: <20080209125402.50B8A10FE6B@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/lasso
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/connectors/lasso

Added Files:
	config.lasso connector.lasso upload.lasso 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: config.lasso ---
[//lasso
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Configuration file for the File Manager Connector for Lasso.
 */

    /*.....................................................................
    The connector uses the file tags, which require authentication. Enter a
    valid username and password from Lasso admin for a group with file tags
    permissions for uploads and the path you define in UserFilesPath below.
    */

	var('connection') = array(
		-username='xxxxxxxx',
		-password='xxxxxxxx'
	);


    /*.....................................................................
    Set the base path for files that users can upload and browse (relative
    to server root).

    Set which file extensions are allowed and/or denied for each file type.
    */
	var('config') = map(
		'Enabled' = false,
		'UserFilesPath' = '/userfiles/',
		'Subdirectories' = map(
			'File' = 'File/',
			'Image' = 'Image/',
			'Flash' = 'Flash/',
			'Media' = 'Media/'
		),
		'AllowedExtensions' = map(
			'File' = array('7z','aiff','asf','avi','bmp','csv','doc','fla','flv','gif','gz','gzip','jpeg','jpg','mid','mov','mp3','mp4','mpc','mpeg','mpg','ods','odt','pdf','png','ppt','pxd','qt','ram','rar','rm','rmi','rmvb','rtf','sdc','sitd','swf','sxc','sxw','tar','tgz','tif','tiff','txt','vsd','wav','wma','wmv','xls','xml','zip'),
			'Image' = array('bmp','gif','jpeg','jpg','png'),
			'Flash' = array('swf','flv'),
			'Media' = array('aiff','asf','avi','bmp','fla','flv','gif','jpeg','jpg','mid','mov','mp3','mp4','mpc','mpeg','mpg','png','qt','ram','rm','rmi','rmvb','swf','tif','tiff','wav','wma','wmv')
		),
		'DeniedExtensions' = map(
			'File' = array(),
			'Image' = array(),
			'Flash' = array(),
			'Media' = array()
		)
	);
]
--- NEW FILE: connector.lasso ---
[//lasso
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the File Manager Connector for Lasso.
 */

    /*.....................................................................
    Include global configuration. See config.lasso for details.
    */
	include('config.lasso');


    /*.....................................................................
    Translate current date/time to GMT for custom header.
    */
	var('headerDate') = date_localtogmt(date)->format('%a, %d %b %Y %T GMT');


    /*.....................................................................
    Convert query string parameters to variables and initialize output.
    */
	var(
		'Command'		=	action_param('Command'),
		'Type'			=	action_param('Type'),
		'CurrentFolder'	=	action_param('CurrentFolder'),
		'ServerPath'	=	action_param('ServerPath'),
		'NewFolderName'	=	action_param('NewFolderName'),
		'NewFile'		=	null,
		'NewFileName'	=	string,
		'OrigFilePath'	=	string,
		'NewFilePath'	=	string,
		'commandData'	=	string,
		'folders'		=	'\t<Folders>\n',
		'files'			=	'\t<Files>\n',
		'errorNumber'	=	integer,
		'responseType'	=	'xml',
		'uploadResult'	=	'0'
	);


    /*.....................................................................
    Calculate the path to the current folder.
    */
	$ServerPath == '' ? $ServerPath = $config->find('UserFilesPath');

	var('currentFolderURL' = $ServerPath
		+ $config->find('Subdirectories')->find(action_param('Type'))
		+ action_param('CurrentFolder')
	);


    /*.....................................................................
    Build the appropriate response per the 'Command' parameter. Wrap the
    entire process in an inline for file tag permissions.
    */
	inline($connection);
		select($Command);
            /*.............................................................
            List all subdirectories in the 'Current Folder' directory.
            */
			case('GetFolders');
				$commandData += '\t<Folders>\n';

				iterate(file_listdirectory($currentFolderURL), local('this'));
					#this->endswith('/') ? $commandData += '\t\t<Folder name="' + #this->removetrailing('/')& + '" />\n';
				/iterate;

				$commandData += '\t</Folders>\n';


            /*.............................................................
            List both files and folders in the 'Current Folder' directory.
            Include the file sizes in kilobytes.
            */
			case('GetFoldersAndFiles');
				iterate(file_listdirectory($currentFolderURL), local('this'));
					if(#this->endswith('/'));
						$folders += '\t\t<Folder name="' + #this->removetrailing('/')& + '" />\n';
					else;
						local('size') = file_getsize($currentFolderURL + #this) / 1024;
						$files += '\t\t<File name="' + #this + '" size="' + #size + '" />\n';
					/if;
				/iterate;

				$folders += '\t</Folders>\n';
				$files += '\t</Files>\n';

				$commandData += $folders + $files;


            /*.............................................................
            Create a directory 'NewFolderName' within the 'Current Folder.'
            */
			case('CreateFolder');
				var('newFolder' = $currentFolderURL + $NewFolderName + '/');
				file_create($newFolder);


                /*.........................................................
                Map Lasso's file error codes to FCKEditor's error codes.
                */
				select(file_currenterror( -errorcode));
					case(0);
						$errorNumber = 0;
					case( -9983);
						$errorNumber = 101;
					case( -9976);
						$errorNumber = 102;
					case( -9977);
						$errorNumber = 102;
					case( -9961);
						$errorNumber = 103;
					case;
						$errorNumber = 110;
				/select;

				$commandData += '<Error number="' + $errorNumber + '" />\n';


            /*.............................................................
            Process an uploaded file.
            */
			case('FileUpload');
                /*.........................................................
                This is the only command that returns an HTML response.
                */
				$responseType = 'html';


                /*.........................................................
                Was a file actually uploaded?
                */
				file_uploads->size ? $NewFile = file_uploads->get(1) | $uploadResult = '202';

				if($uploadResult == '0');
                    /*.....................................................
                    Split the file's extension from the filename in order
                    to follow the API's naming convention for duplicate
                    files. (Test.txt, Test(1).txt, Test(2).txt, etc.)
                    */
					$NewFileName = $NewFile->find('OrigName');
					$OrigFilePath = $currentFolderURL + $NewFileName;
					$NewFilePath = $OrigFilePath;
					local('fileExtension') = '.' + $NewFile->find('OrigExtension');
					local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&;


                    /*.....................................................
                    Make sure the file extension is allowed.
                    */
					if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension'));
						$uploadResult = '202';
					else;
                        /*.................................................
                        Rename the target path until it is unique.
                        */
						while(file_exists($NewFilePath));
							$NewFilePath = $currentFolderURL + #shortFileName + '(' + loop_count + ')' + #fileExtension;
						/while;


                        /*.................................................
                        Copy the uploaded file to its final location.
                        */
						file_copy($NewFile->find('path'), $NewFilePath);


                        /*.................................................
                        Set the error code for the response. Note whether
                        the file had to be renamed.
                        */
						select(file_currenterror( -errorcode));
							case(0);
								$OrigFilePath != $NewFilePath ? $uploadResult = 201;
							case;
								$uploadResult = '202';
						/select;
					/if;
				/if;


                /*.........................................................
                Set the HTML response.
                */
                if($uploadResult == '0' || $uploadResult == '201');
				$__html_reply__ = '\
<script type="text/javascript">
	window.parent.frames[\'frmUpload\'].OnUploadCompleted(' + $uploadResult + ',\'' + $NewFilePath + '\',\'' + $NewFilePath->split('/')->last + '\');
</script>
				';
                else;
				$__html_reply__ = '\
<script type="text/javascript">
	window.parent.frames[\'frmUpload\'].OnUploadCompleted(' + $uploadResult + ');
</script>
				';
				/if;
		/select;
	/inline;


    /*.....................................................................
    Send a custom header for xml responses.
    */
	if($responseType == 'xml');
		header;
]
HTTP/1.0 200 OK
Date: [$headerDate]
Server: Lasso Professional [lasso_version( -lassoversion)]
Expires: Mon, 26 Jul 1997 05:00:00 GMT
Last-Modified: [$headerDate]
Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
Pragma: no-cache
Keep-Alive: timeout=15, max=98
Connection: Keep-Alive
Content-Type: text/xml; charset=utf-8
[//lasso
		/header;


        /*.................................................................
        Set the content type encoding for Lasso.
        */
		content_type('text/xml; charset=utf-8');


        /*.................................................................
        Wrap the response as XML and output.
        */
		$__html_reply__ = '\
<?xml version="1.0" encoding="utf-8" ?>
<Connector command="' + $Command + '" resourceType="' + $Type + '">
	<CurrentFolder path="' + $CurrentFolder + '" url="' + $currentFolderURL + '" />
' + $commandData + '
</Connector>
		';
	/if;
]

--- NEW FILE: upload.lasso ---
[//lasso
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the "File Uploader" for Lasso.
 */

    /*.....................................................................
    Include global configuration. See config.lasso for details.
    */
	include('config.lasso');


    /*.....................................................................
    Convert query string parameters to variables and initialize output.
    */
	var(
		'Type'			=	action_param('Type'),
		'CurrentFolder'	=	action_param('CurrentFolder'),
		'ServerPath'	=	action_param('ServerPath'),
		'NewFile'		=	null,
		'NewFileName'	=	string,
		'OrigFilePath'	=	string,
		'NewFilePath'	=	string,
		'errorNumber'	=	0,
		'customMsg'		=	''
	);

	$Type == '' ? $Type = 'File';


    /*.....................................................................
    Calculate the path to the current folder.
    */
	$ServerPath == '' ? $ServerPath = $config->find('UserFilesPath');

	var('currentFolderURL' = $ServerPath
		+ $config->find('Subdirectories')->find(action_param('Type'))
		+ action_param('CurrentFolder')
	);


	/*.....................................................................
	Custom tag sets the HTML response.
	*/

	define_tag(
		'sendresults',
		-namespace='fck_',
		-priority='replace',
		-required='errorNumber',
		-type='integer',
		-optional='fileUrl',
		-type='string',
		-optional='fileName',
		-type='string',
		-optional='customMsg',
		-type='string',
		-description='Sets the HTML response for the FCKEditor Quick Upload feature.'
	);
		$__html_reply__ = '\
<script type="text/javascript">
	window.parent.OnUploadCompleted(' + #errorNumber + ',"'
		+ string_replace(#fileUrl, -find='"', -replace='\\"') + '","'
		+ string_replace(#fileName, -find='"', -replace='\\"') + '","'
		+ string_replace(#customMsg, -find='"', -replace='\\"') + '");
</script>
		';
	/define_tag;


	if($config->find('Enabled'));
		/*.................................................................
		Process an uploaded file.
		*/
		inline($connection);
			/*.............................................................
			Was a file actually uploaded?
			*/
			file_uploads->size ? $NewFile = file_uploads->get(1) | $errorNumber = 202;

			if($errorNumber == 0);
				/*.........................................................
				Split the file's extension from the filename in order
				to follow the API's naming convention for duplicate
				files. (Test.txt, Test(1).txt, Test(2).txt, etc.)
				*/
				$NewFileName = $NewFile->find('OrigName');
				$OrigFilePath = $currentFolderURL + $NewFileName;
				$NewFilePath = $OrigFilePath;
				local('fileExtension') = '.' + $NewFile->find('OrigExtension');
				local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&;


				/*.........................................................
				Make sure the file extension is allowed.
				*/

				if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension'));
					$errorNumber = 202;
				else;
					/*.....................................................
					Rename the target path until it is unique.
					*/
					while(file_exists($NewFilePath));
						$NewFileName = #shortFileName + '(' + loop_count + ')' + #fileExtension;
						$NewFilePath = $currentFolderURL + $NewFileName;
					/while;


					/*.....................................................
					Copy the uploaded file to its final location.
					*/
					file_copy($NewFile->find('path'), $NewFilePath);


					/*.....................................................
					Set the error code for the response.
					*/
					select(file_currenterror( -errorcode));
						case(0);
							$OrigFilePath != $NewFilePath ? $errorNumber = 201;
						case;
							$errorNumber = 202;
					/select;
				/if;
			/if;
		/inline;
	else;
		$errorNumber = 1;
		$customMsg = 'This file uploader is disabled. Please check the "editor/filemanager/upload/lasso/config.lasso" file.';
	/if;

	fck_sendresults(
		-errorNumber=$errorNumber,
		-fileUrl=$NewFilePath,
		-fileName=$NewFileName,
		-customMsg=$customMsg
	);
]



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/images
	anchor.gif, 1.2, 1.3 arrow_ltr.gif, 1.2, 1.3 arrow_rtl.gif,
	1.2, 1.3 spacer.gif, 1.2, 1.3
Message-ID: <20080209125402.7508410FE74@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/images
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/images

Added Files:
	anchor.gif arrow_ltr.gif arrow_rtl.gif spacer.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: arrow_rtl.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: spacer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: anchor.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: arrow_ltr.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode
	fckplugin.js, NONE, 1.1
Message-ID: <20080209125402.AC6C910FE7D@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/plugins/bbcode

Added Files:
	fckplugin.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckplugin.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:03 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:03 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/tablecommands
	fckplugin.js, 1.3, 1.4
Message-ID: <20080209125403.1BA0810FE82@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/tablecommands
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/plugins/tablecommands

Added Files:
	fckplugin.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckplugin.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl
	basexml.pl, NONE, 1.1 commands.pl, NONE, 1.1 connector.cgi,
	NONE, 1.1 io.pl, NONE, 1.1 upload.cgi, NONE, 1.1 upload_fck.pl,
	NONE, 1.1 util.pl, NONE, 1.1
Message-ID: <20080209125402.7146010FE6E@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/connectors/perl

Added Files:
	basexml.pl commands.pl connector.cgi io.pl upload.cgi 
	upload_fck.pl util.pl 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: upload.cgi ---
#!/usr/bin/env perl

#####
#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
#  Copyright (C) 2003-2007 Frederico Caldeira Knabben
#
#  == BEGIN LICENSE ==
#
#  Licensed under the terms of any of the following licenses at your
#  choice:
#
#   - GNU General Public License Version 2 or later (the "GPL")
#     http://www.gnu.org/licenses/gpl.html
#
#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
#     http://www.gnu.org/licenses/lgpl.html
#
#   - Mozilla Public License Version 1.1 or later (the "MPL")
#     http://www.mozilla.org/MPL/MPL-1.1.html
#
#  == END LICENSE ==
#
#  This is the File Manager Connector for Perl.
#####

##
# ATTENTION: To enable this connector, look for the "SECURITY" comment in this file.
##

## START: Hack for Windows (Not important to understand the editor code... Perl specific).
if(Windows_check()) {
	chdir(GetScriptPath($0));
}

sub Windows_check
{
	# IIS,PWS(NT/95)
	$www_server_os = $^O;
	# Win98 & NT(SP4)
	if($www_server_os eq "") { $www_server_os= $ENV{'OS'}; }
	# AnHTTPd/Omni/IIS
	if($ENV{'SERVER_SOFTWARE'} =~ /AnWeb|Omni|IIS\//i) { $www_server_os= 'win'; }
	# Win Apache
	if($ENV{'WINDIR'} ne "") { $www_server_os= 'win'; }
	if($www_server_os=~ /win/i) { return(1); }
	return(0);
}

sub GetScriptPath {
	local($path) = @_;
	if($path =~ /[\:\/\\]/) { $path =~ s/(.*?)[\/\\][^\/\\]+$/$1/; } else { $path = '.'; }
	$path;
}
## END: Hack for IIS

require 'util.pl';
require 'io.pl';
require 'basexml.pl';
require 'commands.pl';
require 'upload_fck.pl';

##
# SECURITY: REMOVE/COMMENT THE FOLLOWING LINE TO ENABLE THIS CONNECTOR.
##
	&SendUploadResults(1, '', '', 'This connector is disabled. Please check the "editor/filemanager/connectors/perl/upload.cgi" file' ) ;

	&read_input();

	if($FORM{'ServerPath'} ne "") {
		$GLOBALS{'UserFilesPath'} = $FORM{'ServerPath'};
		if(!($GLOBALS{'UserFilesPath'} =~ /\/$/)) {
			$GLOBALS{'UserFilesPath'} .= '/' ;
		}
	} else {
		$GLOBALS{'UserFilesPath'} = '/userfiles/';
	}

	# Map the "UserFiles" path to a local directory.
	$rootpath = &GetRootPath();
	$GLOBALS{'UserFilesDirectory'} = $rootpath . $GLOBALS{'UserFilesPath'};

	&DoResponse();

sub DoResponse
{
	# Get the main request information.
	$sCommand		= 'FileUpload'; #$FORM{'Command'};
	$sResourceType	= $FORM{'Type'};
	$sCurrentFolder	= $FORM{'CurrentFolder'};

	if ($sResourceType eq '') {
		$sResourceType = 'File' ;
	}
	if ($sCurrentFolder eq '') {
		$sCurrentFolder = '/' ;
	}

	# Check the current folder syntax (must begin and start with a slash).
	if(!($sCurrentFolder =~ /\/$/)) {
		$sCurrentFolder .= '/';
	}
	if(!($sCurrentFolder =~ /^\//)) {
		$sCurrentFolder = '/' . $sCurrentFolder;
	}

	# Check for invalid folder paths (..)
	if ( $sCurrentFolder =~ /\.\./ ) {
		SendError( 102, "" ) ;
	}

	# File Upload doesn't have to Return XML, so it must be intercepted before anything.
	if($sCommand eq 'FileUpload') {
		FileUpload($sResourceType,$sCurrentFolder);
		return ;
	}

}


--- NEW FILE: commands.pl ---
#####
#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
#  Copyright (C) 2003-2007 Frederico Caldeira Knabben
#
#  == BEGIN LICENSE ==
#
#  Licensed under the terms of any of the following licenses at your
#  choice:
#
#   - GNU General Public License Version 2 or later (the "GPL")
#     http://www.gnu.org/licenses/gpl.html
#
#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
#     http://www.gnu.org/licenses/lgpl.html
#
#   - Mozilla Public License Version 1.1 or later (the "MPL")
#     http://www.mozilla.org/MPL/MPL-1.1.html
#
#  == END LICENSE ==
#
#  This is the File Manager Connector for Perl.
#####

sub GetFolders
{

	local($resourceType, $currentFolder) = @_;

	# Map the virtual path to the local server path.
	$sServerDir = &ServerMapFolder($resourceType, $currentFolder);
	print "<Folders>";			# Open the "Folders" node.

	opendir(DIR,"$sServerDir");
	@files = grep(!/^\.\.?$/,readdir(DIR));
	closedir(DIR);

	foreach $sFile (@files) {
		if($sFile != '.' && $sFile != '..' && (-d "$sServerDir$sFile")) {
			$cnv_filename = &ConvertToXmlAttribute($sFile);
			print '<Folder name="' . $cnv_filename . '" />';
		}
	}
	print "</Folders>";			# Close the "Folders" node.
}

sub GetFoldersAndFiles
{

	local($resourceType, $currentFolder) = @_;
	# Map the virtual path to the local server path.
	$sServerDir = &ServerMapFolder($resourceType,$currentFolder);

	# Initialize the output buffers for "Folders" and "Files".
	$sFolders	= '<Folders>';
	$sFiles		= '<Files>';

	opendir(DIR,"$sServerDir");
	@files = grep(!/^\.\.?$/,readdir(DIR));
	closedir(DIR);

	foreach $sFile (@files) {
		if($sFile ne '.' && $sFile ne '..') {
			if(-d "$sServerDir$sFile") {
				$cnv_filename = &ConvertToXmlAttribute($sFile);
				$sFolders .= '<Folder name="' . $cnv_filename . '" />' ;
			} else {
				($iFileSize,$refdate,$filedate,$fileperm) = (stat("$sServerDir$sFile"))[7,8,9,2];
				if($iFileSize > 0) {
					$iFileSize = int($iFileSize / 1024);
					if($iFileSize < 1) {
						$iFileSize = 1;
					}
				}
				$cnv_filename = &ConvertToXmlAttribute($sFile);
				$sFiles	.= '<File name="' . $cnv_filename . '" size="' . $iFileSize . '" />' ;
			}
		}
	}
	print $sFolders ;
	print '</Folders>';			# Close the "Folders" node.
	print $sFiles ;
	print '</Files>';			# Close the "Files" node.
}

sub CreateFolder
{

	local($resourceType, $currentFolder) = @_;
	$sErrorNumber	= '0' ;
	$sErrorMsg		= '' ;

	if($FORM{'NewFolderName'} ne "") {
		$sNewFolderName = $FORM{'NewFolderName'};
		# Map the virtual path to the local server path of the current folder.
		$sServerDir = &ServerMapFolder($resourceType, $currentFolder);
		if(-w $sServerDir) {
			$sServerDir .= $sNewFolderName;
			$sErrorMsg = &CreateServerFolder($sServerDir);
			if($sErrorMsg == 0) {
				$sErrorNumber = '0';
			} elsif($sErrorMsg eq 'Invalid argument' || $sErrorMsg eq 'No such file or directory') {
				$sErrorNumber = '102';		#// Path too long.
			} else {
				$sErrorNumber = '110';
			}
		} else {
			$sErrorNumber = '103';
		}
	} else {
		$sErrorNumber = '102' ;
	}
	# Create the "Error" node.
	$cnv_errmsg = &ConvertToXmlAttribute($sErrorMsg);
	print '<Error number="' . $sErrorNumber . '" originalDescription="' . $cnv_errmsg . '" />';
}

sub FileUpload
{
eval("use File::Copy;");

	local($resourceType, $currentFolder) = @_;

	$sErrorNumber = '0' ;
	$sFileName = '' ;
	if($new_fname) {
		# Map the virtual path to the local server path.
		$sServerDir = &ServerMapFolder($resourceType,$currentFolder);

		# Get the uploaded file name.
		$sFileName = $new_fname;
		$sOriginalFileName = $sFileName;

		$iCounter = 0;
		while(1) {
			$sFilePath = $sServerDir . $sFileName;
			if(-e $sFilePath) {
				$iCounter++ ;
				($path,$BaseName,$ext) = &RemoveExtension($sOriginalFileName);
				$sFileName = $BaseName . '(' . $iCounter . ').' . $ext;
				$sErrorNumber = '201';
			} else {
				copy("$img_dir/$new_fname","$sFilePath");
				chmod(0777,$sFilePath);
				unlink("$img_dir/$new_fname");
				last;
			}
		}
	} else {
		$sErrorNumber = '202' ;
	}
	$sFileName	=~ s/"/\\"/g;

	SendUploadResults($sErrorNumber, $resourceType.$currentFolder.$sFileName, $sFileName, '');
}

sub SendUploadResults
{

	local($sErrorNumber, $sFileUrl, $sFileName, $customMsg) = @_;

	print "Content-type: text/html\n\n";
	print '<script type="text/javascript">';
	print 'window.parent.OnUploadCompleted(' . $sErrorNumber . ',"' . JS_cnv($sFileUrl) . '","' . JS_cnv($sFileName) . '","' . JS_cnv($customMsg) . '") ;';
	print '</script>';
	exit ;
}

1;

--- NEW FILE: connector.cgi ---
#!/usr/bin/env perl

#####
#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
#  Copyright (C) 2003-2007 Frederico Caldeira Knabben
#
#  == BEGIN LICENSE ==
#
#  Licensed under the terms of any of the following licenses at your
#  choice:
#
#   - GNU General Public License Version 2 or later (the "GPL")
#     http://www.gnu.org/licenses/gpl.html
#
#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
#     http://www.gnu.org/licenses/lgpl.html
#
#   - Mozilla Public License Version 1.1 or later (the "MPL")
#     http://www.mozilla.org/MPL/MPL-1.1.html
#
#  == END LICENSE ==
#
#  This is the File Manager Connector for Perl.
#####

##
# ATTENTION: To enable this connector, look for the "SECURITY" comment in this file.
##

## START: Hack for Windows (Not important to understand the editor code... Perl specific).
if(Windows_check()) {
	chdir(GetScriptPath($0));
}

sub Windows_check
{
	# IIS,PWS(NT/95)
	$www_server_os = $^O;
	# Win98 & NT(SP4)
	if($www_server_os eq "") { $www_server_os= $ENV{'OS'}; }
	# AnHTTPd/Omni/IIS
	if($ENV{'SERVER_SOFTWARE'} =~ /AnWeb|Omni|IIS\//i) { $www_server_os= 'win'; }
	# Win Apache
	if($ENV{'WINDIR'} ne "") { $www_server_os= 'win'; }
	if($www_server_os=~ /win/i) { return(1); }
	return(0);
}

sub GetScriptPath {
	local($path) = @_;
	if($path =~ /[\:\/\\]/) { $path =~ s/(.*?)[\/\\][^\/\\]+$/$1/; } else { $path = '.'; }
	$path;
}
## END: Hack for IIS

require 'util.pl';
require 'io.pl';
require 'basexml.pl';
require 'commands.pl';
require 'upload_fck.pl';

##
# SECURITY: REMOVE/COMMENT THE FOLLOWING LINE TO ENABLE THIS CONNECTOR.
##
	&SendError( 1, 'This connector is disabled. Please check the "editor/filemanager/connectors/perl/connector.cgi" file' ) ;

	&read_input();

	if($FORM{'ServerPath'} ne "") {
		$GLOBALS{'UserFilesPath'} = $FORM{'ServerPath'};
		if(!($GLOBALS{'UserFilesPath'} =~ /\/$/)) {
			$GLOBALS{'UserFilesPath'} .= '/' ;
		}
	} else {
		$GLOBALS{'UserFilesPath'} = '/userfiles/';
	}

	# Map the "UserFiles" path to a local directory.
	$rootpath = &GetRootPath();
	$GLOBALS{'UserFilesDirectory'} = $rootpath . $GLOBALS{'UserFilesPath'};

	&DoResponse();

sub DoResponse
{

	if($FORM{'Command'} eq "" || $FORM{'Type'} eq "" || $FORM{'CurrentFolder'} eq "") {
		return ;
	}
	# Get the main request informaiton.
	$sCommand		= $FORM{'Command'};
	$sResourceType	= $FORM{'Type'};
	$sCurrentFolder	= $FORM{'CurrentFolder'};

	# Check the current folder syntax (must begin and start with a slash).
	if(!($sCurrentFolder =~ /\/$/)) {
		$sCurrentFolder .= '/';
	}
	if(!($sCurrentFolder =~ /^\//)) {
		$sCurrentFolder = '/' . $sCurrentFolder;
	}

	# Check for invalid folder paths (..)
	if ( $sCurrentFolder =~ /\.\./ ) {
		SendError( 102, "" ) ;
	}

	# File Upload doesn't have to Return XML, so it must be intercepted before anything.
	if($sCommand eq 'FileUpload') {
		FileUpload($sResourceType,$sCurrentFolder);
		return ;
	}

	print << "_HTML_HEAD_";
Content-Type:text/xml; charset=utf-8
Pragma: no-cache
Cache-Control: no-cache
Expires: Thu, 01 Dec 1994 16:00:00 GMT

_HTML_HEAD_

	&CreateXmlHeader($sCommand,$sResourceType,$sCurrentFolder);

	# Execute the required command.
	if($sCommand eq 'GetFolders') {
		&GetFolders($sResourceType,$sCurrentFolder);
	} elsif($sCommand eq 'GetFoldersAndFiles') {
		&GetFoldersAndFiles($sResourceType,$sCurrentFolder);
	} elsif($sCommand eq 'CreateFolder') {
		&CreateFolder($sResourceType,$sCurrentFolder);
	}

	&CreateXmlFooter();

	exit ;
}


--- NEW FILE: upload_fck.pl ---
#####
#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
#  Copyright (C) 2003-2007 Frederico Caldeira Knabben
#
#  == BEGIN LICENSE ==
#
#  Licensed under the terms of any of the following licenses at your
#  choice:
#
#   - GNU General Public License Version 2 or later (the "GPL")
#     http://www.gnu.org/licenses/gpl.html
#
#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
#     http://www.gnu.org/licenses/lgpl.html
#
#   - Mozilla Public License Version 1.1 or later (the "MPL")
#     http://www.mozilla.org/MPL/MPL-1.1.html
#
#  == END LICENSE ==
#
#  This is the File Manager Connector for Perl.
#####

# image data save dir
$img_dir	= './temp/';


# File size max(unit KB)
$MAX_CONTENT_SIZE =  30000;

# Filelock (1=use,0=not use)
$PM{'flock'}		= '1';


# upload Content-Type list
my %UPLOAD_CONTENT_TYPE_LIST = (
	'image/(x-)?png'						=>	'png',	# PNG image
	'image/p?jpe?g'							=>	'jpg',	# JPEG image
	'image/gif'								=>	'gif',	# GIF image
	'image/x-xbitmap'						=>	'xbm',	# XBM image

	'image/(x-(MS-)?)?bmp'					=>	'bmp',	# Windows BMP image
	'image/pict'							=>	'pict',	# Macintosh PICT image
	'image/tiff'							=>	'tif',	# TIFF image
	'application/pdf'						=>	'pdf',	# PDF image
	'application/x-shockwave-flash'			=>	'swf',	# Shockwave Flash

	'video/(x-)?msvideo'					=>	'avi',	# Microsoft Video
	'video/quicktime'						=>	'mov',	# QuickTime Video
	'video/mpeg'							=>	'mpeg',	# MPEG Video
	'video/x-mpeg2'							=>	'mpv2', # MPEG2 Video

	'audio/(x-)?midi?'						=>	'mid',	# MIDI Audio
	'audio/(x-)?wav'						=>	'wav',	# WAV Audio
	'audio/basic'							=>	'au',	# ULAW Audio
	'audio/mpeg'							=>	'mpga',	# MPEG Audio

	'application/(x-)?zip(-compressed)?'	=>	'zip',	# ZIP Compress

	'text/html'								=>	'html', # HTML
	'text/plain'							=>	'txt',	# TEXT
	'(?:application|text)/(?:rtf|richtext)'	=>	'rtf',	# RichText

	'application/msword'					=>	'doc',	# Microsoft Word
	'application/vnd.ms-excel'				=>	'xls',	# Microsoft Excel

	''
);

# Upload is permitted.
# A regular expression is possible.
my %UPLOAD_EXT_LIST = (
	'png'					=>	'PNG image',
	'p?jpe?g|jpe|jfif|pjp'	=>	'JPEG image',
	'gif'					=>	'GIF image',
	'xbm'					=>	'XBM image',

	'bmp|dib|rle'			=>	'Windows BMP image',
	'pi?ct'					=>	'Macintosh PICT image',
	'tiff?'					=>	'TIFF image',
	'pdf'					=>	'PDF image',
	'swf'					=>	'Shockwave Flash',

	'avi'					=>	'Microsoft Video',
	'moo?v|qt'				=>	'QuickTime Video',
	'm(p(e?gv?|e|v)|1v)'	=>	'MPEG Video',
	'mp(v2|2v)'				=>	'MPEG2 Video',

	'midi?|kar|smf|rmi|mff'	=>	'MIDI Audio',
	'wav'					=>	'WAVE Audio',
	'au|snd'				=>	'ULAW Audio',
	'mp(e?ga|2|a|3)|abs'	=>	'MPEG Audio',

	'zip'					=>	'ZIP Compress',
	'lzh'					=>	'LZH Compress',
	'cab'					=>	'CAB Compress',

	'd?html?'				=>	'HTML',
	'rtf|rtx'				=>	'RichText',
	'txt|text'				=>	'Text',

	''
);


# sjis or euc
my $CHARCODE = 'sjis';

$TRANS_2BYTE_CODE = 0;

##############################################################################
# Summary
#
# Form Read input
#
# Parameters
# Returns
# Memo
##############################################################################
sub read_input
{
eval("use File::Copy;");
eval("use File::Path;");

	my ($FORM) = @_;


	mkdir($img_dir,0777);
	chmod(0777,$img_dir);

	undef $img_data_exists;
	undef @NEWFNAMES;
	undef @NEWFNAME_DATA;

	if($ENV{'CONTENT_LENGTH'} > 10000000 || $ENV{'CONTENT_LENGTH'} > $MAX_CONTENT_SIZE * 1024) {
		&upload_error(
			'Size Error',
			sprintf(
				"Transmitting size is too large.MAX <strong>%d KB</strong> Now Size <strong>%d KB</strong>(<strong>%d bytes</strong> Over)",
				$MAX_CONTENT_SIZE,
				int($ENV{'CONTENT_LENGTH'} / 1024),
				$ENV{'CONTENT_LENGTH'} - $MAX_CONTENT_SIZE * 1024
			)
		);
	}

	my $Buffer;
	if($ENV{'CONTENT_TYPE'} =~ /multipart\/form-data/) {
		# METHOD POST only
		return	unless($ENV{'CONTENT_LENGTH'});

		binmode(STDIN);
		# STDIN A pause character is detected.'(MacIE3.0 boundary of $ENV{'CONTENT_TYPE'} cannot be trusted.)
		my $Boundary = <STDIN>;
		$Boundary =~ s/\x0D\x0A//;
		$Boundary = quotemeta($Boundary);
		while(<STDIN>) {
			if(/^\s*Content-Disposition:/i) {
				my($name,$ContentType,$FileName);
				# form data get
				if(/\bname="([^"]+)"/i || /\bname=([^\s:;]+)/i) {
					$name = $1;
					$name	=~ tr/+/ /;
					$name	=~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
					&Encode(\$name);
				}
				if(/\bfilename="([^"]*)"/i || /\bfilename=([^\s:;]*)/i) {
					$FileName = $1 || 'unknown';
				}
				# head read
				while(<STDIN>) {
					last	if(! /\w/);
					if(/^\s*Content-Type:\s*"([^"]+)"/i || /^\s*Content-Type:\s*([^\s:;]+)/i) {
						$ContentType = $1;
					}
				}
				# body read
				$value = "";
				while(<STDIN>) {
					last	if(/^$Boundary/o);
					$value .= $_;
				};
				$lastline = $_;
				$value =~s /\x0D\x0A$//;
				if($value ne '') {
					if($FileName || $ContentType) {
						$img_data_exists = 1;
						(
							$FileName,		#
							$Ext,			#
							$Length,		#
							$ImageWidth,	#
							$ImageHeight,	#
							$ContentName	#
						) = &CheckContentType(\$value,$FileName,$ContentType);

						$FORM{$name}	= $FileName;
						$new_fname		= $FileName;
						push(@NEWFNAME_DATA,"$FileName\t$Ext\t$Length\t$ImageWidth\t$ImageHeight\t$ContentName");

						# Multi-upload correspondence
						push(@NEWFNAMES,$new_fname);
						open(OUT,">$img_dir/$new_fname");
						binmode(OUT);
						eval "flock(OUT,2);" if($PM{'flock'} == 1);
						print OUT $value;
						eval "flock(OUT,8);" if($PM{'flock'} == 1);
						close(OUT);

					} elsif($name) {
						$value	=~ tr/+/ /;
						$value	=~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
						&Encode(\$value,'trans');
						$FORM{$name} .= "\0"			if(defined($FORM{$name}));
						$FORM{$name} .= $value;
					}
				}
			};
			last if($lastline =~ /^$Boundary\-\-/o);
		}
	} elsif($ENV{'CONTENT_LENGTH'}) {
		read(STDIN,$Buffer,$ENV{'CONTENT_LENGTH'});
	}
	foreach(split(/&/,$Buffer),split(/&/,$ENV{'QUERY_STRING'})) {
		my($name, $value) = split(/=/);
		$name	=~ tr/+/ /;
		$name	=~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
		$value	=~ tr/+/ /;
		$value	=~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;

		&Encode(\$name);
		&Encode(\$value,'trans');
		$FORM{$name} .= "\0"			if(defined($FORM{$name}));
		$FORM{$name} .= $value;

	}

}

##############################################################################
# Summary
#
#	CheckContentType
#
# Parameters
# Returns
# Memo
##############################################################################
sub CheckContentType
{

	my($DATA,$FileName,$ContentType) = @_;
	my($Ext,$ImageWidth,$ImageHeight,$ContentName,$Infomation);
	my $DataLength = length($$DATA);

	# An unknown file type

	$_ = $ContentType;
	my $UnknownType = (
		!$_
		|| /^application\/(x-)?macbinary$/i
		|| /^application\/applefile$/i
		|| /^application\/octet-stream$/i
		|| /^text\/plane$/i
		|| /^x-unknown-content-type/i
	);

	# MacBinary(Mac Unnecessary data are deleted.)
	if($UnknownType || $ENV{'HTTP_USER_AGENT'} =~ /Macintosh|Mac_/) {
		if($DataLength > 128 && !unpack("C",substr($$DATA,0,1)) && !unpack("C",substr($$DATA,74,1)) && !unpack("C",substr($$DATA,82,1)) ) {
			my $MacBinary_ForkLength = unpack("N", substr($$DATA, 83, 4));		# ForkLength Get
			my $MacBinary_FileName = quotemeta(substr($$DATA, 2, unpack("C",substr($$DATA, 1, 1))));
			if($MacBinary_FileName && $MacBinary_ForkLength && $DataLength >= $MacBinary_ForkLength + 128
					&& ($FileName =~ /$MacBinary_FileName/i || substr($$DATA,102,4) eq 'mBIN')) {	# DATA TOP 128byte MacBinary!!
				$$DATA				= substr($$DATA,128,$MacBinary_ForkLength);
				my $ResourceLength	= $DataLength - $MacBinary_ForkLength - 128;
				$DataLength			= $MacBinary_ForkLength;
			}
		}
	}

	# A file name is changed into EUC.
#	&jcode::convert(\$FileName,'euc',$FormCodeDefault);
#	&jcode::h2z_euc(\$FileName);
	$FileName =~ s/^.*\\//;					# Windows, Mac
	$FileName =~ s/^.*\///;					# UNIX
	$FileName =~ s/&/&amp;/g;
	$FileName =~ s/"/&quot;/g;
	$FileName =~ s/</&lt;/g;
	$FileName =~ s/>/&gt;/g;
#
#	if($CHARCODE ne 'euc') {
#		&jcode::convert(\$FileName,$CHARCODE,'euc');
#	}

	# An extension is extracted and it changes into a small letter.
	my $FileExt;
	if($FileName =~ /\.(\w+)$/) {
		$FileExt = $1;
		$FileExt =~ tr/A-Z/a-z/;
	}

	# Executable file detection (ban on upload)
	if($$DATA =~ /^MZ/) {
		$Ext = 'exe';
	}
	# text
	if(!$Ext && ($UnknownType || $ContentType =~ /^text\//i || $ContentType =~ /^application\/(?:rtf|richtext)$/i || $ContentType =~ /^image\/x-xbitmap$/i)
				&& ! $$DATA =~ /[\000-\006\177\377]/) {
#		$$DATA =~ s/\x0D\x0A/\n/g;
#		$$DATA =~ tr/\x0D\x0A/\n\n/;
#
#		if(
#			$$DATA =~ /<\s*SCRIPT(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*(?:.|\n)*?\bONLOAD\s*=(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*(?:.|\n)*?\bONCLICK\s*=(?:.|\n)*?>/i
#				) {
#			$Infomation = '(JavaScript contains)';
#		}
#		if($$DATA =~ /<\s*TABLE(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*BLINK(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*MARQUEE(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*OBJECT(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*EMBED(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*FRAME(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*APPLET(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*FORM(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*(?:.|\n)*?\bSRC\s*=(?:.|\n)*?>/i
#				|| $$DATA =~ /<\s*(?:.|\n)*?\bDYNSRC\s*=(?:.|\n)*?>/i
#				) {
#			$Infomation = '(the HTML tag which is not safe is included)';
#		}

		if($FileExt =~ /^txt$/i || $FileExt =~ /^cgi$/i || $FileExt =~ /^pl$/i) {								# Text File
			$Ext = 'txt';
		} elsif($ContentType =~ /^text\/html$/i || $FileExt =~ /html?/i || $$DATA =~ /<\s*HTML(?:.|\n)*?>/i) {	# HTML File
			$Ext = 'html';
		} elsif($ContentType =~ /^image\/x-xbitmap$/i || $FileExt =~ /^xbm$/i) {								# XBM(x-BitMap) Image
			my $XbmName = $1;
			my ($XbmWidth, $XbmHeight);
			if($$DATA =~ /\#define\s*$XbmName\_width\s*(\d+)/i) {
				$XbmWidth = $1;
			}
			if($$DATA =~ /\#define\s*$XbmName\_height\s*(\d+)/i) {
				$XbmHeight = $1;
			}
			if($XbmWidth && $XbmHeight) {
				$Ext = 'xbm';
				$ImageWidth		= $XbmWidth;
				$ImageHeight	= $XbmHeight;
			}
		} else {		#
			$Ext = 'txt';
		}
	}

	# image
	if(!$Ext && ($UnknownType || $ContentType =~ /^image\//i)) {
		# PNG
		if($$DATA =~ /^\x89PNG\x0D\x0A\x1A\x0A/) {
			if(substr($$DATA, 12, 4) eq 'IHDR') {
				$Ext = 'png';
				($ImageWidth, $ImageHeight) = unpack("N2", substr($$DATA, 16, 8));
			}
		} elsif($$DATA =~ /^GIF8(?:9|7)a/) {															# GIF89a(modified), GIF89a, GIF87a
			$Ext = 'gif';
			($ImageWidth, $ImageHeight) = unpack("v2", substr($$DATA, 6, 4));
		} elsif($$DATA =~ /^II\x2a\x00\x08\x00\x00\x00/ || $$DATA =~ /^MM\x00\x2a\x00\x00\x00\x08/) {	# TIFF
			$Ext = 'tif';
		} elsif($$DATA =~ /^BM/) {																		# BMP
			$Ext = 'bmp';
		} elsif($$DATA =~ /^\xFF\xD8\xFF/ || $$DATA =~ /JFIF/) {										# JPEG
			my $HeaderPoint = index($$DATA, "\xFF\xD8\xFF", 0);
			my $Point = $HeaderPoint + 2;
			while($Point < $DataLength) {
				my($Maker, $MakerType, $MakerLength) = unpack("C2n",substr($$DATA,$Point,4));
				if($Maker != 0xFF || $MakerType == 0xd9 || $MakerType == 0xda) {
					last;
				} elsif($MakerType >= 0xC0 && $MakerType <= 0xC3) {
					$Ext = 'jpg';
					($ImageHeight, $ImageWidth) = unpack("n2", substr($$DATA, $Point + 5, 4));
					if($HeaderPoint > 0) {
						$$DATA = substr($$DATA, $HeaderPoint);
						$DataLength = length($$DATA);
					}
					last;
				} else {
					$Point += $MakerLength + 2;
				}
			}
		}
	}

	# audio
	if(!$Ext && ($UnknownType || $ContentType =~ /^audio\//i)) {
		# MIDI Audio
		if($$DATA =~ /^MThd/) {
			$Ext = 'mid';
		} elsif($$DATA =~ /^\x2esnd/) {		# ULAW Audio
			$Ext = 'au';
		} elsif($$DATA =~ /^RIFF/ || $$DATA =~ /^ID3/ && $$DATA =~ /RIFF/) {
			my $HeaderPoint = index($$DATA, "RIFF", 0);
			$_ = substr($$DATA, $HeaderPoint + 8, 8);
			if(/^WAVEfmt $/) {
				# WAVE
				if(unpack("V",substr($$DATA, $HeaderPoint + 16, 4)) == 16) {
					$Ext = 'wav';
				} else {					# RIFF WAVE MP3
					$Ext = 'mp3';
				}
			} elsif(/^RMIDdata$/) {			# RIFF MIDI
				$Ext = 'rmi';
			} elsif(/^RMP3data$/) {			# RIFF MP3
				$Ext = 'rmp';
			}
			if($ContentType =~ /^audio\//i) {
				$Infomation .= '(RIFF '. substr($$DATA, $HeaderPoint + 8, 4). ')';
			}
		}
	}

	# a binary file
	unless ($Ext) {
		# PDF image
		if($$DATA =~ /^\%PDF/) {
			# Picture size is not measured.
			$Ext = 'pdf';
		} elsif($$DATA =~ /^FWS/) {		# Shockwave Flash
			$Ext = 'swf';
		} elsif($$DATA =~ /^RIFF/ || $$DATA =~ /^ID3/ && $$DATA =~ /RIFF/) {
			my $HeaderPoint = index($$DATA, "RIFF", 0);
			$_ = substr($$DATA,$HeaderPoint + 8, 8);
			# AVI
			if(/^AVI LIST$/) {
				$Ext = 'avi';
			}
			if($ContentType =~ /^video\//i) {
				$Infomation .= '(RIFF '. substr($$DATA, $HeaderPoint + 8, 4). ')';
			}
		} elsif($$DATA =~ /^PK/) {			# ZIP Compress File
			$Ext = 'zip';
		} elsif($$DATA =~ /^MSCF/) {		# CAB Compress File
			$Ext = 'cab';
		} elsif($$DATA =~ /^Rar\!/) {		# RAR Compress File
			$Ext = 'rar';
		} elsif(substr($$DATA, 2, 5) =~ /^\-lh(\d+|d)\-$/) {		# LHA Compress File
			$Infomation .= "(lh$1)";
			$Ext = 'lzh';
		} elsif(substr($$DATA, 325, 25) eq "Apple Video Media Handler" || substr($$DATA, 325, 30) eq "Apple \x83\x72\x83\x66\x83\x49\x81\x45\x83\x81\x83\x66\x83\x42\x83\x41\x83\x6E\x83\x93\x83\x68\x83\x89") {
			# QuickTime
			$Ext = 'mov';
		}
	}

	# Header analysis failure
	unless ($Ext) {
		# It will be followed if it applies for the MIME type from the browser.
		foreach (keys %UPLOAD_CONTENT_TYPE_LIST) {
			next unless ($_);
			if($ContentType =~ /^$_$/i) {
				$Ext = $UPLOAD_CONTENT_TYPE_LIST{$_};
				$ContentName = &CheckContentExt($Ext);
				if(
					grep {$_ eq $Ext;} (
						'png',
						'gif',
						'jpg',
						'xbm',
						'tif',
						'bmp',
						'pdf',
						'swf',
						'mov',
						'zip',
						'cab',
						'lzh',
						'rar',
						'mid',
						'rmi',
						'au',
						'wav',
						'avi',
						'exe'
					)
				) {
					$Infomation .= ' / Header analysis failure';
				}
				if($Ext ne $FileExt && &CheckContentExt($FileExt) eq $ContentName) {
					$Ext = $FileExt;
				}
				last;
			}
		}
		# a MIME type is unknown--It judges from an extension.
		unless ($Ext) {
			$ContentName = &CheckContentExt($FileExt);
			if($ContentName) {
				$Ext = $FileExt;
				$Infomation .= ' /	MIME type is unknown('. $ContentType. ')';
				last;
			}
		}
	}

#	$ContentName = &CheckContentExt($Ext)	unless($ContentName);
#	if($Ext && $ContentName) {
#		$ContentName .=  $Infomation;
#	} else {
#		&upload_error(
#			'Extension Error',
#			"$FileName A not corresponding extension ($Ext)<BR>The extension which can be responded ". join(',', sort values(%UPLOAD_EXT_LIST))
#		);
#	}

#	# SSI Tag Deletion
#	if($Ext =~ /.?html?/ && $$DATA =~ /<\!/) {
#		foreach (
#			'config',
#			'echo',
#			'exec',
#			'flastmod',
#			'fsize',
#			'include'
#		) {
#			$$DATA =~ s/\#\s*$_/\&\#35\;$_/ig
#		}
#	}

	return (
		$FileName,
		$Ext,
		int($DataLength / 1024 + 1),
		$ImageWidth,
		$ImageHeight,
		$ContentName
	);
}

##############################################################################
# Summary
#
# Extension discernment
#
# Parameters
# Returns
# Memo
##############################################################################

sub CheckContentExt
{

	my($Ext) = @_;
	my $ContentName;
	foreach (keys %UPLOAD_EXT_LIST) {
		next	unless ($_);
		if($_ && $Ext =~ /^$_$/) {
			$ContentName = $UPLOAD_EXT_LIST{$_};
			last;
		}
	}
	return $ContentName;

}

##############################################################################
# Summary
#
# Form decode
#
# Parameters
# Returns
# Memo
##############################################################################
sub Encode
{

	my($value,$Trans) = @_;

#	my $FormCode = &jcode::getcode($value) || $FormCodeDefault;
#	$FormCodeDefault ||= $FormCode;
#
#	if($Trans && $TRANS_2BYTE_CODE) {
#		if($FormCode ne 'euc') {
#			&jcode::convert($value, 'euc', $FormCode);
#		}
#		&jcode::tr(
#			$value,
#			"\xA3\xB0-\xA3\xB9\xA3\xC1-\xA3\xDA\xA3\xE1-\xA3\xFA",
#			'0-9A-Za-z'
#		);
#		if($CHARCODE ne 'euc') {
#			&jcode::convert($value,$CHARCODE,'euc');
#		}
#	} else {
#		if($CHARCODE ne $FormCode) {
#			&jcode::convert($value,$CHARCODE,$FormCode);
#		}
#	}
#	if($CHARCODE eq 'euc') {
#		&jcode::h2z_euc($value);
#	} elsif($CHARCODE eq 'sjis') {
#		&jcode::h2z_sjis($value);
#	}

}

##############################################################################
# Summary
#
# Error Msg
#
# Parameters
# Returns
# Memo
##############################################################################

sub upload_error
{

	local($error_message)	= $_[0];
	local($error_message2)	= $_[1];

	print "Content-type: text/html\n\n";
	print<<EOF;
<HTML>
<HEAD>
<TITLE>Error Message</TITLE></HEAD>
<BODY>
<table border="1" cellspacing="10" cellpadding="10">
	<TR bgcolor="#0000B0">
	<TD bgcolor="#0000B0" NOWRAP><font size="-1" color="white"><B>Error Message</B></font></TD>
	</TR>
</table>
<UL>
<H4> $error_message </H4>
$error_message2 <BR>
</UL>
</BODY>
</HTML>
EOF
	&rm_tmp_uploaded_files; 		# Image Temporary deletion
	exit;
}

##############################################################################
# Summary
#
# Image Temporary deletion
#
# Parameters
# Returns
# Memo
##############################################################################

sub rm_tmp_uploaded_files
{
	if($img_data_exists == 1){
		sleep 1;
		foreach $fname_list(@NEWFNAMES) {
			if(-e "$img_dir/$fname_list") {
				unlink("$img_dir/$fname_list");
			}
		}
	}

}
1;

--- NEW FILE: util.pl ---
#####
#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
#  Copyright (C) 2003-2007 Frederico Caldeira Knabben
#
#  == BEGIN LICENSE ==
#
#  Licensed under the terms of any of the following licenses at your
#  choice:
#
#   - GNU General Public License Version 2 or later (the "GPL")
#     http://www.gnu.org/licenses/gpl.html
#
#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
#     http://www.gnu.org/licenses/lgpl.html
#
#   - Mozilla Public License Version 1.1 or later (the "MPL")
#     http://www.mozilla.org/MPL/MPL-1.1.html
#
#  == END LICENSE ==
#
#  This is the File Manager Connector for Perl.
#####

sub RemoveFromStart
{
	local($sourceString, $charToRemove) = @_;
	$sPattern = '^' . $charToRemove . '+' ;
	$sourceString =~ s/^$charToRemove+//g;
	return $sourceString;
}

sub RemoveFromEnd
{
	local($sourceString, $charToRemove) = @_;
	$sPattern = $charToRemove . '+$' ;
	$sourceString =~ s/$charToRemove+$//g;
	return $sourceString;
}

sub ConvertToXmlAttribute
{
	local($value) = @_;
	return $value;
#	return utf8_encode(htmlspecialchars($value));

}

sub specialchar_cnv
{
	local($ch) = @_;

	$ch =~ s/&/&amp;/g;		# &
	$ch =~ s/\"/&quot;/g;	#"
	$ch =~ s/\'/&#39;/g;	# '
	$ch =~ s/</&lt;/g;		# <
	$ch =~ s/>/&gt;/g;		# >
	return($ch);
}

sub JS_cnv
{
	local($ch) = @_;

	$ch =~ s/\"/\\\"/g;	#"
	return($ch);
}

1;

--- NEW FILE: io.pl ---
#####
#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
#  Copyright (C) 2003-2007 Frederico Caldeira Knabben
#
#  == BEGIN LICENSE ==
#
#  Licensed under the terms of any of the following licenses at your
#  choice:
#
#   - GNU General Public License Version 2 or later (the "GPL")
#     http://www.gnu.org/licenses/gpl.html
#
#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
#     http://www.gnu.org/licenses/lgpl.html
#
#   - Mozilla Public License Version 1.1 or later (the "MPL")
#     http://www.mozilla.org/MPL/MPL-1.1.html
#
#  == END LICENSE ==
#
#  This is the File Manager Connector for Perl.
#####

sub GetUrlFromPath
{
	local($resourceType, $folderPath) = @_;

	if($resourceType eq '') {
		$rmpath = &RemoveFromEnd($GLOBALS{'UserFilesPath'},'/');
		return("$rmpath$folderPath");
	} else {
		return("$GLOBALS{'UserFilesPath'}$resourceType$folderPath");
	}
}

sub RemoveExtension
{
	local($fileName) = @_;
	local($path, $base, $ext);
	if($fileName !~ /\./) {
		$fileName .= '.';
	}
	if($fileName =~ /([^\\\/]*)\.(.*)$/) {
		$base = $1;
		$ext  = $2;
		if($fileName =~ /(.*)$base\.$ext$/) {
			$path = $1;
		}
	}
	return($path,$base,$ext);

}

sub ServerMapFolder
{
	local($resourceType,$folderPath) = @_;

	# Get the resource type directory.
	$sResourceTypePath = $GLOBALS{'UserFilesDirectory'} . $resourceType . '/';

	# Ensure that the directory exists.
	&CreateServerFolder($sResourceTypePath);

	# Return the resource type directory combined with the required path.
	$rmpath = &RemoveFromStart($folderPath,'/');
	return("$sResourceTypePath$rmpath");
}

sub GetParentFolder
{
	local($folderPath) = @_;

	$folderPath =~ s/[\/][^\/]+[\/]?$//g;
	return $folderPath;
}

sub CreateServerFolder
{
	local($folderPath) = @_;

	$sParent = &GetParentFolder($folderPath);
	# Check if the parent exists, or create it.
	if(!(-e $sParent)) {
		$sErrorMsg = &CreateServerFolder($sParent);
		if($sErrorMsg == 1) {
			return(1);
		}
	}
	if(!(-e $folderPath)) {
		umask(000);
		mkdir("$folderPath",0777);
		chmod(0777,"$folderPath");
		return(0);
	} else {
		return(1);
	}
}

sub GetRootPath
{
#use Cwd;

#	my $dir = getcwd;
#	print $dir;
#	$dir  =~ s/$ENV{'DOCUMENT_ROOT'}//g;
#	print $dir;
#	return($dir);

#	$wk = $0;
#	$wk =~ s/\/connector\.cgi//g;
#	if($wk) {
#		$current_dir = $wk;
#	} else {
#		$current_dir = `pwd`;
#	}
#	return($current_dir);
use Cwd;

	if($ENV{'DOCUMENT_ROOT'}) {
		$dir = $ENV{'DOCUMENT_ROOT'};
	} else {
		my $dir = getcwd;
		$workdir =~ s/\/connector\.cgi//g;
		$dir  =~ s/$workdir//g;
	}
	return($dir);



}
1;

--- NEW FILE: basexml.pl ---
#####
#  FCKeditor - The text editor for Internet - http://www.fckeditor.net
#  Copyright (C) 2003-2007 Frederico Caldeira Knabben
#
#  == BEGIN LICENSE ==
#
#  Licensed under the terms of any of the following licenses at your
#  choice:
#
#   - GNU General Public License Version 2 or later (the "GPL")
#     http://www.gnu.org/licenses/gpl.html
#
#   - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
#     http://www.gnu.org/licenses/lgpl.html
#
#   - Mozilla Public License Version 1.1 or later (the "MPL")
#     http://www.mozilla.org/MPL/MPL-1.1.html
#
#  == END LICENSE ==
#
#  This is the File Manager Connector for Perl.
#####

sub CreateXmlHeader
{
	local($command,$resourceType,$currentFolder) = @_;

	# Create the XML document header.
	print '<?xml version="1.0" encoding="utf-8" ?>';

	# Create the main "Connector" node.
	print '<Connector command="' . $command . '" resourceType="' . $resourceType . '">';

	# Add the current folder node.
	print '<CurrentFolder path="' . ConvertToXmlAttribute($currentFolder) . '" url="' . ConvertToXmlAttribute(GetUrlFromPath($resourceType,$currentFolder)) . '" />';
}

sub CreateXmlFooter
{
	print '</Connector>';
}

sub SendError
{
	local( $number, $text ) = @_;

	print << "_HTML_HEAD_";
Content-Type:text/xml; charset=utf-8
Pragma: no-cache
Cache-Control: no-cache
Expires: Thu, 01 Dec 1994 16:00:00 GMT

_HTML_HEAD_

	# Create the XML document header
	print '<?xml version="1.0" encoding="utf-8" ?>' ;

	print '<Connector><Error number="' . $number . '" text="' . &specialchar_cnv( $text ) . '" /></Connector>' ;

	exit ;
}

1;



From blaine at qs1489.pair.com  Sat Feb  9 07:54:03 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:03 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/simplecommands
	fckplugin.js, 1.2, 1.3
Message-ID: <20080209125403.08B8110FE81@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/simplecommands
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/plugins/simplecommands

Added Files:
	fckplugin.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckplugin.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm
	ImageObject.cfc, NONE, 1.1 cf5_connector.cfm, NONE,
	1.1 cf5_upload.cfm, NONE, 1.1 cf_basexml.cfm, NONE,
	1.1 cf_commands.cfm, NONE, 1.1 cf_connector.cfm, NONE,
	1.1 cf_io.cfm, NONE, 1.1 cf_upload.cfm, NONE, 1.1 cf_util.cfm,
	NONE, 1.1 config.cfm, NONE, 1.1 connector.cfm, NONE,
	1.1 image.cfc, NONE, 1.1 upload.cfm, NONE, 1.1
Message-ID: <20080209125402.547FC10FE6C@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/connectors/cfm

Added Files:
	ImageObject.cfc cf5_connector.cfm cf5_upload.cfm 
	cf_basexml.cfm cf_commands.cfm cf_connector.cfm cf_io.cfm 
	cf_upload.cfm cf_util.cfm config.cfm connector.cfm image.cfc 
	upload.cfm 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: cf_connector.cfm ---
<cfsetting enablecfoutputonly="yes" showdebugoutput="no">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * File Browser connector for ColdFusion (MX 6.0 and above).
 * (based on the original CF connector by Hendrik Kramer - hk at lwd.de)
 *
--->

<cfparam name="url.command">
<cfparam name="url.type">
<cfparam name="url.currentFolder">

<!--- note: no serverPath url parameter - see config.cfm if you need to set the serverPath manually --->

<cfinclude template="config.cfm">
<cfinclude template="cf_util.cfm">
<cfinclude template="cf_io.cfm">
<cfinclude template="cf_basexml.cfm">
<cfinclude template="cf_commands.cfm">

<cfif not Config.Enabled>
	<cfset SendError( 1, 'This connector is disabled. Please check the "editor/filemanager/connectors/cfm/config.cfm" file' )>
</cfif>

<cfset REQUEST.Config = Config>
<cfif find( "/", getBaseTemplatePath() ) >
	<cfset REQUEST.Fs = "/">
<cfelse>
	<cfset REQUEST.Fs = "\">
</cfif>

<cfset DoResponse() >

<cffunction name="DoResponse" output="true" returntype="void">

	<!--- Get the main request informaiton. --->
	<cfset var sCommand	= "#URL.Command#" >
	<cfset var sResourceType	= URL.Type >
	<cfset var sCurrentFolder	= GetCurrentFolder() >

	<!--- Check if it is an allowed command --->
	<cfif not IsAllowedCommand( sCommand ) >
		<cfset SendError( 1, "The """ & sCommand & """ command isn't allowed" ) >
	</cfif>

	<!--- Check if it is an allowed type. --->
	<cfif not IsAllowedType( sResourceType ) >
		<cfset SendError( 1, 'Invalid type specified' ) >
	</cfif>

	<!--- File Upload doesn't have to Return XML, so it must be intercepted before anything. --->
	<cfif sCommand eq "FileUpload">
		<cfset FileUpload( sResourceType, sCurrentFolder, sCommand )>
		<cfabort>
	</cfif>

	<cfset CreateXmlHeader( sCommand, sResourceType, sCurrentFolder )>

	<!--- Execute the required command. --->
	<cfif sCommand eq "GetFolders">
		<cfset GetFolders( sResourceType, sCurrentFolder ) >
	<cfelseif sCommand eq "GetFoldersAndFiles">
		<cfset GetFoldersAndFiles( sResourceType, sCurrentFolder ) >
	<cfelseif sCommand eq "CreateFolder">
		<cfset CreateFolder( sResourceType, sCurrentFolder ) >
	</cfif>

	<cfset CreateXmlFooter()>

	<cfexit>
</cffunction>

--- NEW FILE: image.cfc ---
<!---
	image.cfc v2.19, written by Rick Root (rick at webworksllc.com)
	Derivative of work originally done originally by James Dew.

	Related Web Sites:
	- http://www.opensourcecf.com/imagecfc (home page)
	- http://www.cfopen.org/projects/imagecfc (project page)

	LICENSE
	-------
	Copyright (c) 2007, Rick Root <rick at webworksllc.com>
	All rights reserved.

	Redistribution and use in source and binary forms, with or
	without modification, are permitted provided that the
	following conditions are met:

	- Redistributions of source code must retain the above
	  copyright notice, this list of conditions and the
[...1286 lines suppressed...]
		rgbArray,
		javacast("int",0),
		javacast("int",width)
		);
	newImage.setRGB(
		javacast("int",0),
		javacast("int",0),
		javacast("int",width),
		javacast("int",height),
		rgbArray,
		javacast("int",0),
		javacast("int",width)
		);
	return newImage;
	</cfscript>

</cffunction>

</cfcomponent>


--- NEW FILE: upload.cfm ---
<cfsetting enablecfoutputonly="Yes">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the "File Uploader" for ColdFusion (all versions).
 *
--->

<cfset REQUEST.CFVersion = Left( SERVER.COLDFUSION.PRODUCTVERSION, Find( ",", SERVER.COLDFUSION.PRODUCTVERSION ) - 1 )>
<cfif REQUEST.CFVersion lte 5>
	<cfinclude template="cf5_upload.cfm">
<cfelse>
	<cfinclude template="cf_upload.cfm">
</cfif>
--- NEW FILE: ImageObject.cfc ---
<cfcomponent name="ImageObject">
<!---
	ImageObject.cfc written by Rick Root (rick at webworksllc.com)
	
	Related Web Sites:
	- http://www.opensourcecf.com/imagecfc (home page)


	This is an object oriented interface to the original
	ImageCFC.

	Example Code:

	io = createObject("component","ImageObject");
	io.setOption("defaultJpegCompression",95);
	io.init("#ExpandPath(".")#/emily.jpg");
	io.scaleWidth(500);
	io.save("#ExpandPath(".")#/imagex1.jpg");

	io.flipHorizontal();
	io.save("#ExpandPath(".")#/imagex2.jpg");
	io.revert();
	io.filterFastBlur(2,5);
	io.save("#ExpandPath(".")#/imagex3.jpg");
	io.revert();
	io.filterPosterize(32);
	io.save("#ExpandPath(".")#/imagex4.jpg");


	LICENSE
	-------
	Copyright (c) 2006, Rick Root <rick at webworksllc.com>
	All rights reserved.

	Redistribution and use in source and binary forms, with or 
	without modification, are permitted provided that the 
	following conditions are met:

	- Redistributions of source code must retain the above 
	  copyright notice, this list of conditions and the 
	  following disclaimer. 
	- Redistributions in binary form must reproduce the above 
	  copyright notice, this list of conditions and the 
	  following disclaimer in the documentation and/or other 
	  materials provided with the distribution. 
	- Neither the name of the Webworks, LLC. nor the names of 
	  its contributors may be used to endorse or promote products 
	  derived from this software without specific prior written 
	  permission. 

	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
	CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
	MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
	CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
	OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->

<cfset variables.img = "">
<cfset variables.revertimg = "">
<cfset variables.imageCFC = createObject("component","image")>
<cfset variables.imageInfo = structNew()>
	<cfset variables.imageInfo.width = 0>
	<cfset variables.imageInfo.height = 0>
	<cfset variables.imageInfo.colorModel = "">
	<cfset variables.imageInfo.colorspace = "">
	<cfset variables.imageInfo.objColorModel = "">
	<cfset variables.imageInfo.objColorspace = "">
	<cfset variables.imageInfo.sampleModel = "">
	<cfset variables.imageInfo.imageType = 0>
	<cfset variables.imageInfo.misc = "">
	<cfset variables.imageInfo.canModify = false>
<cfset variables.imageCFC.setOption("throwonerror",true)>

<!---

	init(filename)        Initialize object from a file.
	init(width, height)   Initialize with a blank image
	init(bufferedImage)   Initiailize with an existing object
--->
<cffunction name="init" access="public" output="false" returnType="void">
	<cfargument name="arg1" type="any" required="yes">
	<cfargument name="arg2" type="any" required="no">

	<cfif isDefined("arg2") and isNumeric(arg1) and isNumeric(arg2)>
		<cfset arg1 = javacast("int",int(arg1))>
		<cfset arg2 = javacast("int",int(arg2))>
		<cfset variables.img = createObject("java","java.awt.image.BufferedImage")>
		<cfset variables.img.init(arg1,arg2,variables.img.TYPE_INT_RGB)>
	<cfelseif arg1.getClass().getName() eq "java.awt.image.BufferedImage">
		<cfset variables.img = arg1>
	<cfelseif isSimpleValue(arg1) and len(arg1) gt 0>
		<cfset imageResults = variables.imageCFC.readImage(arg1, "no")>
		<cfset variables.img = imageResults.img>
	<cfelse>
		<cfthrow message="Object Instantiation Error" detail="You have attempted to initialize ooimage.cfc with invalid arguments.  Please consult the documentation for correct initialization arguments.">
	</cfif>
	<cfif variables.revertimg eq "">
		<cfset variables.revertimg = variables.img>
	</cfif>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
	<cfreturn>
</cffunction>

<cffunction name="flipHorizontal" access="public" output="true" returnType="void" hint="Flip an image horizontally.">
	<cfset var imageResults = imageCFC.flipHorizontal(variables.img,"","")>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
</cffunction>

<cffunction name="getImageInfo" access="public" output="true" returntype="struct" hint="Returns image information.">
	<cfreturn variables.imageInfo>
</cffunction>
<cffunction name="getImageObject" access="public" output="true" returntype="struct" hint="Returns a java Buffered Image Object.">
	<cfreturn variables.img>
</cffunction>

<cffunction name="flipVertical" access="public" output="true" returntype="void" hint="Flop an image vertically.">
	<cfset var imageResults = imageCFC.flipVertical(variables.img,"","")>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
</cffunction>

<cffunction name="scaleWidth" access="public" output="true" returntype="void" hint="Scale an image to a specific width.">
	<cfargument name="newWidth" required="yes" type="numeric">
	<cfset var imageResults = imageCFC.scaleWidth(variables.img,"","", newWidth)>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>

</cffunction>

<cffunction name="scaleHeight" access="public" output="true" returntype="void" hint="Scale an image to a specific height.">
	<cfargument name="newHeight" required="yes" type="numeric">
	<cfset var imageResults = imageCFC.scaleHeight(variables.img,"","", newHeight)>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
</cffunction>

<cffunction name="resize" access="public" output="true" returntype="void" hint="Resize an image to a specific width and height.">
	<cfargument name="newWidth" required="yes" type="numeric">
	<cfargument name="newHeight" required="yes" type="numeric">
	<cfargument name="preserveAspect" required="no" type="boolean" default="FALSE">
	<cfargument name="cropToExact" required="no" type="boolean" default="FALSE">

	<cfset var imageResults = imageCFC.resize(variables.img,"","",newWidth,newHeight,preserveAspect,cropToExact)>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
</cffunction>

<cffunction name="crop" access="public" output="true" returntype="void" hint="Crop an image.">
	<cfargument name="fromX" required="yes" type="numeric">
	<cfargument name="fromY" required="yes" type="numeric">
	<cfargument name="newWidth" required="yes" type="numeric">
	<cfargument name="newHeight" required="yes" type="numeric">
	<cfset var imageResults = imageCFC.crop(variables.img,"","",fromX,fromY,newWidth,newHeight)>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>

</cffunction>

<cffunction name="rotate" access="public" output="true" returntype="void" hint="Rotate an image (+/-)90, (+/-)180, or (+/-)270 degrees.">
	<cfargument name="degrees" required="yes" type="numeric">
	<cfset var imageResults = imageCFC.rotate(variables.img,"","",degrees)>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>

</cffunction>

<cffunction name="setOption" access="public" output="true" returnType="void" hint="Sets values for allowed CFC options.">
	<cfargument name="key" type="string" required="yes">
	<cfargument name="val" type="string" required="yes">
	<cfif lcase(trim(key)) eq "throwonerror">
		<cfthrow message="Option Configuration Error" detail="You cannot set the throwOnError option when using ImageObject.cfc">
	</cfif>
	<cfset imageCFC.setOption(key, val)>
	
</cffunction>

<cffunction name="getOption" access="public" output="true" returnType="any" hint="Returns the current value for the specified CFC option.">
	<cfargument name="key" type="string" required="yes">
	<cfreturn imageCFC.getOption(key)>
</cffunction>

<cffunction name="filterFastBlur" access="public" output="true" returntype="void" hint="Internal method used for flipping and flopping images.">
	<cfargument name="blurAmount" required="yes" type="numeric">
	<cfargument name="iterations" required="yes" type="numeric">
	<cfset var imageResults = imageCFC.filterFastBlur(variables.img,"","",blurAmount,iterations)>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>

</cffunction>

<cffunction name="filterSharpen" access="public" output="true" returntype="void" hint="Internal method used for flipping and flopping images.">
	<cfset var imageResults = imageCFC.filterSharpen(variables.img,"","")>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>

</cffunction>


<cffunction name="filterPosterize" access="public" output="true" returntype="void" hint="Internal method used for flipping and flopping images.">
	<cfargument name="amount" required="yes" type="string">
	<cfset var imageResults = imageCFC.filterPosterize(variables.img,"","",amount)>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
</cffunction>


<cffunction name="addText" access="public" output="true" returntype="void" hint="Add text to an image.">
	<cfargument name="x" required="yes" type="numeric">
	<cfargument name="y" required="yes" type="numeric">
	<cfargument name="fontDetails" required="yes" type="struct">
	<cfargument name="content" required="yes" type="String">
	<cfset var imageResults = imageCFC.addText(variables.img,"","",x,y,fontDetails,content)>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>

</cffunction>

<cffunction name="watermark" access="public" output="false" returnType="void">
	<cfargument name="wmImage" required="yes" type="Any">
	<cfargument name="alpha" required="yes" type="numeric">
	<cfargument name="placeAtX" required="yes" type="numeric">
	<cfargument name="placeAtY" required="yes" type="numeric">

	<cfset var imageResults = "">
	<cfif isSimpleValue(wmImage)>
		<!--- filename or URL --->
		<cfset imageResults = imageCFC.watermark(variables.img,"","",wmImage,alpha,placeAtX,placeAtY)>
	<cfelse>
		<!--- must be a java object --->
		<cfset imageResults = imageCFC.watermark(variables.img,wmImage,"","",alpha,placeAtX,placeAtY)>
	</cfif>
	<cfset variables.revertimg = variables.img>
	<cfset variables.img = imageResults.img>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>

</cffunction>

<cffunction name="save" access="public" output="false" returnType="void">
	<cfargument name="filename" type="string" required="no">
	<cfargument name="jpegCompression" type="numeric" required="no">
	<cfif isDefined("arguments.jpegCompression") and isNumeric(arguments.jpegCompression)>
		<cfset imageCFC.writeImage(filename,variables.img,jpegCompression)>
	<cfelse>
		<cfset imageCFC.writeImage(filename,variables.img)>
	</cfif>
</cffunction>

<cffunction name="revert" access="public" output="true" returntype="void" hint="Undo the previous manipulation.">
	<cfset variables.img = variables.revertimg>
	<cfset variables.imageInfo = imageCFC.getImageInfo(variables.img,"")>
</cffunction>

</cfcomponent>

--- NEW FILE: connector.cfm ---
<cfsetting enablecfoutputonly="Yes">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * File Browser connector for ColdFusion (all versions).
 *
--->

<cfset REQUEST.CFVersion = Left( SERVER.COLDFUSION.PRODUCTVERSION, Find( ",", SERVER.COLDFUSION.PRODUCTVERSION ) - 1 )>
<cfif REQUEST.CFVersion lte 5>
	<cfinclude template="cf5_connector.cfm">
<cfelse>
	<cfinclude template="cf_connector.cfm">
</cfif>
--- NEW FILE: cf_commands.cfm ---
<cfsetting enablecfoutputonly="Yes">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This file include the functions that handle the Command requests
 * in the ColdFusion Connector (MX 6.0 and above).
--->

<cffunction name="FileUpload" returntype="void" output="true">
	<cfargument name="resourceType" type="string" required="yes" default="">
	<cfargument name="currentFolder" type="string" required="yes" default="">
	<cfargument name="sCommand" type="string" required="yes" default="">

	<cfset var sFileName = "">
	<cfset var sFilePart = "">
	<cfset var sFileExt = "">
	<cfset var sFileUrl = "">
	<cfset var sTempFilePath = "">
	<cfset var errorNumber = 0>
	<cfset var customMsg = 0>
	<cfset var counter = 0>
	<cfset var destination = "">

    <cftry>
        <cffile action="UPLOAD" filefield="NewFile" destination="#GetTempDirectory()#" nameconflict="makeunique" mode="0755" />
		<cfset sTempFilePath = CFFILE.ServerDirectory & REQUEST.fs & CFFILE.ServerFile>

		<!--- Map the virtual path to the local server path. --->
		<cfset sServerDir = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, ARGUMENTS.sCommand) >
		<!--- Get the uploaded file name. --->
		<cfset sFileName = SanitizeFileName( CFFILE.ClientFile ) >
		<cfset sOriginalFileName = sFileName >

		<cfif isDefined( "REQUEST.Config.SecureImageUploads" ) and REQUEST.Config.SecureImageUploads>
			<cfif not IsImageValid( sTempFilePath, CFFILE.ClientFileExt )>
				<cftry>
				<cffile action="delete" file="#sTempFilePath#">
				<cfcatch type="any">
				</cfcatch>
				</cftry>
				<cfthrow errorcode="202" type="fckeditor">
			</cfif>
		</cfif>

		<cfif isDefined( "REQUEST.Config.HtmlExtensions" ) and not listFindNoCase( REQUEST.Config.HtmlExtensions, CFFILE.ClientFileExt )>
			<cfif DetectHtml( sTempFilePath )>
				<cftry>
				<cffile action="delete" file="#sTempFilePath#">
				<cfcatch type="any">
				</cfcatch>
				</cftry>
				<cfthrow errorcode="202" type="fckeditor">
			</cfif>
		</cfif>

		<cfif not IsAllowedExt( CFFILE.ClientFileExt, ARGUMENTS.resourceType )>
			<cftry>
			<cffile action="delete" file="#sTempFilePath#">
			<cfcatch type="any">
			</cfcatch>
			</cftry>
			<cfthrow errorcode="202" type="fckeditor">
		</cfif>

		<!--- When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename. --->
		<cfscript>
			sFileExt = GetExtension( sFileName ) ;
			sFilePart = RemoveExtension( sFileName );
			while( fileExists( sServerDir & sFileName ) )
			{
				counter = counter + 1;
				sFileName = sFilePart & '(#counter#).' & CFFILE.ClientFileExt;
				errorNumber = 201;
			}
		</cfscript>

 		<cfset destination = sServerDir & sFileName>
<!---
		<cfdump var="#sTempFilePath#">
		<cfoutput ><br /></cfoutput>
		<cfdump var="#destination#">
		<cfabort>
 --->
		<cflock name="#destination#" timeout="30" type="Exclusive">
		<cftry>
			<cffile action="move" source="#sTempFilePath#" destination="#destination#" mode="755">
			<!--- omit CF 6.1 error during moving uploaded file, just copy that file instead of moving --->
			<cfcatch type="any">
				<cffile action="copy" source="#sTempFilePath#" destination="#destination#" mode="755">
			</cfcatch>
		</cftry>
		</cflock>

		<cfset sFileUrl = CombinePaths( GetResourceTypePath( ARGUMENTS.resourceType, sCommand ) , ARGUMENTS.currentFolder ) >
		<cfset sFileUrl = CombinePaths( sFileUrl , sFileName ) >

		<cfcatch type="fckeditor">
			<cfset errorNumber = CFCATCH.ErrorCode>
		</cfcatch>

		<cfcatch type="any">
			<cfset errorNumber = "1">
			<cfset customMsg = CFCATCH.Message >
		</cfcatch>

    </cftry>

	<cfset SendUploadResults( errorNumber, sFileUrl, sFileName, customMsg ) >
</cffunction>

<cffunction name="GetFolders" returntype="void" output="true">
	<cfargument name="resourceType" type="String" required="true">
	<cfargument name="currentFolder" type="String" required="true">

	<cfset var i = 1>
	<cfset var folders = "">
	<!--- Map the virtual path to the local server path --->
	<cfset var sServerDir = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, "GetFolders" ) >

	<!--- Sort directories first, name ascending --->
	<cfdirectory action="list" directory="#sServerDir#" name="qDir" sort="type,name">
	<cfscript>
		while( i lte qDir.recordCount )
		{
			if( compareNoCase( qDir.type[i], "FILE" ) and not listFind( ".,..", qDir.name[i] ) )
			{
				folders = folders & '<Folder name="#HTMLEditFormat( qDir.name[i] )#" />' ;
			}
			i = i + 1;
		}
	</cfscript>
	<cfoutput><Folders>#folders#</Folders></cfoutput>
</cffunction>

<cffunction name="GetFoldersAndfiles" returntype="void" output="true">
	<cfargument name="resourceType" type="String" required="true">
	<cfargument name="currentFolder" type="String" required="true">

	<cfset var i = 1>
	<cfset var folders = "">
	<cfset var files = "">
	<!--- Map the virtual path to the local server path --->
	<cfset var sServerDir = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, "GetFolders" ) >

	<!--- Sort directories first, name ascending --->
	<cfdirectory action="list" directory="#sServerDir#" name="qDir" sort="type,name">
	<cfscript>
		while( i lte qDir.recordCount )
		{
			if( not compareNoCase( qDir.type[i], "DIR" ) and not listFind( ".,..", qDir.name[i] ) )
			{
				folders = folders & '<Folder name="#HTMLEditFormat(qDir.name[i])#" />' ;
			}
			else if( not compareNoCase( qDir.type[i], "FILE" ) )
			{
				fileSizeKB = round(qDir.size[i] / 1024) ;
				files = files & '<File name="#HTMLEditFormat(qDir.name[i])#" size="#IIf( fileSizeKB GT 0, DE( fileSizeKB ), 1)#" />' ;
			}
			i = i + 1 ;
		}
	</cfscript>
	<cfoutput><Folders>#folders#</Folders></cfoutput>
	<cfoutput><Files>#files#</Files></cfoutput>
</cffunction>

<cffunction name="CreateFolder" returntype="void" output="true">
	<cfargument name="resourceType" required="true" type="string">
	<cfargument name="currentFolder" required="true" type="string">

	<cfset var sNewFolderName = url.newFolderName >
	<cfset var sServerDir = "" >
	<cfset var errorNumber = 0>
	<cfset var sErrorMsg = "">
	<cfset var currentFolderPath = ServerMapFolder( ARGUMENTS.resourceType, ARGUMENTS.currentFolder, 'CreateFolder' )>

	<cfparam name="url.newFolderName" default="">

	<cfscript>
		sNewFolderName = SanitizeFolderName( sNewFolderName ) ;
	</cfscript>

	<cfif not len( sNewFolderName ) or len( sNewFolderName ) gt 255>
		<cfset errorNumber = 102>
	<cfelseif directoryExists( currentFolderPath & sNewFolderName )>
		<cfset errorNumber = 101>
	<cfelseif find( "..", sNewFolderName )>
		<cfset errorNumber = 103>
	<cfelse>
		<cfset errorNumber = 0>

		<!--- Map the virtual path to the local server path of the current folder. --->
		<cfset sServerDir = currentFolderPath & sNewFolderName >

		<cftry>
			<cfdirectory action="create" directory="#currentFolderPath##sNewFolderName#" mode="755">
			<cfcatch type="any">
			<!---
				un-resolvable error numbers in ColdFusion:
				* 102 : Invalid folder name.
				* 103 : You have no permissions to create the folder.
			--->
			<cfset errorNumber = 110>
			</cfcatch>
		</cftry>
	</cfif>

	<cfoutput><Error number="#errorNumber#" originalDescription="#HTMLEditFormat(sErrorMsg)#" /></cfoutput>
</cffunction>

--- NEW FILE: config.cfm ---
<cfsetting enablecfoutputonly="Yes">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Configuration file for the ColdFusion Connector (all versions).
--->

<cfscript>
	Config = StructNew() ;

	// SECURITY: You must explicitly enable this "connector". (Set enabled to "true")
	Config.Enabled = true ;

	// Path to uploaded files relative to the document root.
	Config.UserFilesPath = "/userfiles/" ;

	// Use this to force the server path if FCKeditor is not running directly off
	// the root of the application or the FCKeditor directory in the URL is a virtual directory
	// or a symbolic link / junction
	// Example: C:\inetpub\wwwroot\myDocs\
	Config.ServerPath = "" ;

	// Due to security issues with Apache modules, it is recommended to leave the
	// following setting enabled.
	Config.ForceSingleExtension = true ;

	// Perform additional checks for image files - if set to true, validate image size
	// (This feature works in MX 6.0 and above)
	Config.SecureImageUploads = true;

	// What the user can do with this connector
	Config.ConfigAllowedCommands 			= "QuickUpload,FileUpload,GetFolders,GetFoldersAndFiles,CreateFolder" ;

	//Allowed Resource Types
	Config.ConfigAllowedTypes 				= "File,Image,Flash,Media" ;

	// For security, HTML is allowed in the first Kb of data for files having the
	// following extensions only.
	// (This feature works in MX 6.0 and above))
	Config.HtmlExtensions					= "html,htm,xml,xsd,txt,js" ;


//	Configuration settings for each Resource Type
//
//	- AllowedExtensions: the possible extensions that can be allowed.
//		If it is empty then any file type can be uploaded.
//	- DeniedExtensions: The extensions that won't be allowed.
//		If it is empty then no restrictions are done here.
//
//	For a file to be uploaded it has to fulfill both the AllowedExtensions
//	and DeniedExtensions (that's it: not being denied) conditions.
//
//	- FileTypesPath: the virtual folder relative to the document root where
//		these resources will be located.
//		Attention: It must start and end with a slash: '/'
//
//	- FileTypesAbsolutePath: the physical path to the above folder. It must be
//		an absolute path.
//		If it's an empty string then it will be autocalculated.
//		Usefull if you are using a virtual directory, symbolic link or alias.
//		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
//		Attention: The above 'FileTypesPath' must point to the same directory.
//		Attention: It must end with a slash: '/'
//
//
//	 - QuickUploadPath: the virtual folder relative to the document root where
//		these resources will be uploaded using the Upload tab in the resources
//		dialogs.
//		Attention: It must start and end with a slash: '/'
//
//	 - QuickUploadAbsolutePath: the physical path to the above folder. It must be
//		an absolute path.
//		If it's an empty string then it will be autocalculated.
//		Usefull if you are using a virtual directory, symbolic link or alias.
//		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
//		Attention: The above 'QuickUploadPath' must point to the same directory.
//		Attention: It must end with a slash: '/'

	Config.AllowedExtensions 				= StructNew() ;
	Config.DeniedExtensions 				= StructNew() ;
	Config.FileTypesPath 					= StructNew() ;
	Config.FileTypesAbsolutePath 			= StructNew() ;
	Config.QuickUploadPath 					= StructNew() ;
	Config.QuickUploadAbsolutePath 			= StructNew() ;

	Config.AllowedExtensions["File"]	 	= "7z,aiff,asf,avi,bmp,csv,doc,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xml,zip" ;
	Config.DeniedExtensions["File"] 		= "" ;
	Config.FileTypesPath["File"] 			= Config.UserFilesPath & 'file/' ;
	Config.FileTypesAbsolutePath["File"] 	= iif( Config.ServerPath eq "", de(""), de(Config.ServerPath & 'file/') ) ;
	Config.QuickUploadPath["File"] 			= Config.FileTypesPath["File"] ;
	Config.QuickUploadAbsolutePath["File"] 	= Config.FileTypesAbsolutePath["File"] ;

	Config.AllowedExtensions["Image"] 		= "bmp,gif,jpeg,jpg,png" ;
	Config.DeniedExtensions["Image"] 		= "" ;
	Config.FileTypesPath["Image"] 			= Config.UserFilesPath & 'image/' ;
	Config.FileTypesAbsolutePath["Image"] 	= iif( Config.ServerPath eq "", de(""), de(Config.ServerPath & 'image/') ) ;
	Config.QuickUploadPath["Image"] 		= Config.FileTypesPath["Image"] ;
	Config.QuickUploadAbsolutePath["Image"] = Config.FileTypesAbsolutePath["Image"] ;

	Config.AllowedExtensions["Flash"] 		= "swf,flv" ;
	Config.DeniedExtensions["Flash"] 		= "" ;
	Config.FileTypesPath["Flash"] 			= Config.UserFilesPath & 'flash/' ;
	Config.FileTypesAbsolutePath["Flash"] 	= iif( Config.ServerPath eq "", de(""), de(Config.ServerPath & 'flash/') ) ;
	Config.QuickUploadPath["Flash"] 		= Config.FileTypesPath["Flash"] ;
	Config.QuickUploadAbsolutePath["Flash"] = Config.FileTypesAbsolutePath["Flash"] ;

	Config.AllowedExtensions["Media"] 		= "aiff,asf,avi,bmp,fla,flv,gif,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,png,qt,ram,rm,rmi,rmvb,swf,tif,tiff,wav,wma,wmv" ;
	Config.DeniedExtensions["Media"] 		= "" ;
	Config.FileTypesPath["Media"] 			= Config.UserFilesPath & 'media/' ;
	Config.FileTypesAbsolutePath["Media"] 	= iif( Config.ServerPath eq "", de(""), de(Config.ServerPath & 'media/') ) ;
	Config.QuickUploadPath["Media"] 		= Config.FileTypesPath["Media"] ;
	Config.QuickUploadAbsolutePath["Media"] = Config.FileTypesAbsolutePath["Media"] ;
</cfscript>

<cftry>
<!--- code to maintain backwards compatibility with previous version of cfm connector --->
<cfif isDefined("application.userFilesPath")>

	<cflock scope="application" type="readonly" timeout="5">
		<cfset config.userFilesPath = application.userFilesPath>
	</cflock>

<cfelseif isDefined("server.userFilesPath")>

	<cflock scope="server" type="readonly" timeout="5">
		<cfset config.userFilesPath = server.userFilesPath>
	</cflock>

</cfif>

<!--- look for config struct in application and server scopes --->
<cfif isDefined("application.FCKeditor") and isStruct(application.FCKeditor)>

	<cflock scope="application" type="readonly" timeout="5">
	<cfset variables.FCKeditor = duplicate(application.FCKeditor)>
	</cflock>

<cfelseif isDefined("server.FCKeditor") and isStruct(server.FCKeditor)>

	<cflock scope="server" type="readonly" timeout="5">
	<cfset variables.FCKeditor = duplicate(server.FCKeditor)>
	</cflock>

</cfif>
	<!--- catch potential "The requested scope application has not been enabled" exception --->
	<cfcatch type="any">
	</cfcatch>
</cftry>

<cfif isDefined("FCKeditor")>

	<!--- copy key values from external to local config (i.e. override default config as required) --->
	<cfscript>
		function structCopyKeys(stFrom, stTo) {
			for ( key in stFrom ) {
				if ( isStruct(stFrom[key]) ) {
					structCopyKeys(stFrom[key],stTo[key]);
				} else {
					stTo[key] = stFrom[key];
				}
			}
		}
		structCopyKeys(FCKeditor, config);
	</cfscript>

</cfif>

--- NEW FILE: cf5_connector.cfm ---
<cfsetting enablecfoutputonly="yes" showdebugoutput="no">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * File Browser connector for ColdFusion 5.
 * (based on the original CF connector by Hendrik Kramer - hk at lwd.de)
 *
 * Note:
 * FCKeditor requires that the connector responds with UTF-8 encoded XML.
 * As ColdFusion 5 does not fully support UTF-8 encoding, we force ASCII
 * file and folder names in this connector to allow CF5 send a UTF-8
 * encoded response - code points under 127 in UTF-8 are stored using a
 * single byte, using the same encoding as ASCII, which is damn handy.
 * This is all grand for the English speakers, like meself, but I dunno
 * how others are gonna take to it. Well, the previous version of this
 * connector already did this with file names and nobody seemed to mind,
 * so fingers-crossed nobody will mind their folder names being munged too.
 *
--->

<cfparam name="url.command">
<cfparam name="url.type">
<cfparam name="url.currentFolder">
<!--- note: no serverPath url parameter - see config.cfm if you need to set the serverPath manually --->

<cfinclude template="config.cfm">

<cfscript>
	userFilesPath = config.userFilesPath;

	if ( userFilesPath eq "" )
	{
		userFilesPath = "/userfiles/";
	}

	// make sure the user files path is correctly formatted
	userFilesPath = replace(userFilesPath, "\", "/", "ALL");
	userFilesPath = replace(userFilesPath, '//', '/', 'ALL');
	if ( right(userFilesPath,1) NEQ "/" )
	{
		userFilesPath = userFilesPath & "/";
	}
	if ( left(userFilesPath,1) NEQ "/" )
	{
		userFilesPath = "/" & userFilesPath;
	}

	// make sure the current folder is correctly formatted
	url.currentFolder = replace(url.currentFolder, "\", "/", "ALL");
	url.currentFolder = replace(url.currentFolder, '//', '/', 'ALL');
	if ( right(url.currentFolder,1) neq "/" )
	{
		url.currentFolder = url.currentFolder & "/";
	}
	if ( left(url.currentFolder,1) neq "/" )
	{
		url.currentFolder = "/" & url.currentFolder;
	}

	if ( find("/",getBaseTemplatePath()) neq 0 )
	{
		fs = "/";
	}
	else
	{
		fs = "\";
	}

	// Get the base physical path to the web root for this application. The code to determine the path automatically assumes that
	// the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a
	// virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary.
	if ( len(config.serverPath) )
	{
		serverPath = config.serverPath;

		if ( right(serverPath,1) neq fs )
		{
			serverPath = serverPath & fs;
		}
	}
	else
	{
		serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"") & replace(userFilesPath,"/",fs,"all");
	}

	rootPath = left( serverPath, Len(serverPath) - Len(userFilesPath) ) ;
	xmlContent = ""; // append to this string to build content
</cfscript>

<cfset resourceTypeUrl = rereplace( replace( Config.FileTypesPath[url.type], fs, "/", "all"), "/$", "") >

<cfif isDefined( "Config.FileTypesAbsolutePath" )
		and structkeyexists( Config.FileTypesAbsolutePath, url.type )
		and Len( Config.FileTypesAbsolutePath[url.type] )>

			<cfset userFilesServerPath = Config.FileTypesAbsolutePath[url.type] & url.currentFolder>
<cfelse>
	<cftry>
	<cfset userFilesServerPath = expandpath( resourceTypeUrl ) & url.currentFolder>
	<!--- Catch: Parameter 1 of function ExpandPath must be a relative path --->
	<cfcatch type="any">
		<cfset userFilesServerPath = rootPath & Config.FileTypesPath[url.type] & url.currentFolder>
	</cfcatch>
	</cftry>
</cfif>

<cfset userFilesServerPath = replace( userFilesServerPath, "/", fs, "all" ) >
<!--- get rid of double directory separators --->
<cfset userFilesServerPath = replace( userFilesServerPath, fs & fs, fs, "all") >

<cfif not config.enabled>

	<cfset xmlContent = "<Error number=""1"" text=""This connector is disabled. Please check the 'editor/filemanager/connectors/cfm/config.cfm' file"" />">

<cfelseif find("..",url.currentFolder)>

	<cfset xmlContent = "<Error number=""102"" />">

<cfelseif isDefined("Config.ConfigAllowedCommands") and not ListFind(Config.ConfigAllowedCommands, url.command)>

	<cfset xmlContent = '<Error number="1" text="The &quot;' & url.command & '&quot; command isn''t allowed" />'>

<cfelseif isDefined("Config.ConfigAllowedTypes") and not ListFind(Config.ConfigAllowedTypes, url.type)>

	<cfset xmlContent = '<Error number="1" text="The &quot;' & url.type & '&quot; type isn''t allowed" />'>

</cfif>

<cfset resourceTypeDirectory = left( userFilesServerPath, Len(userFilesServerPath) - Len(url.currentFolder) )>

<cfif not len(xmlContent) and not directoryexists(resourceTypeDirectory)>
	<!--- create directories in physical path if they don't already exist --->
	<cfset currentPath = "">
	<cftry>
		<cfloop list="#resourceTypeDirectory#" index="name" delimiters="#fs#">
			<cfif currentPath eq "" and fs eq "\">
				<!--- Without checking this, we would have in Windows \C:\ --->
				<cfif not directoryExists(name)>
					<cfdirectory action="create" directory="#name#" mode="755">
				</cfif>
			<cfelse>
				<cfif not directoryExists(currentPath & fs & name)>
					<cfdirectory action="create" directory="#currentPath##fs##name#" mode="755">
				</cfif>
			</cfif>

			<cfif fs eq "\" and currentPath eq "">
				<cfset currentPath = name>
			<cfelse>
				<cfset currentPath = currentPath & fs & name>
			</cfif>
		</cfloop>

	<cfcatch type="any">

		<!--- this should only occur as a result of a permissions problem --->
		<cfset xmlContent = "<Error number=""103"" />">

	</cfcatch>

	</cftry>
</cfif>

<cfif not len(xmlContent)>

	<!--- no errors thus far - run command --->

	<!--- we need to know the physical path to the current folder for all commands --->
	<cfset currentFolderPath = userFilesServerPath>

	<cfswitch expression="#url.command#">

		<cfcase value="FileUpload">
			<cfset config_included = true >
			<cfinclude template="cf5_upload.cfm">
			<cfabort>
		</cfcase>


		<cfcase value="GetFolders">

			<!--- Sort directories first, name ascending --->
			<cfdirectory
				action="list"
				directory="#currentFolderPath#"
				name="qDir"
				sort="type,name">

			<cfscript>
				i=1;
				folders = "";
				while( i lte qDir.recordCount ) {
					if( not compareNoCase( qDir.type[i], "FILE" ))
						break;
					if( not listFind(".,..", qDir.name[i]) )
						folders = folders & '<Folder name="#HTMLEditFormat( qDir.name[i] )#" />';
					i=i+1;
				}

				xmlContent = xmlContent & '<Folders>' & folders & '</Folders>';
			</cfscript>

		</cfcase>


		<cfcase value="GetFoldersAndFiles">

			<!--- Sort directories first, name ascending --->
			<cfdirectory
				action="list"
				directory="#currentFolderPath#"
				name="qDir"
				sort="type,name">

			<cfscript>
				i=1;
				folders = "";
				files = "";
				while( i lte qDir.recordCount ) {
					if( not compareNoCase( qDir.type[i], "DIR" ) and not listFind(".,..", qDir.name[i]) ) {
						folders = folders & '<Folder name="#HTMLEditFormat(qDir.name[i])#" />';
					} else if( not compareNoCase( qDir.type[i], "FILE" ) ) {
						fileSizeKB = round(qDir.size[i] / 1024);
						files = files & '<File name="#HTMLEditFormat(qDir.name[i])#" size="#IIf( fileSizeKB GT 0, DE( fileSizeKB ), 1)#" />';
					}
					i=i+1;
				}

				xmlContent = xmlContent & '<Folders>' & folders & '</Folders>';
				xmlContent = xmlContent & '<Files>' & files & '</Files>';
			</cfscript>

		</cfcase>


		<cfcase value="CreateFolder">

			<cfparam name="url.newFolderName" default="">

			<cfscript>
				newFolderName = url.newFolderName;
				if( reFind("[^A-Za-z0-9_\-\.]", newFolderName) ) {
					// Munge folder name same way as we do the filename
					// This means folder names are always US-ASCII so we don't have to worry about CF5 and UTF-8
					newFolderName = reReplace(newFolderName, "[^A-Za-z0-9\-\.]", "_", "all");
					newFolderName = reReplace(newFolderName, "_{2,}", "_", "all");
					newFolderName = reReplace(newFolderName, "([^_]+)_+$", "\1", "all");
					newFolderName = reReplace(newFolderName, "$_([^_]+)$", "\1", "all");
				}
			</cfscript>

			<cfif not len(newFolderName) or len(newFolderName) gt 255>
				<cfset errorNumber = 102>
			<cfelseif directoryExists(currentFolderPath & newFolderName)>
				<cfset errorNumber = 101>
			<cfelseif reFind("^\.\.",newFolderName)>
				<cfset errorNumber = 103>
			<cfelse>
				<cfset errorNumber = 0>

				<cftry>
					<cfdirectory
						action="create"
						directory="#currentFolderPath##newFolderName#"
						mode="755">
					<cfcatch>
						<!---
						un-resolvable error numbers in ColdFusion:
						* 102 : Invalid folder name.
						* 103 : You have no permissions to create the folder.
						--->
						<cfset errorNumber = 110>
					</cfcatch>
				</cftry>
			</cfif>

			<cfset xmlContent = xmlContent & '<Error number="#errorNumber#" />'>

		</cfcase>

		<cfdefaultcase>
			<cfthrow type="fckeditor.connector" message="Illegal command: #url.command#">
		</cfdefaultcase>

	</cfswitch>
</cfif>

<cfscript>
	xmlHeader = '<?xml version="1.0" encoding="utf-8" ?><Connector command="#url.command#" resourceType="#url.type#">';
	xmlHeader = xmlHeader & '<CurrentFolder path="#url.currentFolder#" url="#resourceTypeUrl##url.currentFolder#" />';
	xmlFooter = '</Connector>';
</cfscript>

<cfheader name="Expires" value="#GetHttpTimeString(Now())#">
<cfheader name="Pragma" value="no-cache">
<cfheader name="Cache-Control" value="no-cache, no-store, must-revalidate">
<cfcontent reset="true" type="text/xml; charset=UTF-8">
<cfoutput>#xmlHeader##xmlContent##xmlFooter#</cfoutput>

--- NEW FILE: cf_io.cfm ---
<cfsetting enablecfoutputonly="Yes">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This file include IO specific functions used by the ColdFusion Connector (MX 6.0 and above).
 *
--->

<cffunction name="CombinePaths" returntype="String" output="true">
	<cfargument name="sBasePath" required="true">
	<cfargument name="sFolder" required="true">
	<cfset sBasePath = RemoveFromEnd( sBasePath, "/" )>
	<cfset sBasePath = RemoveFromEnd( sBasePath, "\" )>
	<cfreturn sBasePath & "/" & RemoveFromStart( ARGUMENTS.sFolder, '/' )>
</cffunction>

<cffunction name="GetResourceTypePath" returntype="String" output="false">
	<cfargument name="resourceType" required="true">
	<cfargument name="sCommand" required="true">

	<cfif ARGUMENTS.sCommand eq "QuickUpload">
		<cfreturn REQUEST.Config['QuickUploadPath'][ARGUMENTS.resourceType]>
	<cfelse>
		<cfreturn REQUEST.Config['FileTypesPath'][ARGUMENTS.resourceType]>
	</cfif>
</cffunction>

<cffunction name="GetResourceTypeDirectory" returntype="String" output="false">
	<cfargument name="resourceType" required="true">
	<cfargument name="sCommand" required="true">

	<cfif ARGUMENTS.sCommand eq "QuickUpload">
		<cfif isDefined( "REQUEST.Config.QuickUploadAbsolutePath" )
			and structkeyexists( REQUEST.Config.QuickUploadAbsolutePath, ARGUMENTS.resourceType )
			and Len( REQUEST.Config.QuickUploadAbsolutePath[ARGUMENTS.resourceType] )>
				<cfreturn REQUEST.Config.QuickUploadAbsolutePath[ARGUMENTS.resourceType]>
		</cfif>

		<cfreturn expandpath( REQUEST.Config.QuickUploadPath[ARGUMENTS.resourceType] )>
	<cfelse>
		<cfif isDefined( "REQUEST.Config.FileTypesAbsolutePath" )
			and structkeyexists( REQUEST.Config.FileTypesAbsolutePath, ARGUMENTS.resourceType )
			and Len( REQUEST.Config.FileTypesAbsolutePath[ARGUMENTS.resourceType] )>
				<cfreturn REQUEST.Config.FileTypesAbsolutePath[ARGUMENTS.resourceType]>
		</cfif>

		<cfreturn expandpath( REQUEST.Config.FileTypesPath[ARGUMENTS.resourceType] )>
	</cfif>
</cffunction>

<cffunction name="GetUrlFromPath" returntype="String" output="false">
	<cfargument name="resourceType" required="true">
	<cfargument name="folderPath" required="true">
	<cfargument name="sCommand" required="true">

	<cfreturn CombinePaths( GetResourceTypePath( ARGUMENTS.resourceType, ARGUMENTS.sCommand ), ARGUMENTS.folderPath )>
</cffunction>

<cffunction name="RemoveExtension" output="false" returntype="String">
	<cfargument name="fileName" required="true">
	<cfset var pos = find( ".", reverse ( ARGUMENTS.fileName ) )>

	<cfreturn mid( ARGUMENTS.fileName, 1, Len( ARGUMENTS.fileName ) - pos ) >
</cffunction>

<cffunction name="GetExtension" output="false" returntype="String">
	<cfargument name="fileName" required="true">
	<cfset var pos = find( ".", reverse ( ARGUMENTS.fileName ) )>

	<cfif not pos>
		<cfreturn "">
	</cfif>

	<cfreturn mid( ARGUMENTS.fileName, pos, Len( ARGUMENTS.fileName ) - pos ) >
</cffunction>

<cffunction name="ServerMapFolder" returntype="String" output="false">
	<cfargument name="resourceType" required="true">
	<cfargument name="folderPath" required="true">
	<cfargument name="sCommand" required="true">

	<!--- Get the resource type directory. --->
	<cfset var sResourceTypePath = GetResourceTypeDirectory( ARGUMENTS.resourceType, ARGUMENTS.sCommand ) >
	<!--- Ensure that the directory exists. --->
	<cfset var sErrorMsg = CreateServerFolder( sResourceTypePath ) >

	<cfif sErrorMsg neq ''>
		<cfset SendError( 1, 'Error creating folder "' & sResourceTypePath & '" (' & sErrorMsg & ')' )>
	</cfif>

	<!--- Return the resource type directory combined with the required path. --->
	<cfreturn CombinePaths( sResourceTypePath , ARGUMENTS.folderPath )>
</cffunction>

<cffunction name="GetParentFolder" returntype="string" output="false">
	<cfargument name="folderPath" required="true">

	<cfreturn rereplace(ARGUMENTS.folderPath, "[/\\\\][^/\\\\]+[/\\\\]?$", "")>
</cffunction>

<cffunction name="CreateServerFolder" returntype="String" output="false">
	<cfargument name="folderPath">

	<!--- Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms --->
	<cfset folderPath = rereplace(ARGUMENTS.folderPath, "//+", "/", "all")>

	<cfif directoryexists(ARGUMENTS.folderPath) or fileexists(ARGUMENTS.folderPath)>
		<cfreturn "">
	<cfelse>
		<cftry>
			<cfdirectory action="create" mode="0755" directory="#ARGUMENTS.folderPath#">
		<cfcatch type="any">
			<cfreturn CFCATCH.Message>
		</cfcatch>
		</cftry>
	</cfif>

	<cfreturn "">
</cffunction>

<cffunction name="IsAllowedExt" returntype="boolean" output="false">
	<cfargument name="sExtension" required="true">
	<cfargument name="resourceType" required="true">

	<cfif isDefined( "REQUEST.Config.AllowedExtensions." & ARGUMENTS.resourceType )
			and listLen( REQUEST.Config.AllowedExtensions[ARGUMENTS.resourceType] )
			and not listFindNoCase( REQUEST.Config.AllowedExtensions[ARGUMENTS.resourceType], ARGUMENTS.sExtension )>
			<cfreturn false>
	</cfif>

	<cfif isDefined( "REQUEST.Config.DeniedExtensions." & ARGUMENTS.resourceType )
			and listLen( REQUEST.Config.DeniedExtensions[ARGUMENTS.resourceType] )
			and listFindNoCase( REQUEST.Config.DeniedExtensions[ARGUMENTS.resourceType], ARGUMENTS.sExtension )>
			<cfreturn false>
	</cfif>

	<cfreturn true>
</cffunction>

<cffunction name="IsAllowedType" returntype="boolean" output="false">
	<cfargument name="resourceType">

	<cfif not listFindNoCase( REQUEST.Config.ConfigAllowedTypes, ARGUMENTS.resourceType )>
		<cfreturn false>
	</cfif>

	<cfreturn true>
</cffunction>

<cffunction name="IsAllowedCommand" returntype="boolean" output="true">
	<cfargument name="sCommand" required="true" type="String">

	<cfif not listFindNoCase( REQUEST.Config.ConfigAllowedCommands, ARGUMENTS.sCommand )>
		<cfreturn false>
	</cfif>

	<cfreturn true>
</cffunction>

<cffunction name="GetCurrentFolder" returntype="String" output="false">
	<cfset var sCurrentFolder = "/">

	<cfif isDefined( "URL.CurrentFolder" )>
		<cfset sCurrentFolder = URL.CurrentFolder>
	</cfif>

	<!--- Check the current folder syntax (must begin and start with a slash). --->
	<cfif not refind( "/$", sCurrentFolder)>
		<cfset sCurrentFolder = sCurrentFolder & "/">
	</cfif>

	<cfif not refind( "^/", sCurrentFolder )>
		<cfset sCurrentFolder = "/" & sCurrentFolder>
	</cfif>

	<!--- Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms --->
	<cfset sCurrentFolder = rereplace( sCurrentFolder, "//+", "/", "all" )>

	<cfif find( "..", sCurrentFolder)>
		<cfset SendError( 102, "" )>
	</cfif>

	<cfreturn sCurrentFolder>
</cffunction>

<cffunction name="SanitizeFolderName" returntype="String" output="false">
	<cfargument name="sNewFolderName" required="true">

	<!--- Do a cleanup of the folder name to avoid possible problems --->
	<!--- Remove . \ / | : ? * " < > --->
	<cfset sNewFolderName = rereplace( sNewFolderName, '\.+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+', "_", "all" )>

	<cfreturn sNewFolderName>
</cffunction>

<cffunction name="BinaryFileRead" returntype="String" output="true">
	<cfargument name="fileName" required="true" type="string">
	<cfargument name="bytes" required="true" type="Numeric">

	<cfscript>
	var chunk = "";
	var fileReaderClass = "";
	var fileReader = "";
	var file = "";
	var done = false;
	var counter = 0;
	var byteArray = "";

	if( not fileExists( ARGUMENTS.fileName ) )
	{
		return "" ;
	}

	if (REQUEST.CFVersion gte 8)
	{
		 file  = FileOpen( ARGUMENTS.fileName, "readbinary" ) ;
		 byteArray = FileRead( file, 1024 ) ;
		 chunk = toString( toBinary( toBase64( byteArray ) ) ) ;
		 FileClose( file ) ;
	}
	else
	{
		fileReaderClass = createObject("java", "java.io.FileInputStream");
		fileReader = fileReaderClass.init(fileName);

		while(not done)
		{
			char = fileReader.read();
			counter = counter + 1;
			if ( char eq -1 or counter eq ARGUMENTS.bytes)
			{
				done = true;
			}
			else
			{
				chunk = chunk & chr(char) ;
			}
		}
	}
	</cfscript>

	<cfreturn chunk>
</cffunction>

<cffunction name="SendUploadResults" returntype="String" output="true">
	<cfargument name="errorNumber" required="true" type="Numeric">
	<cfargument name="fileUrl" required="false" type="String" default="">
	<cfargument name="fileName" required="false" type="String" default="">
	<cfargument name="customMsg" required="false" type="String" default="">

	<cfoutput>
		<script type="text/javascript">
			window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" );
		</script>
	</cfoutput>
	<cfabort>
</cffunction>

<cffunction name="SanitizeFileName" returntype="String" output="false">
	<cfargument name="sNewFileName" required="true">

	<cfif isDefined("REQUEST.Config.ForceSingleExtension") and REQUEST.Config.ForceSingleExtension>
		<cfset sNewFileName = rereplace( sNewFileName, '\.(?![^.]*$)', "_", "all" )>
	</cfif>

	<!--- Do a cleanup of the file name to avoid possible problems --->
	<!--- Remove \ / | : ? * " < > --->
	<cfset sNewFileName = rereplace( sNewFileName, '\\[.]+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+', "_", "all" )>

	<cfreturn sNewFileName>
</cffunction>

--- NEW FILE: cf_basexml.cfm ---
<cfsetting enablecfoutputonly="Yes">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This file include the functions that create the base XML output by the ColdFusion Connector (MX 6.0 and above).
--->

<cffunction name="SetXmlHeaders" returntype="void">
	<cfheader name="Expires" value="#GetHttpTimeString(Now())#">
	<cfheader name="Pragma" value="no-cache">
	<cfheader name="Cache-Control" value="no-cache, no-store, must-revalidate">
	<cfcontent reset="true" type="text/xml; charset=UTF-8">
</cffunction>

<cffunction name="CreateXmlHeader" returntype="void" output="true">
	<cfargument name="command" required="true">
	<cfargument name="resourceType" required="true">
	<cfargument name="currentFolder" required="true">

	<cfset SetXmlHeaders()>
	<cfoutput><?xml version="1.0" encoding="utf-8" ?></cfoutput>
	<cfoutput><Connector command="#ARGUMENTS.command#" resourceType="#ARGUMENTS.resourceType#"></cfoutput>
	<cfoutput><CurrentFolder path="#HTMLEditFormat(ARGUMENTS.currentFolder)#" url="#HTMLEditFormat( GetUrlFromPath( resourceType, currentFolder, command ) )#" /></cfoutput>
	<cfset REQUEST.HeaderSent = true>
</cffunction>

<cffunction name="CreateXmlFooter" returntype="void" output="true">
	<cfoutput></Connector></cfoutput>
</cffunction>

<cffunction name="SendError" returntype="void" output="true">
	<cfargument name="number" required="true" type="Numeric">
	<cfargument name="text" required="true">
	<cfif isDefined("REQUEST.HeaderSent") and REQUEST.HeaderSent>
		<cfset SendErrorNode( ARGUMENTS.number, ARGUMENTS.text )>
		<cfset CreateXmlFooter() >
	<cfelse>
		<cfset SetXmlHeaders()>
		<cfoutput><?xml version="1.0" encoding="utf-8" ?></cfoutput>
		<cfoutput><Connector></cfoutput>
		<cfset SendErrorNode( ARGUMENTS.number, ARGUMENTS.text )>
		<cfset CreateXmlFooter() >
	</cfif>
	<cfabort>
</cffunction>

<cffunction name="SendErrorNode" returntype="void" output="true">
	<cfargument name="number" required="true" type="Numeric">
	<cfargument name="text" required="true">
	<cfoutput><Error number="#ARGUMENTS.number#" text="#htmleditformat(ARGUMENTS.text)#" /></cfoutput>
</cffunction>
--- NEW FILE: cf_upload.cfm ---
<cfsetting enablecfoutputonly="yes" showdebugoutput="no">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * File Browser connector for ColdFusion (MX 6.0 and above).
 * (based on the original CF connector by Hendrik Kramer - hk at lwd.de)
--->

<cfparam name="url.type" default="File">
<cfparam name="url.currentFolder" default="/">

<!--- note: no serverPath url parameter - see config.cfm if you need to set the serverPath manually --->

<cfinclude template="config.cfm">
<cfinclude template="cf_util.cfm">
<cfinclude template="cf_io.cfm">
<cfinclude template="cf_commands.cfm">

<cfset REQUEST.Config = Config>
<cfif find( "/", getBaseTemplatePath() ) >
	<cfset REQUEST.Fs = "/">
<cfelse>
	<cfset REQUEST.Fs = "\">
</cfif>

<cfif not Config.Enabled>
	<cfset SendUploadResults( '1', '', '', 'This file uploader is disabled. Please check the "editor/filemanager/connectors/cfm/config.cfm" file' )>
</cfif>

<cfset sCommand = 'QuickUpload'>
<cfset sType = "File">

<cfif isDefined( "URL.Type" )>
	<cfset sType = URL.Type>
</cfif>

<cfset sCurrentFolder = GetCurrentFolder()>

<!--- Is enabled the upload? --->
<cfif not IsAllowedCommand( sCommand )>
	<cfset SendUploadResults( "1", "", "", "The """ & sCommand & """ command isn't allowed" )>
</cfif>

<!--- Check if it is an allowed type. --->
<cfif not IsAllowedType( sType )>
	<cfset SendUploadResults( "1", "", "", "Invalid type specified" ) >
</cfif>

<cfset FileUpload( sType, sCurrentFolder, sCommand )>



--- NEW FILE: cf5_upload.cfm ---
<cfsetting enablecfoutputonly="Yes">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This is the "File Uploader" for ColdFusion 5.
 * Based on connector.cfm by Mark Woods (mark at thickpaddy.com)
 *
 * Note:
 * FCKeditor requires that the connector responds with UTF-8 encoded XML.
 * As ColdFusion 5 does not fully support UTF-8 encoding, we force ASCII
 * file and folder names in this connector to allow CF5 send a UTF-8
 * encoded response - code points under 127 in UTF-8 are stored using a
 * single byte, using the same encoding as ASCII, which is damn handy.
 * This is all grand for the English speakers, like meself, but I dunno
 * how others are gonna take to it. Well, the previous version of this
 * connector already did this with file names and nobody seemed to mind,
 * so fingers-crossed nobody will mind their folder names being munged too.
 *
--->

<cfparam name="url.command" default="QuickUpload">
<cfparam name="url.type" default="File">
<cfparam name="url.currentFolder" default="/">

<cfif not isDefined("config_included")>
	<cfinclude template="config.cfm">
</cfif>

<cfscript>
	function SendUploadResults(errorNumber, fileUrl, fileName, customMsg)
	{
		WriteOutput('<script type="text/javascript">');
		WriteOutput('window.parent.OnUploadCompleted(' & errorNumber & ', "' & JSStringFormat(fileUrl) & '", "' & JSStringFormat(fileName) & '", "' & JSStringFormat(customMsg) & '");' );
		WriteOutput('</script>');
	}
</cfscript>

<cfif NOT config.enabled>
	<cfset SendUploadResults(1, "", "", "This file uploader is disabled. Please check the ""editor/filemanager/connectors/cfm/config.cfm"" file")>
	<cfabort>
</cfif>

<cfif isDefined("Config.ConfigAllowedCommands") and not ListFind(Config.ConfigAllowedCommands, url.command)>
	<cfset SendUploadResults(1, "", "", "The """ & url.command & """ command isn't allowed")>
	<cfabort>
</cfif>

<cfif isDefined("Config.ConfigAllowedTypes") and not ListFind(Config.ConfigAllowedTypes, url.type)>
	<cfset SendUploadResults(1, "", "", "The """ & url.type &  """ type isn't allowed")>
	<cfabort>
</cfif>

<cfif find( "..", url.currentFolder)>
	<cfset SendUploadResults(102)>
	<cfabort>
</cfif>

<cfscript>
	userFilesPath = config.userFilesPath;

	if ( userFilesPath eq "" ) {
		userFilesPath = "/userfiles/";
	}

	// make sure the user files path is correctly formatted
	userFilesPath = replace(userFilesPath, "\", "/", "ALL");
	userFilesPath = replace(userFilesPath, '//', '/', 'ALL');
	if ( right(userFilesPath,1) NEQ "/" ) {
		userFilesPath = userFilesPath & "/";
	}
	if ( left(userFilesPath,1) NEQ "/" ) {
		userFilesPath = "/" & userFilesPath;
	}

	// make sure the current folder is correctly formatted
	url.currentFolder = replace(url.currentFolder, "\", "/", "ALL");
	url.currentFolder = replace(url.currentFolder, '//', '/', 'ALL');
	if ( right(url.currentFolder,1) neq "/" ) {
		url.currentFolder = url.currentFolder & "/";
	}
	if ( left(url.currentFolder,1) neq "/" ) {
		url.currentFolder = "/" & url.currentFolder;
	}

	if (find("/",getBaseTemplatePath())) {
		fs = "/";
	} else {
		fs = "\";
	}

	// Get the base physical path to the web root for this application. The code to determine the path automatically assumes that
	// the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a
	// virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary.
	if ( len(config.serverPath) ) {
		serverPath = config.serverPath;

		if ( right(serverPath,1) neq fs ) {
			serverPath = serverPath & fs;
		}
	} else {
		serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"") & replace(userFilesPath,"/",fs,"all");
	}

	rootPath = left( serverPath, Len(serverPath) - Len(userFilesPath) ) ;
</cfscript>
<cfif url.command eq "QuickUpload">
	<cfset resourceTypeUrl = rereplace( replace( Config.QuickUploadPath[url.type], fs, "/", "all"), "/$", "") >
	<cfif isDefined( "Config.QuickUploadAbsolutePath" )
			and structkeyexists( Config.QuickUploadAbsolutePath, url.type )
			and Len( Config.QuickUploadAbsolutePath[url.type] )>
				<cfset userFilesServerPath = Config.QuickUploadAbsolutePath[url.type] & url.currentFolder>
	<cfelse>
		<cftry>
		<cfset userFilesServerPath = expandpath( resourceTypeUrl ) & url.currentFolder>
		<!--- Catch: Parameter 1 of function ExpandPath must be a relative path --->
		<cfcatch type="any">
			<cfset userFilesServerPath = rootPath & Config.QuickUploadPath[url.type] & url.currentFolder>
		</cfcatch>
		</cftry>
	</cfif>
<cfelse>
	<cfset resourceTypeUrl = rereplace( replace( Config.FileTypesPath[url.type], fs, "/", "all"), "/$", "") >
	<cfif isDefined( "Config.FileTypesAbsolutePath" )
			and structkeyexists( Config.FileTypesAbsolutePath, url.type )
			and Len( Config.FileTypesAbsolutePath[url.type] )>
				<cfset userFilesServerPath = Config.FileTypesAbsolutePath[url.type] & url.currentFolder>
	<cfelse>
		<cftry>
		<cfset userFilesServerPath = expandpath( resourceTypeUrl ) & url.currentFolder>
		<!--- Catch: Parameter 1 of function ExpandPath must be a relative path --->
		<cfcatch type="any">
			<cfset userFilesServerPath = rootPath & Config.FileTypesPath[url.type] & url.currentFolder>
		</cfcatch>
		</cftry>
	</cfif>
</cfif>

<cfset userFilesServerPath = replace( userFilesServerPath, "/", fs, "all" ) >
<!--- get rid of double directory separators --->
<cfset userFilesServerPath = replace( userFilesServerPath, fs & fs, fs, "all") >

<!--- create resource type directory if not exists --->
<cfset resourceTypeDirectory = left( userFilesServerPath, Len(userFilesServerPath) - Len(url.currentFolder) )>

<cfif not directoryexists( resourceTypeDirectory )>

	<cfset currentPath = "">
	<cftry>
		<cfloop list="#resourceTypeDirectory#" index="name" delimiters="#fs#">
			<cfif currentPath eq "" and fs eq "\">
				<!--- Without checking this, we would have in Windows \C:\ --->
				<cfif not directoryExists(name)>
					<cfdirectory action="create" directory="#name#" mode="755">
				</cfif>
			<cfelse>
				<cfif not directoryExists(currentPath & fs & name)>
					<cfdirectory action="create" directory="#currentPath##fs##name#" mode="755">
				</cfif>
			</cfif>

			<cfif fs eq "\" and currentPath eq "">
				<cfset currentPath = name>
			<cfelse>
				<cfset currentPath = currentPath & fs & name>
			</cfif>
		</cfloop>

	<cfcatch type="any">

		<!--- this should only occur as a result of a permissions problem --->
		<cfset SendUploadResults(103)>
		<cfabort>

	</cfcatch>

	</cftry>
</cfif>

<cfset currentFolderPath = userFilesServerPath>
<cfset resourceType = url.type>

<cfset fileName = "">
<cfset fileExt = "">

<!--- Can be overwritten. The last value will be sent with the result --->
<cfset customMsg = "">

<cftry>
	<!--- first upload the file with an unique filename --->
	<cffile action="upload"
		fileField="NewFile"
		destination="#currentFolderPath#"
		nameConflict="makeunique"
		mode="644"
		attributes="normal">

	<cfif cffile.fileSize EQ 0>
		<cfthrow>
	</cfif>

	<cfset lAllowedExtensions = config.allowedExtensions[#resourceType#]>
	<cfset lDeniedExtensions = config.deniedExtensions[#resourceType#]>

	<cfif ( len(lAllowedExtensions) and not listFindNoCase(lAllowedExtensions,cffile.ServerFileExt) )
		or ( len(lDeniedExtensions) and listFindNoCase(lDeniedExtensions,cffile.ServerFileExt) )>

		<cfset errorNumber = "202">
		<cffile action="delete" file="#cffile.ServerDirectory##fs##cffile.ServerFile#">

	<cfelse>

		<cfscript>
		errorNumber = 0;
		fileName = cffile.ClientFileName ;
		fileExt = cffile.ServerFileExt ;
		fileExisted = false ;

		// munge filename for html download. Only a-z, 0-9, _, - and . are allowed
		if( reFind("[^A-Za-z0-9_\-\.]", fileName) ) {
			fileName = reReplace(fileName, "[^A-Za-z0-9\-\.]", "_", "ALL");
			fileName = reReplace(fileName, "_{2,}", "_", "ALL");
			fileName = reReplace(fileName, "([^_]+)_+$", "\1", "ALL");
			fileName = reReplace(fileName, "$_([^_]+)$", "\1", "ALL");
		}

		// remove additional dots from file name
		if( isDefined("Config.ForceSingleExtension") and Config.ForceSingleExtension )
			fileName = replace( fileName, '.', "_", "all" ) ;

		// When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename.
		if( compare( cffile.ServerFileName, fileName ) ) {
			counter = 0;
			tmpFileName = fileName;
			while( fileExists("#currentFolderPath##fileName#.#fileExt#") ) {
				fileExisted = true ;
				counter = counter + 1 ;
				fileName = tmpFileName & '(#counter#)' ;
			}
		}
		</cfscript>

		<!--- Rename the uploaded file, if neccessary --->
		<cfif compare(cffile.ServerFileName,fileName)>

			<cfif fileExisted>
				<cfset errorNumber = "201">
			</cfif>
			<cffile
				action="rename"
				source="#currentFolderPath##cffile.ServerFileName#.#cffile.ServerFileExt#"
				destination="#currentFolderPath##fileName#.#fileExt#"
				mode="644"
				attributes="normal">

		</cfif>

	</cfif>

	<cfcatch type="any">

		<cfset errorNumber = "1">
		<cfset customMsg = cfcatch.message >

	</cfcatch>
</cftry>

<cfif errorNumber EQ 0>
	<!--- file was uploaded succesfully --->
	<cfset SendUploadResults(errorNumber, '#resourceTypeUrl##url.currentFolder##fileName#.#fileExt#', "", "")>
	<cfabort>
<cfelseif errorNumber EQ 201>
	<!--- file was changed (201), submit the new filename --->
	<cfset SendUploadResults(errorNumber, '#resourceTypeUrl##url.currentFolder##fileName#.#fileExt#', replace( fileName & "." & fileExt, "'", "\'", "ALL"), customMsg)>
	<cfabort>
<cfelse>
	<!--- An error occured(202). Submit only the error code and a message (if available). --->
	<cfset SendUploadResults(errorNumber, '', '', customMsg)>
	<cfabort>
</cfif>
--- NEW FILE: cf_util.cfm ---
<cfsetting enablecfoutputonly="Yes">
<!---
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This file include generic functions used by the ColdFusion Connector (MX 6.0 and above).
--->

<cffunction name="RemoveFromStart" output="false" returntype="String">
	<cfargument name="sourceString" type="String">
	<cfargument name="charToRemove" type="String">

	<cfif left(ARGUMENTS.sourceString, 1) eq ARGUMENTS.charToRemove>
		<cfreturn mid( ARGUMENTS.sourceString, 2, len(ARGUMENTS.sourceString) -1 )>
	</cfif>

	<cfreturn ARGUMENTS.sourceString>
</cffunction>

<cffunction name="RemoveFromEnd" output="false" returntype="String">
	<cfargument name="sourceString" type="String">
	<cfargument name="charToRemove" type="String">

	<cfif right(ARGUMENTS.sourceString, 1) eq ARGUMENTS.charToRemove>
		<cfreturn mid( ARGUMENTS.sourceString, 1, len(ARGUMENTS.sourceString) -1 )>
	</cfif>

	<cfreturn ARGUMENTS.sourceString>
</cffunction>

<!---
Check file content.
Currently this function validates only image files.
Returns false if file is invalid.
detectionLevel:
	0 = none
	1 = check image size for images,
	2 = use DetectHtml for images
---->
<cffunction name="IsImageValid" returntype="boolean" output="true">
	<cfargument name="filePath" required="true" type="String">
	<cfargument name="extension" required="true" type="String">

	<cfset var imageCFC = "">
	<cfset var imageInfo = "">

	<cfif not ListFindNoCase("gif,jpeg,jpg,png,swf,psd,bmp,iff,tiff,tif,swc,jpc,jp2,jpx,jb2,xmb,wbmp", ARGUMENTS.extension)>
		<cfreturn true>
	</cfif>

	<cftry>
		<cfif REQUEST.CFVersion gte 8>
			<cfset objImage = ImageRead(ARGUMENTS.filePath) >
			<cfset imageInfo = ImageInfo(objImage)>
			<!--- <cfimage action="info" source="#ARGUMENTS.filePath#" structName="imageInfo" /> --->
		<cfelse>
			<cfset imageCFC = createObject("component", "image")>
			<cfset imageInfo = imageCFC.getImageInfo("", ARGUMENTS.filePath)>
		</cfif>

		<cfif imageInfo.height lte 0 or imageInfo.width lte 0>
			<cfreturn false>
		</cfif>
	<cfcatch type="any">
		<cfreturn false>
	</cfcatch>
	</cftry>

	<cfreturn true>
</cffunction>

<!---
 Detect HTML in the first KB to prevent against potential security issue with
 IE/Safari/Opera file type auto detection bug.
 Returns true if file contain insecure HTML code at the beginning.
--->
<cffunction name="DetectHtml" output="false" returntype="boolean">
	<cfargument name="filePath" required="true" type="String">

	<cfset var tags = "<body,<head,<html,<img,<pre,<script,<table,<title">
	<cfset var chunk = lcase( Trim( BinaryFileRead( ARGUMENTS.filePath, 1024 ) ) )>

	<cfif not Len(chunk)>
		<cfreturn false>
	</cfif>

	<cfif refind('<!doctype\W*x?html', chunk)>
		<cfreturn true>
	</cfif>

	<cfloop index = "tag" list = "#tags#">
     	<cfif find( tag, chunk )>
			<cfreturn true>
		</cfif>
	</cfloop>

	<!--- type = javascript --->
	<cfif refind('type\s*=\s*[''"]?\s*(?:\w*/)?(?:ecma|java)', chunk)>
		<cfreturn true>
	</cfif> >

	<!--- href = javascript --->
	<!--- src = javascript --->
	<!--- data = javascript --->
	<cfif refind('(?:href|src|data)\s*=\s*[\''"]?\s*(?:ecma|java)script:', chunk)>
		<cfreturn true>
	</cfif>

	<!--- url(javascript --->
	<cfif refind('url\s*\(\s*[\''"]?\s*(?:ecma|java)script:', chunk)>
		<cfreturn true>
	</cfif>

	<cfreturn false>
</cffunction>




From blaine at qs1489.pair.com  Sat Feb  9 07:54:03 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:03 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/skins
	_fckviewstrips.html, 1.2, 1.3
Message-ID: <20080209125403.2C2CE10FE83@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/skins

Added Files:
	_fckviewstrips.html 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: _fckviewstrips.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Useful page that enumerates all icons in the skins strips.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>FCKeditor - View Icons Strips</title>
	<style type="text/css">
		.TB_Button_Image
		{
			overflow: hidden;
			width: 16px;
			height: 16px;
			margin: 3px;
			background-repeat: no-repeat;
		}

		.TB_Button_Image img
		{
			position: relative;
		}
	</style>
	<script type="text/javascript">

window.onload = function()
{
	var eImg1 = document.createElement( 'img' ) ;
	eImg1.onload = Img_OnLoad ;
	eImg1.src = 'default/fck_strip.gif' ;

	var eImg2 = document.createElement( 'img' ) ;
	eImg2.onload = Img_OnLoad ;
	eImg2.src = 'office2003/fck_strip.gif' ;

	var eImg3 = document.createElement( 'img' ) ;
	eImg3.onload = Img_OnLoad ;
	eImg3.src = 'silver/fck_strip.gif' ;
}

var iTotalStrips = 3 ;
var iMaxHeight = 0 ;

function Img_OnLoad()
{
	if ( iMaxHeight < this.height )
		iMaxHeight = this.height ;

	iTotalStrips-- ;

	if ( iTotalStrips == 0 )
		LoadIcons( iMaxHeight / 16 ) ;
}

function LoadIcons( total )
{
	var xIconsTable = document.getElementById( 'xIconsTable' ) ;

	for ( var i = 0 ; i < total ; i++ )
	{
		var eRow = xIconsTable.insertRow(-1) ;

		var eCell = eRow.insertCell(-1) ;
		eCell.innerHTML = i + 1 ;

		eCell = eRow.insertCell(-1) ;
		eCell.align = 'center' ;
		eCell.style.border = '#dcdcdc 1px solid' ;
		eCell.innerHTML = '<div class="TB_Button_Image"><img src="default/fck_strip.gif" style="top:-' + ( i * 16 ) + 'px;"><\/div>' ;

		eCell = eRow.insertCell(-1) ;
		eCell.align = 'center' ;
		eCell.style.border = '#dcdcdc 1px solid' ;
		eCell.innerHTML = '<div class="TB_Button_Image"><img src="office2003/fck_strip.gif" style="top:-' + ( i * 16 ) + 'px;"><\/div>' ;

		eCell = eRow.insertCell(-1) ;
		eCell.align = 'center' ;
		eCell.style.border = '#dcdcdc 1px solid' ;
		eCell.innerHTML = '<div class="TB_Button_Image"><img src="silver/fck_strip.gif" style="top:-' + ( i * 16 ) + 'px;"><\/div>' ;
	}
}

	</script>
</head>
<body>
	<table id="xIconsTable">
		<tr>
			<td rowspan="2">
				Index</td>
			<td align="center" colspan="3">
				Skins</td>
		</tr>
		<tr>
			<td width="80" align="center">
				default</td>
			<td width="80" align="center">
				office2003</td>
			<td width="80" align="center">
				silver</td>
		</tr>
	</table>
</body>
</html>



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/js
	fckeditorcode_gecko.js, 1.3, 1.4 fckeditorcode_ie.js, 1.3, 1.4
Message-ID: <20080209125402.8EB9C10FE79@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/js
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/js

Added Files:
	fckeditorcode_gecko.js fckeditorcode_ie.js 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fckeditorcode_gecko.js ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fckeditorcode_ie.js ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:04 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:04 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/silver/images
	toolbar.arrowright.gif, 1.2, 1.3 toolbar.buttonarrow.gif, 1.2,
	1.3 toolbar.buttonbg.gif, 1.3, 1.4 toolbar.collapse.gif, 1.2,
	1.3 toolbar.end.gif, 1.2, 1.3 toolbar.expand.gif, 1.2,
	1.3 toolbar.separator.gif, 1.2, 1.3 toolbar.start.gif, 1.3, 1.4
Message-ID: <20080209125404.80FD210FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/silver/images
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/skins/silver/images

Added Files:
	toolbar.arrowright.gif toolbar.buttonarrow.gif 
	toolbar.buttonbg.gif toolbar.collapse.gif toolbar.end.gif 
	toolbar.expand.gif toolbar.separator.gif toolbar.start.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: toolbar.expand.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.end.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.separator.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.collapse.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.start.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.buttonbg.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.arrowright.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.buttonarrow.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:03 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:03 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/office2003
	fck_dialog.css, 1.3, 1.4 fck_editor.css, 1.5,
	1.6 fck_strip.gif, 1.2, 1.3
Message-ID: <20080209125404.7F17410FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/office2003
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/skins/office2003

Added Files:
	fck_dialog.css fck_editor.css fck_strip.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_dialog.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Styles used by the dialog boxes.
 */

body
{
	margin: 0px;
	padding: 10px;
	background-color: #f7f8fd;
}

body, td, input, select, textarea
{
	font-size: 11px;
	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
}

body, .BackColor
{
	background-color: #f7f8fd;
}

.PopupBody
{
	margin: 0px;
	padding: 0px;
}

.PopupTitle
{
	font-weight: bold;
	font-size: 14pt;
	color: #0e3460;
	background-color: #8cb2fd;
	padding: 3px 10px 3px 10px;
}

.PopupButtons
{
	border-top: #466ca6 1px solid;
	background-color: #8cb2fd;
	padding: 7px 10px 7px 10px;
}

.Button
{
	border: #1c3460 1px solid;
	color: #000a28;
	background-color: #7096d3;
}

#btnOk
{
	width: 100px;
}

.DarkBackground
{
	background-color: #d7d79f;
}

.LightBackground
{
	background-color: #ffffbe;
}

.PopupTitleBorder
{
	border-bottom: #d5d59d 1px solid;
}

.PopupTabArea
{
	color: #0e3460;
	background-color: #8cb2fd;
}

.PopupTabEmptyArea
{
	padding-left: 10px ;
	border-bottom: #466ca6 1px solid;
}

.PopupTab, .PopupTabSelected
{
	border-right: #466ca6 1px solid;
	border-top: #466ca6 1px solid;
	border-left: #466ca6 1px solid;
	padding: 3px 5px 3px 5px;
	color: #0e3460;
}

.PopupTab
{
	margin-top: 1px;
	border-bottom: #466ca6 1px solid;
	cursor: pointer;
	cursor: hand;
}

.PopupTabSelected
{
	font-weight:bold;
	cursor: default;
	padding-top: 4px;
	border-bottom: #f7f8fd 1px solid;
	background-color: #f7f8fd;
}

.PopupSelectionBox
{
	border: #1e90ff 1px solid !important;
	background-color: #add8e6 !important;
	cursor: pointer;
	cursor: hand;
}

#tdBrowse 
{
	vertical-align: bottom;
}
--- NEW FILE: fck_editor.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Styles used by the editor IFRAME and Toolbar.
 */

/*
	### Basic Editor IFRAME Styles.
*/

body
{
	padding: 1px;
	margin: 0;
	background-color: #ffffff;
}

#xEditingArea
{
    border: #696969 1px solid;
}

.SourceField
{
    padding: 5px;
    margin: 0px;
    font-family: Monospace;
}

/*
	Toolbar
*/

.TB_ToolbarSet, .TB_Expand, .TB_Collapse
{
    cursor: default;
    background-color: #f7f8fd;
}

.TB_ToolbarSet
{
    border-top: #f7f8fd 1px outset;
    border-bottom: #f7f8fd 1px outset;
}

.TB_ToolbarSet TD
{
    font-size: 11px;
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.TB_Toolbar
{
   	background-color: #d6dff7;
	background-image: url(images/toolbar.bg.gif);
	background-repeat: repeat-x;
    display: inline-table;
}

.TB_Separator
{
    width: 1px;
    height: 16px;
    margin: 2px;
    background-color: #B2CBFF;
}

.TB_Start
{
    background-image: url(images/toolbar.start.gif);
    background-repeat: no-repeat;
    background-position: center center;
    margin: 0px;
    width: 7px;
    height: 24px;
}

.TB_End
{
    background-image: url(images/toolbar.end.gif);
    background-repeat: no-repeat;
    background-position: center left;
    height: 24px;
    width: 4px;
}

.TB_ExpandImg
{
    background-image: url(images/toolbar.expand.gif);
    background-repeat: no-repeat;
}

.TB_CollapseImg
{
    background-image: url(images/toolbar.collapse.gif);
    background-repeat: no-repeat;
}

.TB_SideBorder
{
    background-color: #696969;
}

.TB_Expand, .TB_Collapse
{
    padding: 2px 2px 2px 2px;
    border: #f7f8fd 1px outset;
}

.TB_Collapse
{
    width: 5px;
}

.TB_Break
{
    height: 24px; /* IE needs the height to be set, otherwise no break */
}

/*
	Toolbar Button
*/

.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
{
    margin: 1px;
    height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
}

.TB_Button_On
{
    margin: 0px;
    border: #316ac5 1px solid;
    background-color: #c1d2ee;
}

.TB_Button_On_Over, .TB_Button_Off_Over
{
    margin: 0px ;
    border: #316ac5 1px solid;
    background-color: #dff1ff;
}

.TB_Button_Off
{
    filter: alpha(opacity=70); /* IE */
    opacity: 0.70; /* Safari, Opera and Mozilla */
}

.TB_Button_Disabled
{
    filter: gray() alpha(opacity=30); /* IE */
    opacity: 0.30; /* Safari, Opera and Mozilla */
}

.TB_Button_Padding
{
    visibility: hidden;
    width: 3px;
    height: 22px;
}

.TB_Button_Image
{
    overflow: hidden;
    width: 16px;
    height: 16px;
    margin: 3px;
    background-repeat: no-repeat;
}

.TB_Button_Image img
{
    position: relative;
}

.TB_Button_Off .TB_Button_Text
{
   	background-color: #d6dff7;  /* Needed because of a bug on ClearType */
	background-image: url(images/toolbar.bg.gif);
	background-repeat: repeat-x;
}

.TB_ConnectionLine
{
    background-color: #f7f8fd;
    height: 1px;
    margin-left: 1px;   /* ltr */
    margin-right: 1px;  /* rtl */
}

.TB_Button_Off .TB_Text
{
   	background-color: #d6dff7;  /* Needed because of a bug on ClearType */
	background-image: url(images/toolbar.bg.gif);
	background-repeat: repeat-x;
}

.TB_Button_On_Over .TB_Text
{
   	background-color: #dff1ff ;  /* Needed because of a bug on ClearType */
}

/*
	Menu
*/

.MN_Menu
{
    border: 1px solid #8f8f73;
    padding: 2px;
    background-color: #f7f8fd;
    cursor: default;
}

.MN_Menu, .MN_Menu .MN_Label
{
    font-size: 11px;
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.MN_Item_Padding
{
    visibility: hidden;
    width: 3px;
    height: 20px;
}

.MN_Icon
{
    background-color: #d6dff7;
    text-align: center;
    height: 20px;
}

.MN_Label
{
    padding-left: 3px;
    padding-right: 3px;
}

.MN_Separator
{
    height: 3px;
}

.MN_Separator_Line
{
    border-top: #b9b99d 1px solid;
}

.MN_Item .MN_Icon IMG
{
    filter: alpha(opacity=70);
    opacity: 0.70;
}

.MN_Item_Over
{
    color: #ffffff;
    background-color: #7096FA;
}

.MN_Item_Over .MN_Icon
{
    background-color: #466ca6;
}

.MN_Item_Disabled IMG
{
    filter: gray() alpha(opacity=30); /* IE */
    opacity: 0.30; /* Safari, Opera and Mozilla */
}

.MN_Item_Disabled .MN_Label
{
    color: #b7b7b7;
}

.MN_Arrow
{
    padding-right: 3px;
    padding-left: 3px;
}

.MN_ConnectionLine
{
    background-color: #f7f8fd;
}

.Menu .TB_Button_On, .Menu .TB_Button_On_Over
{
    border: #8f8f73 1px solid;
    background-color: #f7f8fd;
}

/*
	### Panel Styles
*/

.FCK_Panel
{
    border: #8f8f73 1px solid;
    padding: 2px;
    background-color: #f7f8fd;
}

.FCK_Panel, .FCK_Panel TD
{
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
    font-size: 11px;
}

/*
	### Special Combos
*/

.SC_Panel
{
    overflow: auto;
    white-space: nowrap;
    cursor: default;
    border: 1px solid #8f8f73;
    padding-left: 2px;
    padding-right: 2px;
}

.SC_Panel, .SC_Panel TD
{
    font-size: 11px;
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.SC_Item, .SC_ItemSelected
{
    margin-top: 2px;
    margin-bottom: 2px;
    background-position: left center;
    padding-left: 11px;
    padding-right: 3px;
    padding-top: 2px;
    padding-bottom: 2px;
    text-overflow: ellipsis;
    overflow: hidden;
    background-repeat: no-repeat;
    border: #dddddd 1px solid;
}

.SC_Item *, .SC_ItemSelected *
{
    margin-top: 0px;
    margin-bottom: 0px;
}

.SC_ItemSelected
{
    border: #9a9afb 1px solid;
    background-image: url(images/toolbar.arrowright.gif);
}

.SC_ItemOver
{
    border: #316ac5 1px solid;
}

.SC_Field
{
    margin-top: 2px ;
    border: #b7b7a6 1px solid;
    cursor: default;
}

.SC_FieldCaption
{
    overflow: visible;
    padding-right: 5px;
    padding-left: 5px;
    opacity: 0.75; /* Safari, Opera and Mozilla */
    filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
    height: 23px;
   	background-color: #d6dff7;  /* Needed because of a bug on ClearType */
	background-image: url(images/toolbar.bg.gif);
	background-repeat: repeat-x;
/*    background-color:  inherit;     Maybe this is needed wait to check */
}

.SC_FieldLabel
{
    white-space: nowrap;
    padding: 2px;
    width: 100%;
    cursor: default;
    background-color: #ffffff;
    text-overflow: ellipsis;
    overflow: hidden;
}

.SC_FieldButton
{
    background-position: center center;
    background-image: url(images/toolbar.buttonarrow.gif);
    border-left: #b7b7a6 1px solid;
    width: 14px;
    background-repeat: no-repeat;
}

.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption
{
    opacity: 0.30; /* Safari, Opera and Mozilla */
    filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
}

.SC_FieldOver
{
    border: #316ac5 1px solid;
}

.SC_FieldOver .SC_FieldButton
{
    border-left: #316ac5 1px solid;
}

/*
	### Color Selector Panel
*/

.ColorBoxBorder
{
    border: #808080 1px solid;
    position: static;
}

.ColorBox
{
    font-size: 1px;
    width: 10px;
    position: static;
    height: 10px;
}

.ColorDeselected, .ColorSelected
{
    cursor: default;
}

.ColorDeselected
{
    border: #ffffff 1px solid;
    padding: 2px;
    float: left;
}

.ColorSelected
{
    border: #330066 1px solid;
    padding: 2px;
    float: left;
    background-color: #c4cdd6;
}

--- NEW FILE: fck_strip.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images/icons/32
	ai.gif, 1.2, 1.3 avi.gif, 1.2, 1.3 bmp.gif, 1.2, 1.3 cs.gif,
	1.2, 1.3 default.icon.gif, 1.2, 1.3 dll.gif, 1.2, 1.3 doc.gif,
	1.2, 1.3 exe.gif, 1.2, 1.3 fla.gif, 1.2, 1.3 gif.gif, 1.2,
	1.3 htm.gif, 1.2, 1.3 html.gif, 1.2, 1.3 jpg.gif, 1.2,
	1.3 js.gif, 1.2, 1.3 mdb.gif, 1.2, 1.3 mp3.gif, 1.2,
	1.3 pdf.gif, 1.2, 1.3 png.gif, NONE, 1.1 ppt.gif, 1.2,
	1.3 rdp.gif, 1.2, 1.3 swf.gif, 1.2, 1.3 swt.gif, 1.2,
	1.3 txt.gif, 1.2, 1.3 vsd.gif, 1.2, 1.3 xls.gif, 1.2,
	1.3 xml.gif, 1.2, 1.3 zip.gif, 1.2, 1.3
Message-ID: <20080209125402.3FB9C10FE2C@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/images/icons/32
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/browser/default/images/icons/32

Added Files:
	ai.gif avi.gif bmp.gif cs.gif default.icon.gif dll.gif doc.gif 
	exe.gif fla.gif gif.gif htm.gif html.gif jpg.gif js.gif 
	mdb.gif mp3.gif pdf.gif png.gif ppt.gif rdp.gif swf.gif 
	swt.gif txt.gif vsd.gif xls.gif xml.gif zip.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: default.icon.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mdb.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: png.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: bmp.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: exe.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cs.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ai.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: html.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mp3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: htm.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dll.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: gif.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: zip.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fla.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: js.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: xls.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: swf.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: swt.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: xml.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: avi.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: txt.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: doc.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ppt.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: vsd.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: rdp.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: pdf.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jpg.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:03 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:03 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/skins/default
	fck_dialog.css, 1.3, 1.4 fck_editor.css, 1.5,
	1.6 fck_strip.gif, 1.2, 1.3
Message-ID: <20080209125403.4C55C10FE84@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/default
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/skins/default

Added Files:
	fck_dialog.css fck_editor.css fck_strip.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_dialog.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Styles used by the dialog boxes.
 */

body
{
	margin: 0px;
	padding: 10px;
}

body, td, input, select, textarea
{
	font-size: 11px;
	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
}

body, .BackColor
{
	background-color: #f1f1e3;
}

.PopupBody
{
	margin: 0px;
	padding: 0px;
}

.PopupTitle
{
	font-weight: bold;
	font-size: 14pt;
	color: #737357;
	background-color: #e3e3c7;
	padding: 3px 10px 3px 10px;
}

.PopupButtons
{
	border-top: #d5d59d 1px solid;
	background-color: #e3e3c7;
	padding: 7px 10px 7px 10px;
}

.Button
{
	border: #737357 1px solid;
	color: #3b3b1f;
	background-color: #c7c78f;
}

#btnOk
{
	width: 100px;
}

.DarkBackground
{
	background-color: #d7d79f;
}

.LightBackground
{
	background-color: #ffffbe;
}

.PopupTitleBorder
{
	border-bottom: #d5d59d 1px solid;
}

.PopupTabArea
{
	color: #737357;
	background-color: #e3e3c7;
}

.PopupTabEmptyArea
{
	padding-left: 10px ;
	border-bottom: #d5d59d 1px solid;
}

.PopupTab, .PopupTabSelected
{
	border-right: #d5d59d 1px solid;
	border-top: #d5d59d 1px solid;
	border-left: #d5d59d 1px solid;
	padding: 3px 5px 3px 5px;
	color: #737357;
}

.PopupTab
{
	margin-top: 1px;
	border-bottom: #d5d59d 1px solid;
	cursor: pointer;
	cursor: hand;
}

.PopupTabSelected
{
	font-weight:bold;
	cursor: default;
	padding-top: 4px;
	border-bottom: #f1f1e3 1px solid;
	background-color: #f1f1e3;
}

.PopupSelectionBox
{
	border: #ff9933 1px solid !important;
	background-color: #fffacd !important;
	cursor: pointer;
	cursor: hand;
}

#tdBrowse 
{
	vertical-align: bottom;
}
--- NEW FILE: fck_editor.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Styles used by the editor IFRAME and Toolbar.
 */

/*
	### Basic Editor IFRAME Styles.
*/

body
{
	padding: 1px;
	margin: 0;
	background-color: #ffffff;
}

#xEditingArea
{
    border: #696969 1px solid;
}

.SourceField
{
    padding: 5px;
    margin: 0px;
    font-family: Monospace;
}

/*
	Toolbar
*/

.TB_ToolbarSet, .TB_Expand, .TB_Collapse
{
    cursor: default;
    background-color: #efefde;
}

.TB_ToolbarSet
{
    border-top: #efefde 1px outset;
    border-bottom: #efefde 1px outset;
}

.TB_ToolbarSet TD
{
    font-size: 11px;
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.TB_Toolbar
{
	height: 24px;
    display: inline-table;	/* inline = Opera jumping buttons bug */
}

.TB_Separator
{
    width: 1px;
    height: 16px;
    margin: 2px;
    background-color: #999966;
}

.TB_Start
{
    background-image: url(images/toolbar.start.gif);
    margin: 2px;
    width: 3px;
    background-repeat: no-repeat;
    height: 16px;
}

.TB_End
{
    display: none;
}

.TB_ExpandImg
{
    background-image: url(images/toolbar.expand.gif);
    background-repeat: no-repeat;
}

.TB_CollapseImg
{
    background-image: url(images/toolbar.collapse.gif);
    background-repeat: no-repeat;
}

.TB_SideBorder
{
    background-color: #696969;
}

.TB_Expand, .TB_Collapse
{
    padding: 2px 2px 2px 2px;
    border: #efefde 1px outset;
}

.TB_Collapse
{
    width: 5px;
}

.TB_Break
{
    height: 24px; /* IE needs the height to be set, otherwise no break */
}

/*
	Toolbar Button
*/

.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
{
    border: #efefde 1px solid; /* This is the default border */
    height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
}

.TB_Button_On
{
    border: #316ac5 1px solid;
    background-color: #c1d2ee;
}

.TB_Button_On_Over, .TB_Button_Off_Over
{
    border: #316ac5 1px solid;
    background-color: #dff1ff;
}

.TB_Button_Off
{
    filter: alpha(opacity=70); /* IE */
    opacity: 0.70; /* Safari, Opera and Mozilla */
}

.TB_Button_Disabled
{
    filter: gray() alpha(opacity=30); /* IE */
    opacity: 0.30; /* Safari, Opera and Mozilla */
}

.TB_Button_Padding
{
    visibility: hidden;
    width: 3px;
    height: 22px;
}

.TB_Button_Image
{
    overflow: hidden;
    width: 16px;
    height: 16px;
    margin: 3px;
    background-repeat: no-repeat;
}

.TB_Button_Image img
{
    position: relative;
}

.TB_Button_Off .TB_Button_Text
{
   	background-color: #efefde;  /* Needed because of a bug on Clear Type */
}

.TB_ConnectionLine
{
    background-color: #ffffff;
    height: 1px;
    margin-left: 1px;   /* ltr */
    margin-right: 1px;  /* rtl */
}

.TB_Text
{
	height: 22px;
}

.TB_Button_Off .TB_Text
{
   	background-color: #efefde ;  /* Needed because of a bug on ClearType */
}

.TB_Button_On_Over .TB_Text
{
   	background-color: #dff1ff ;  /* Needed because of a bug on ClearType */
}

/*
	Menu
*/

.MN_Menu
{
    border: 1px solid #8f8f73;
    padding: 2px;
    background-color: #ffffff;
    cursor: default;
}

.MN_Menu, .MN_Menu .MN_Label
{
    font-size: 11px;
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.MN_Item_Padding
{
    visibility: hidden;
    width: 3px;
    height: 20px;
}

.MN_Icon
{
    background-color: #e3e3c7;
    text-align: center;
    height: 20px;
}

.MN_Label
{
    padding-left: 3px;
    padding-right: 3px;
}

.MN_Separator
{
    height: 3px;
}

.MN_Separator_Line
{
    border-top: #b9b99d 1px solid;
}

.MN_Item .MN_Icon IMG
{
    filter: alpha(opacity=70);
    opacity: 0.70;
}

.MN_Item_Over
{
    color: #ffffff;
    background-color: #8f8f73;
}

.MN_Item_Over .MN_Icon
{
    background-color: #737357;
}

.MN_Item_Disabled IMG
{
    filter: gray() alpha(opacity=30); /* IE */
    opacity: 0.30; /* Safari, Opera and Mozilla */
}

.MN_Item_Disabled .MN_Label
{
    color: #b7b7b7;
}

.MN_Arrow
{
    padding-right: 3px;
    padding-left: 3px;
}

.MN_ConnectionLine
{
    background-color: #ffffff;
}

.Menu .TB_Button_On, .Menu .TB_Button_On_Over
{
    border: #8f8f73 1px solid;
    background-color: #ffffff;
}

/*
	### Panel Styles
*/

.FCK_Panel
{
    border: #8f8f73 1px solid;
    padding: 2px;
    background-color: #ffffff;
}

.FCK_Panel, .FCK_Panel TD
{
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
    font-size: 11px;
}

/*
	### Special Combos
*/

.SC_Panel
{
    overflow: auto;
    white-space: nowrap;
    cursor: default;
    border: 1px solid #8f8f73;
    padding-left: 2px;
    padding-right: 2px;
}

.SC_Panel, .SC_Panel TD
{
    font-size: 11px;
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.SC_Item, .SC_ItemSelected
{
    margin-top: 2px;
    margin-bottom: 2px;
    background-position: left center;
    padding-left: 11px;
    padding-right: 3px;
    padding-top: 2px;
    padding-bottom: 2px;
    text-overflow: ellipsis;
    overflow: hidden;
    background-repeat: no-repeat;
    border: #dddddd 1px solid;
}

.SC_Item *, .SC_ItemSelected *
{
    margin-top: 0px;
    margin-bottom: 0px;
}

.SC_ItemSelected
{
    border: #9a9afb 1px solid;
    background-image: url(images/toolbar.arrowright.gif);
}

.SC_ItemOver
{
    border: #316ac5 1px solid;
}

.SC_Field
{
    border: #b7b7a6 1px solid;
    cursor: default;
}

.SC_FieldCaption
{
    overflow: visible;
    padding-right: 5px;
    padding-left: 5px;
    opacity: 0.75; /* Safari, Opera and Mozilla */
    filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
    height: 23px;
    background-color: #efefde;
}

.SC_FieldLabel
{
    white-space: nowrap;
    padding: 2px;
    width: 100%;
    cursor: default;
    background-color: #ffffff;
    text-overflow: ellipsis;
    overflow: hidden;
}

.SC_FieldButton
{
    background-position: center center;
    background-image: url(images/toolbar.buttonarrow.gif);
    border-left: #b7b7a6 1px solid;
    width: 14px;
    background-repeat: no-repeat;
}

.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption
{
    opacity: 0.30; /* Safari, Opera and Mozilla */
    filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
}

.SC_FieldOver
{
    border: #316ac5 1px solid;
}

.SC_FieldOver .SC_FieldButton
{
    border-left: #316ac5 1px solid;
}

/*
	### Color Selector Panel
*/

.ColorBoxBorder
{
    border: #808080 1px solid;
    position: static;
}

.ColorBox
{
    font-size: 1px;
    width: 10px;
    position: static;
    height: 10px;
}

.ColorDeselected, .ColorSelected
{
    cursor: default;
}

.ColorDeselected
{
    border: #ffffff 1px solid;
    padding: 2px;
    float: left;
}

.ColorSelected
{
    border: #330066 1px solid;
    padding: 2px;
    float: left;
    background-color: #c4cdd6;
}

--- NEW FILE: fck_strip.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:04 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:04 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/skins/silver
	fck_dialog.css, 1.3, 1.4 fck_editor.css, 1.5,
	1.6 fck_strip.gif, 1.2, 1.3
Message-ID: <20080209125404.80E8710FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/silver
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/skins/silver

Added Files:
	fck_dialog.css fck_editor.css fck_strip.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_dialog.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Styles used by the dialog boxes.
 */

body
{
	margin: 0px;
	padding: 10px;
	background-color: #f7f7f7;
}

body, td, input, select, textarea
{
	font-size: 11px;
	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
}

body, .BackColor
{
	background-color: #f7f7f7;
}

.PopupBody
{
	margin: 0px;
	padding: 0px;
}

.PopupTitle
{
	padding-right: 10px;
	padding-left: 10px;
	font-weight: bold;
	font-size: 14pt;
	padding-bottom: 3px;
	color: #504845;
	padding-top: 3px;
	background-color: #dedede;
}

.PopupButtons
{
	border-top: #cec6b5 1px solid;
	background-color: #DEDEDE;
	padding: 7px 10px 7px 10px;
}

.Button
{
	border: #7a7261 1px solid;
	color: #504845;
	background-color: #cec6b5;
}

#btnOk
{
	width: 100px;
}

.DarkBackground
{
	background-color: #d7d79f;
}

.LightBackground
{
	background-color: #ffffbe;
}

.PopupTitleBorder
{
	border-bottom: #cec6b5 1px solid;
}

.PopupTabArea
{
	color: #504845;
	background-color: #DEDEDE;
}

.PopupTabEmptyArea
{
	padding-left: 10px ;
	border-bottom: #cec6b5 1px solid;
}

.PopupTab, .PopupTabSelected
{
	border-right: #cec6b5 1px solid;
	border-top: #cec6b5 1px solid;
	border-left: #cec6b5 1px solid;
	padding: 3px 5px 3px 5px;
	color: #504845;
}

.PopupTab
{
	margin-top: 1px;
	border-bottom: #cec6b5 1px solid;
	cursor: pointer;
	cursor: hand;
}

.PopupTabSelected
{
	font-weight:bold;
	cursor: default;
	padding-top: 4px;
	border-bottom: #f1f1e3 1px solid;
	background-color: #f7f7f7;
}

.PopupSelectionBox
{
	border: #a9a9a9 1px solid !important;
	background-color: #dcdcdc !important;
	cursor: pointer;
	cursor: hand;
}

#tdBrowse 
{
	vertical-align: bottom;
}
--- NEW FILE: fck_editor.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Styles used by the editor IFRAME and Toolbar.
 */

/*
	### Basic Editor IFRAME Styles.
*/

body
{
	padding: 1px;
	margin: 0;
	background-color: #ffffff;
}

#xEditingArea
{
	border: #696969 1px solid;
}

.SourceField
{
	padding: 5px;
	margin: 0px;
	font-family: Monospace;
}

/*
	Toolbar
*/

.TB_ToolbarSet, .TB_Expand, .TB_Collapse
{
    cursor: default;
	background-color: #f7f7f7;
}

.TB_ToolbarSet
{
	padding: 1px;
	border-top: #efefde 1px outset;
	border-bottom: #efefde 1px outset;
}

.TB_ToolbarSet TD
{
	font-size: 11px;
	font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.TB_Toolbar
{
    display: inline-table;
}

.TB_Separator
{
    width: 1px;
    height: 21px;
    margin: 2px;
    background-color: #C6C3BD;
}

.TB_Start
{
    background-image: url(images/toolbar.start.gif);
    margin-left: 2px;
    margin-right: 2px;
    width: 3px;
    background-repeat: no-repeat;
    height: 27px;
    background-position: center center;
}

.TB_End
{
	display: none;
}

.TB_ExpandImg
{
	background-image: url(images/toolbar.expand.gif);
	background-repeat: no-repeat;
}

.TB_CollapseImg
{
	background-image: url(images/toolbar.collapse.gif);
	background-repeat: no-repeat;
}

.TB_SideBorder
{
	background-color: #696969;
}

.TB_Expand, .TB_Collapse
{
	padding: 2px 2px 2px 2px;
	border: #efefde 1px outset;
}

.TB_Collapse
{
	border: #efefde 1px outset;
	width: 5px;
}

.TB_Break
{
	height: 27px;
}

/*
	Toolbar Button
*/

.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
{
	padding: 1px ;
	margin:1px;
	height: 21px;
}

.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
{
	border: #cec6b5 1px solid;
}

.TB_Button_On
{
	border-color: #316ac5;
	background-color: #c1d2ee;
}

.TB_Button_On_Over, .TB_Button_Off_Over
{
    border: #316ac5 1px solid;
    background-color: #dff1ff;
}

.TB_Button_Off
{
	background: #efefef url(images/toolbar.buttonbg.gif) repeat-x;
}

.TB_Button_Off, .TB_Combo_Off
{
	opacity: 0.70; /* Safari, Opera and Mozilla */
	filter: alpha(opacity=70); /* IE */
	/* -moz-opacity: 0.70; Mozilla (Old) */
}

.TB_Button_Disabled
{
    opacity: 0.30; /* Safari, Opera and Mozilla */
    filter: gray() alpha(opacity=30); /* IE */
}

.TB_Button_Padding
{
    visibility: hidden;
    width: 3px;
    height: 21px;
}

.TB_Button_Image
{
    overflow: hidden;
    width: 16px;
    height: 16px;
    margin: 3px;
    margin-top: 4px;
    margin-bottom: 2px;
    background-repeat: no-repeat;
}

/* For composed button ( icon + text, icon + arrow ), we must compensate the table */
.TB_Button_On TABLE .TB_Button_Image,
.TB_Button_Off TABLE .TB_Button_Image,
.TB_Button_On_Over TABLE .TB_Button_Image,
.TB_Button_Off_Over TABLE .TB_Button_Image,
.TB_Button_Disabled TABLE .TB_Button_Image
{
    margin-top: 3px;
}

.TB_Button_Image img
{
    position: relative;
}

.TB_ConnectionLine
{
    background-color: #ffffff;
    height: 1px;
    margin-left: 1px;   /* ltr */
    margin-right: 1px;  /* rtl */
}

/*
	Menu
*/

.MN_Menu
{
    border: 1px solid #8f8f73;
    padding: 2px;
    background-color: #f7f7f7;
    cursor: default;
}

.MN_Menu, .MN_Menu .MN_Label
{
    font-size: 11px;
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.MN_Item_Padding
{
    visibility: hidden;
    width: 3px;
    height: 20px;
}

.MN_Icon
{
    background-color: #dedede;
    text-align: center;
    height: 20px;
}

.MN_Label
{
    padding-left: 3px;
    padding-right: 3px;
}

.MN_Separator
{
    height: 3px;
}

.MN_Separator_Line
{
    border-top: #b9b99d 1px solid;
}

.MN_Item .MN_Icon IMG
{
    filter: alpha(opacity=70);
    opacity: 0.70;
}

.MN_Item_Over
{
    color: #ffffff;
    background-color: #8a857d;
}

.MN_Item_Over .MN_Icon
{
    background-color: #6c6761;
}

.MN_Item_Disabled IMG
{
    filter: gray() alpha(opacity=30); /* IE */
    opacity: 0.30; /* Safari, Opera and Mozilla */
}

.MN_Item_Disabled .MN_Label
{
    color: #b7b7b7;
}

.MN_Arrow
{
    padding-right: 3px;
    padding-left: 3px;
}

.MN_ConnectionLine
{
    background-color: #ffffff;
}

.Menu .TB_Button_On, .Menu .TB_Button_On_Over
{
    border: #8f8f73 1px solid;
    background-color: #ffffff;
}

/*
	### Panel Styles
*/

.FCK_Panel
{
    border: #8f8f73 1px solid;
    padding: 2px;
    background-color: #ffffff;
}

.FCK_Panel, .FCK_Panel TD
{
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
    font-size: 11px;
}

/*
	### Special Combos
*/

.SC_Panel
{
    overflow: auto;
    white-space: nowrap;
    cursor: default;
    border: 1px solid #8f8f73;
    padding-left: 2px;
    padding-right: 2px;
}

.SC_Panel, .SC_Panel TD
{
    font-size: 11px;
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.SC_Item, .SC_ItemSelected
{
    margin-top: 2px;
    margin-bottom: 2px;
    background-position: left center;
    padding-left: 11px;
    padding-right: 3px;
    padding-top: 2px;
    padding-bottom: 2px;
    text-overflow: ellipsis;
    overflow: hidden;
    background-repeat: no-repeat;
    border: #dddddd 1px solid;
}

.SC_Item *, .SC_ItemSelected *
{
    margin-top: 0px;
    margin-bottom: 0px;
}

.SC_ItemSelected
{
    border: #9a9afb 1px solid;
    background-image: url(images/toolbar.arrowright.gif);
}

.SC_ItemOver
{
    border: #316ac5 1px solid;
}

.SC_Field
{
    margin-top:1px ;
    border: #b7b7a6 1px solid;
    cursor: default;
}

.SC_FieldCaption
{
    padding-top: 1px ;
    overflow: visible;
    padding-right: 5px;
    padding-left: 5px;
    opacity: 0.75; /* Safari, Opera and Mozilla */
    filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
    height: 23px;
    background-color: #f7f7f7;
}

.SC_FieldLabel
{
    white-space: nowrap;
    padding: 2px;
    width: 100%;
    cursor: default;
    background-color: #ffffff;
    text-overflow: ellipsis;
    overflow: hidden;
}

.SC_FieldButton
{
    background-position: center center;
    background-image: url(images/toolbar.buttonarrow.gif);
    border-left: #b7b7a6 1px solid;
    width: 14px;
    background-repeat: no-repeat;
}

.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption
{
    opacity: 0.30; /* Safari, Opera and Mozilla */
    filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
}

.SC_FieldOver
{
    border: #316ac5 1px solid;
}

.SC_FieldOver .SC_FieldButton
{
    border-left: #316ac5 1px solid;
}

/*
	### Color Selector Panel
*/

.ColorBoxBorder
{
    border: #808080 1px solid;
    position: static;
}

.ColorBox
{
    font-size: 1px;
    width: 10px;
    position: static;
    height: 10px;
}

.ColorDeselected, .ColorSelected
{
    cursor: default;
}

.ColorDeselected
{
    border: #ffffff 1px solid;
    padding: 2px;
    float: left;
}

.ColorSelected
{
    border: #316ac5 1px solid;
    padding: 2px;
    float: left;
    background-color: #c1d2ee;
}

--- NEW FILE: fck_strip.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:02 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:02 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py
	config.py, NONE, 1.1 connector.py, NONE, 1.1 fckcommands.py,
	NONE, 1.1 fckconnector.py, NONE, 1.1 fckoutput.py, NONE,
	1.1 fckutil.py, NONE, 1.1 htaccess.txt, NONE, 1.1 upload.py,
	NONE, 1.1 wsgi.py, NONE, 1.1 zope.py, NONE, 1.1
Message-ID: <20080209125402.76DE910FE76@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/filemanager/connectors/py

Added Files:
	config.py connector.py fckcommands.py fckconnector.py 
	fckoutput.py fckutil.py htaccess.txt upload.py wsgi.py zope.py 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: config.py ---
#!/usr/bin/env python
"""
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Configuration file for the File Manager Connector for Python 
"""

# INSTALLATION NOTE: You must set up your server environment accordingly to run 
# python scripts. This connector requires Python 2.4 or greater.
# 
# Supported operation modes: 
#  * WSGI (recommended): You'll need apache + mod_python + modpython_gateway 
#                        or any web server capable of the WSGI python standard
#  * Plain Old CGI:      Any server capable of running standard python scripts
#                        (although mod_python is recommended for performance)
#                        This was the previous connector version operation mode
#
# If you're using Apache web server, replace the htaccess.txt to to .htaccess, 
# and set the proper options and paths.
# For WSGI and mod_python, you may need to download modpython_gateway from:
# http://projects.amor.org/misc/svn/modpython_gateway.py and copy it in this 
# directory.

   
# SECURITY: You must explicitly enable this "connector". (Set it to "True").
# WARNING: don't just set "ConfigIsEnabled = True", you must be sure that only 
#		authenticated users can access this file or use some kind of session checking.
Enabled = False

# Path to user files relative to the document root.
UserFilesPath = '/userfiles/' 

# Fill the following value it you prefer to specify the absolute path for the
# user files directory. Useful if you are using a virtual directory, symbolic
# link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
# Attention: The above 'UserFilesPath' must point to the same directory.
# WARNING: GetRootPath may not work in virtual or mod_python configurations, and
# may not be thread safe. Use this configuration parameter instead.
UserFilesAbsolutePath = '' 

# Due to security issues with Apache modules, it is recommended to leave the
# following setting enabled.
ForceSingleExtension = True 

# What the user can do with this connector
ConfigAllowedCommands = [ 'QuickUpload', 'FileUpload', 'GetFolders', 'GetFoldersAndFiles', 'CreateFolder' ] 

# Allowed Resource Types
ConfigAllowedTypes = ['File', 'Image', 'Flash', 'Media'] 

# Do not touch this 3 lines, see "Configuration settings for each Resource Type"
AllowedExtensions = {}; DeniedExtensions = {};
FileTypesPath = {}; FileTypesAbsolutePath = {};
QuickUploadPath = {}; QuickUploadAbsolutePath = {};

#	Configuration settings for each Resource Type
#
#	- AllowedExtensions: the possible extensions that can be allowed. 
#		If it is empty then any file type can be uploaded.
#	- DeniedExtensions: The extensions that won't be allowed. 
#		If it is empty then no restrictions are done here.
#
#	For a file to be uploaded it has to fulfill both the AllowedExtensions
#	and DeniedExtensions (that's it: not being denied) conditions.
#
#	- FileTypesPath: the virtual folder relative to the document root where
#		these resources will be located. 
#		Attention: It must start and end with a slash: '/'
#
#	- FileTypesAbsolutePath: the physical path to the above folder. It must be
#		an absolute path. 
#		If it's an empty string then it will be autocalculated.
#		Useful if you are using a virtual directory, symbolic link or alias. 
#		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
#		Attention: The above 'FileTypesPath' must point to the same directory.
#		Attention: It must end with a slash: '/'
#
#
#	- QuickUploadPath: the virtual folder relative to the document root where
#		these resources will be uploaded using the Upload tab in the resources 
#		dialogs.
#		Attention: It must start and end with a slash: '/'
#
#	- QuickUploadAbsolutePath: the physical path to the above folder. It must be
#		an absolute path. 
#		If it's an empty string then it will be autocalculated.
#		Useful if you are using a virtual directory, symbolic link or alias. 
#		Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
#		Attention: The above 'QuickUploadPath' must point to the same directory.
#		Attention: It must end with a slash: '/'

AllowedExtensions['File'] 		= ['7z','aiff','asf','avi','bmp','csv','doc','fla','flv','gif','gz','gzip','jpeg','jpg','mid','mov','mp3','mp4','mpc','mpeg','mpg','ods','odt','pdf','png','ppt','pxd','qt','ram','rar','rm','rmi','rmvb','rtf','sdc','sitd','swf','sxc','sxw','tar','tgz','tif','tiff','txt','vsd','wav','wma','wmv','xls','xml','zip']
DeniedExtensions['File'] 		= []
FileTypesPath['File'] 			= UserFilesPath + 'file/' 
FileTypesAbsolutePath['File'] 	= (not UserFilesAbsolutePath == '') and (UserFilesAbsolutePath + 'file/') or ''
QuickUploadPath['File']			= FileTypesPath['File']
QuickUploadAbsolutePath['File']	= FileTypesAbsolutePath['File']

AllowedExtensions['Image']		= ['bmp','gif','jpeg','jpg','png']
DeniedExtensions['Image']		= []
FileTypesPath['Image']			= UserFilesPath + 'image/' 
FileTypesAbsolutePath['Image']	= (not UserFilesAbsolutePath == '') and UserFilesAbsolutePath + 'image/' or ''
QuickUploadPath['Image']		= FileTypesPath['Image']
QuickUploadAbsolutePath['Image']= FileTypesAbsolutePath['Image']

AllowedExtensions['Flash']		= ['swf','flv']
DeniedExtensions['Flash']		= []
FileTypesPath['Flash']			= UserFilesPath + 'flash/'
FileTypesAbsolutePath['Flash']	= ( not UserFilesAbsolutePath == '') and UserFilesAbsolutePath + 'flash/' or ''
QuickUploadPath['Flash']		= FileTypesPath['Flash']
QuickUploadAbsolutePath['Flash']= FileTypesAbsolutePath['Flash']

AllowedExtensions['Media']		= ['aiff','asf','avi','bmp','fla', 'flv','gif','jpeg','jpg','mid','mov','mp3','mp4','mpc','mpeg','mpg','png','qt','ram','rm','rmi','rmvb','swf','tif','tiff','wav','wma','wmv']
DeniedExtensions['Media']		= []
FileTypesPath['Media']			= UserFilesPath + 'media/'
FileTypesAbsolutePath['Media']	= ( not UserFilesAbsolutePath == '') and UserFilesAbsolutePath + 'media/' or ''
QuickUploadPath['Media']		= FileTypesPath['Media']
QuickUploadAbsolutePath['Media']= FileTypesAbsolutePath['Media']

--- NEW FILE: zope.py ---
#!/usr/bin/env python

"""
FCKeditor - The text editor for Internet - http://www.fckeditor.net
Copyright (C) 2003-2007 Frederico Caldeira Knabben

== BEGIN LICENSE ==

Licensed under the terms of any of the following licenses at your
choice:

- GNU General Public License Version 2 or later (the "GPL")
http://www.gnu.org/licenses/gpl.html

- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
http://www.gnu.org/licenses/lgpl.html

- Mozilla Public License Version 1.1 or later (the "MPL")
http://www.mozilla.org/MPL/MPL-1.1.html

== END LICENSE ==

Connector for Python and Zope.

This code was not tested at all.
It just was ported from pre 2.5 release, so for further reference see 
\editor\filemanager\browser\default\connectors\py\connector.py in previous 
releases.

"""

from fckutil import *
from connector import *
import config as Config

class FCKeditorConnectorZope(FCKeditorConnector):
	"""
	Zope versiof FCKeditorConnector
	"""
	# Allow access (Zope)
	__allow_access_to_unprotected_subobjects__ = 1

	def __init__(self, context=None):
		"""
		Constructor
		"""
		FCKeditorConnector.__init__(self, environ=None) # call superclass constructor
		# Instance Attributes
		self.context = context
		self.request = FCKeditorRequest(context)
	
	def getZopeRootContext(self):
		if self.zopeRootContext is None:
			self.zopeRootContext = self.context.getPhysicalRoot()
		return self.zopeRootContext

	def getZopeUploadContext(self):
		if self.zopeUploadContext is None:
			folderNames = self.userFilesFolder.split("/")
			c = self.getZopeRootContext()
			for folderName in folderNames:
				if (folderName <> ""):
					c = c[folderName]
			self.zopeUploadContext = c
		return self.zopeUploadContext

	def setHeader(self, key, value):
		self.context.REQUEST.RESPONSE.setHeader(key, value)

	def getFolders(self, resourceType, currentFolder):
		# Open the folders node
		s = ""
		s += """<Folders>"""
		zopeFolder = self.findZopeFolder(resourceType, currentFolder)
		for (name, o) in zopeFolder.objectItems(["Folder"]):
			s += """<Folder name="%s" />""" % (
					convertToXmlAttribute(name)
					)
		# Close the folders node
		s += """</Folders>"""
		return s

	def getZopeFoldersAndFiles(self, resourceType, currentFolder):
		folders = self.getZopeFolders(resourceType, currentFolder)
		files = self.getZopeFiles(resourceType, currentFolder)
		s = folders + files
		return s

	def getZopeFiles(self, resourceType, currentFolder):
		# Open the files node
		s = ""
		s += """<Files>"""
		zopeFolder = self.findZopeFolder(resourceType, currentFolder)
		for (name, o) in zopeFolder.objectItems(["File","Image"]):
			s += """<File name="%s" size="%s" />""" % (
					convertToXmlAttribute(name),
					((o.get_size() / 1024) + 1)
					)
		# Close the files node
		s += """</Files>"""
		return s

	def findZopeFolder(self, resourceType, folderName):
		# returns the context of the resource / folder
		zopeFolder = self.getZopeUploadContext()
		folderName = self.removeFromStart(folderName, "/")
		folderName = self.removeFromEnd(folderName, "/")
		if (resourceType <> ""):
			try:
				zopeFolder = zopeFolder[resourceType]
			except:
				zopeFolder.manage_addProduct["OFSP"].manage_addFolder(id=resourceType, title=resourceType)
				zopeFolder = zopeFolder[resourceType]
		if (folderName <> ""):
			folderNames = folderName.split("/")
			for folderName in folderNames:
				zopeFolder = zopeFolder[folderName]
		return zopeFolder

	def createFolder(self, resourceType, currentFolder):
		# Find out where we are
		zopeFolder = self.findZopeFolder(resourceType, currentFolder)
		errorNo = 0
		errorMsg = ""
		if self.request.has_key("NewFolderName"):
			newFolder = self.request.get("NewFolderName", None)
			zopeFolder.manage_addProduct["OFSP"].manage_addFolder(id=newFolder, title=newFolder)
		else:
			errorNo = 102
		return self.sendErrorNode ( errorNo, errorMsg )

	def uploadFile(self, resourceType, currentFolder, count=None):
		zopeFolder = self.findZopeFolder(resourceType, currentFolder)
		file = self.request.get("NewFile", None)
		fileName = self.getFileName(file.filename)
		fileNameOnly = self.removeExtension(fileName)
		fileExtension = self.getExtension(fileName).lower()
		if (count):
			nid = "%s.%s.%s" % (fileNameOnly, count, fileExtension)
		else:
			nid = fileName
		title = nid
		try:
			zopeFolder.manage_addProduct['OFSP'].manage_addFile(
					id=nid,
					title=title,
					file=file.read()
					)
		except:
			if (count):
				count += 1
			else:
				count = 1
			return self.zopeFileUpload(resourceType, currentFolder, count)
		return self.sendUploadResults( 0 )

class FCKeditorRequest(object):
	"A wrapper around the request object"
	def __init__(self, context=None):
		r = context.REQUEST
		self.request = r

	def has_key(self, key):
		return self.request.has_key(key)

	def get(self, key, default=None):
		return self.request.get(key, default)

"""
Running from zope, you will need to modify this connector.
If you have uploaded the FCKeditor into Zope (like me), you need to
move this connector out of Zope, and replace the "connector" with an
alias as below.  The key to it is to pass the Zope context in, as
we then have a like to the Zope context.

## Script (Python) "connector.py"
##bind container=container
##bind context=context
##bind namespace=
##bind script=script
##bind subpath=traverse_subpath
##parameters=*args, **kws
##title=ALIAS
##

import Products.zope as connector
return connector.FCKeditorConnectorZope(context=context).doResponse()
"""


--- NEW FILE: upload.py ---
#!/usr/bin/env python

"""
FCKeditor - The text editor for Internet - http://www.fckeditor.net
Copyright (C) 2003-2007 Frederico Caldeira Knabben

== BEGIN LICENSE ==

Licensed under the terms of any of the following licenses at your
choice:

- GNU General Public License Version 2 or later (the "GPL")
http://www.gnu.org/licenses/gpl.html

- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
http://www.gnu.org/licenses/lgpl.html

- Mozilla Public License Version 1.1 or later (the "MPL")
http://www.mozilla.org/MPL/MPL-1.1.html

== END LICENSE ==

This is the "File Uploader" for Python

"""
import os

from fckutil import *
from fckcommands import * 	# default command's implementation
from fckconnector import FCKeditorConnectorBase # import base connector
import config as Config

class FCKeditorQuickUpload(	FCKeditorConnectorBase,
							UploadFileCommandMixin, 
							BaseHttpMixin, BaseHtmlMixin):	
	def doResponse(self):
		"Main function. Process the request, set headers and return a string as response."
		# Check if this connector is disabled
		if not(Config.Enabled):
			return self.sendUploadResults(1, "This file uploader is disabled. Please check the \"editor/filemanager/connectors/py/config.py\"")
		command = 'QuickUpload'
		# The file type (from the QueryString, by default 'File').
		resourceType  = self.request.get('Type','File')
		currentFolder = getCurrentFolder(self.request.get("CurrentFolder",""))
		# Check for invalid paths
		if currentFolder is None:
			return self.sendUploadResults(102, '', '', "")

		# Check if it is an allowed command
		if ( not command in Config.ConfigAllowedCommands ):
			return self.sendUploadResults( 1, '', '', 'The %s command isn\'t allowed' % command ) 
		
		if ( not resourceType in Config.ConfigAllowedTypes  ):
			return self.sendUploadResults( 1, '', '', 'Invalid type specified' ) 

		# Setup paths
		self.userFilesFolder = Config.QuickUploadAbsolutePath[resourceType] 
		self.webUserFilesFolder =  Config.QuickUploadPath[resourceType]	
		if not self.userFilesFolder: # no absolute path given (dangerous...)
			self.userFilesFolder = mapServerPath(self.environ, 
									self.webUserFilesFolder)
		
		# Ensure that the directory exists.
		if not os.path.exists(self.userFilesFolder):
			try:
				self.createServerFoldercreateServerFolder( self.userFilesFolder ) 
			except:
				return self.sendError(1, "This connector couldn\'t access to local user\'s files directories.  Please check the UserFilesAbsolutePath in \"editor/filemanager/connectors/py/config.py\" and try again. ")			

		# File upload doesn't have to return XML, so intercept here
		return self.uploadFile(resourceType, currentFolder)

# Running from command line (plain old CGI)
if __name__ == '__main__':
	try:
		# Create a Connector Instance
		conn = FCKeditorQuickUpload()
		data = conn.doResponse()
		for header in conn.headers:
			if not header is None:
				print '%s: %s' % header
		print 
		print data
	except:
		print "Content-Type: text/plain"
		print
		import cgi
		cgi.print_exception()

--- NEW FILE: connector.py ---
#!/usr/bin/env python

"""
FCKeditor - The text editor for Internet - http://www.fckeditor.net
Copyright (C) 2003-2007 Frederico Caldeira Knabben

== BEGIN LICENSE ==

Licensed under the terms of any of the following licenses at your
choice:

 - GNU General Public License Version 2 or later (the "GPL")
   http://www.gnu.org/licenses/gpl.html

 - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
   http://www.gnu.org/licenses/lgpl.html

 - Mozilla Public License Version 1.1 or later (the "MPL")
   http://www.mozilla.org/MPL/MPL-1.1.html

== END LICENSE ==

Connector for Python (CGI and WSGI).

See config.py for configuration settings

"""
import os

from fckutil import *
from fckcommands import * 	# default command's implementation
from fckoutput import * 	# base http, xml and html output mixins
from fckconnector import FCKeditorConnectorBase # import base connector
import config as Config

class FCKeditorConnector(	FCKeditorConnectorBase,
							GetFoldersCommandMixin,
							GetFoldersAndFilesCommandMixin,
							CreateFolderCommandMixin,
							UploadFileCommandMixin, 
							BaseHttpMixin, BaseXmlMixin, BaseHtmlMixin  ):
	"The Standard connector class."
	def doResponse(self):
		"Main function. Process the request, set headers and return a string as response."
		s = ""
		# Check if this connector is disabled
		if not(Config.Enabled):
			return self.sendError(1, "This connector is disabled.  Please check the connector configurations in \"editor/filemanager/connectors/py/config.py\" and try again.")
		# Make sure we have valid inputs
		for key in ("Command","Type","CurrentFolder"):
			if not self.request.has_key (key):
				return
		# Get command, resource type and current folder
		command = self.request.get("Command")
		resourceType = self.request.get("Type")
		currentFolder = getCurrentFolder(self.request.get("CurrentFolder"))
		# Check for invalid paths
		if currentFolder is None:
			return self.sendError(102, "")
		
		# Check if it is an allowed command
		if ( not command in Config.ConfigAllowedCommands ):
			return self.sendError( 1, 'The %s command isn\'t allowed' % command ) 
		
		if ( not resourceType in Config.ConfigAllowedTypes  ):
			return self.sendError( 1, 'Invalid type specified' ) 

		# Setup paths
		if command == "QuickUpload":
			self.userFilesFolder = Config.QuickUploadAbsolutePath[resourceType] 
			self.webUserFilesFolder =  Config.QuickUploadPath[resourceType]
		else:
			self.userFilesFolder = Config.FileTypesAbsolutePath[resourceType]
			self.webUserFilesFolder = Config.FileTypesPath[resourceType]	
		
		if not self.userFilesFolder: # no absolute path given (dangerous...)
			self.userFilesFolder = mapServerPath(self.environ, 
									self.webUserFilesFolder)
		# Ensure that the directory exists.
		if not os.path.exists(self.userFilesFolder):
			try:
				self.createServerFoldercreateServerFolder( self.userFilesFolder ) 
			except:
				return self.sendError(1, "This connector couldn\'t access to local user\'s files directories.  Please check the UserFilesAbsolutePath in \"editor/filemanager/connectors/py/config.py\" and try again. ")

		# File upload doesn't have to return XML, so intercept here
		if (command == "FileUpload"):
			return self.uploadFile(resourceType, currentFolder)
		
		# Create Url
		url = combinePaths( self.webUserFilesFolder, currentFolder )
		
		# Begin XML
		s += self.createXmlHeader(command, resourceType, currentFolder, url)
		# Execute the command
		selector = {"GetFolders": self.getFolders,
					"GetFoldersAndFiles": self.getFoldersAndFiles,
					"CreateFolder": self.createFolder,
					}
		s += selector[command](resourceType, currentFolder)
		s += self.createXmlFooter()
		return s	
	
# Running from command line (plain old CGI)
if __name__ == '__main__':
	try:
		# Create a Connector Instance
		conn = FCKeditorConnector()
		data = conn.doResponse()
		for header in conn.headers:
			print '%s: %s' % header
		print 
		print data
	except:
		print "Content-Type: text/plain"
		print
		import cgi
		cgi.print_exception()

--- NEW FILE: fckcommands.py ---
#!/usr/bin/env python

"""
FCKeditor - The text editor for Internet - http://www.fckeditor.net
Copyright (C) 2003-2007 Frederico Caldeira Knabben

== BEGIN LICENSE ==

Licensed under the terms of any of the following licenses at your
choice:

- GNU General Public License Version 2 or later (the "GPL")
http://www.gnu.org/licenses/gpl.html

- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
http://www.gnu.org/licenses/lgpl.html

- Mozilla Public License Version 1.1 or later (the "MPL")
http://www.mozilla.org/MPL/MPL-1.1.html

== END LICENSE ==

Connector for Python (CGI and WSGI).

"""

import os
try: # Windows needs stdio set for binary mode for file upload to work.
	import msvcrt
	msvcrt.setmode (0, os.O_BINARY) # stdin  = 0
	msvcrt.setmode (1, os.O_BINARY) # stdout = 1
except ImportError:
	pass

from fckutil import *
from fckoutput import *
import config as Config

class GetFoldersCommandMixin (object):
	def getFolders(self, resourceType, currentFolder):
		"""
		Purpose: command to recieve a list of folders
		"""
		# Map the virtual path to our local server
		serverPath = mapServerFolder(self.userFilesFolder,currentFolder)
		s = """<Folders>"""	 # Open the folders node
		for someObject in os.listdir(serverPath):
			someObjectPath = mapServerFolder(serverPath, someObject)
			if os.path.isdir(someObjectPath):
				s += """<Folder name="%s" />""" % (
						convertToXmlAttribute(someObject)
						)
		s += """</Folders>""" # Close the folders node
		return s

class GetFoldersAndFilesCommandMixin (object):
	def getFoldersAndFiles(self, resourceType, currentFolder):
		"""
		Purpose: command to recieve a list of folders and files
		"""
		# Map the virtual path to our local server
		serverPath = mapServerFolder(self.userFilesFolder,currentFolder)
		# Open the folders / files node
		folders = """<Folders>"""
		files = """<Files>"""
		for someObject in os.listdir(serverPath):
			someObjectPath = mapServerFolder(serverPath, someObject)
			if os.path.isdir(someObjectPath):
				folders += """<Folder name="%s" />""" % (
						convertToXmlAttribute(someObject)
						)
			elif os.path.isfile(someObjectPath):
				size = os.path.getsize(someObjectPath)
				files += """<File name="%s" size="%s" />""" % (
						convertToXmlAttribute(someObject),
						os.path.getsize(someObjectPath)
						)
		# Close the folders / files node
		folders += """</Folders>"""
		files += """</Files>"""
		return folders + files

class CreateFolderCommandMixin (object):
	def createFolder(self, resourceType, currentFolder):
		"""
		Purpose: command to create a new folder
		"""
		errorNo = 0; errorMsg ='';
		if self.request.has_key("NewFolderName"):
			newFolder = self.request.get("NewFolderName", None)
			newFolder = sanitizeFolderName (newFolder)
			try:
				newFolderPath = mapServerFolder(self.userFilesFolder, combinePaths(currentFolder, newFolder))
				self.createServerFolder(newFolderPath)
			except Exception, e:
				errorMsg = str(e).decode('iso-8859-1').encode('utf-8') # warning with encodigns!!!
				if hasattr(e,'errno'):
					if e.errno==17: #file already exists
						errorNo=0
					elif e.errno==13: # permission denied
						errorNo = 103
					elif e.errno==36 or e.errno==2 or e.errno==22: # filename too long / no such file / invalid name
						errorNo = 102 
				else:
					errorNo = 110
		else:
			errorNo = 102
		return self.sendErrorNode ( errorNo, errorMsg )

	def createServerFolder(self, folderPath):
		"Purpose: physically creates a folder on the server"
		# No need to check if the parent exists, just create all hierachy
		oldumask = os.umask(0)
		os.makedirs(folderPath,mode=0755)
		os.umask( oldumask ) 

class UploadFileCommandMixin (object):
	def uploadFile(self, resourceType, currentFolder):
		"""
		Purpose: command to upload files to server (same as FileUpload)
		"""
		errorNo = 0
		if self.request.has_key("NewFile"):
			# newFile has all the contents we need
			newFile = self.request.get("NewFile", "")
			# Get the file name
			newFileName = newFile.filename
			newFileName = sanitizeFileName( newFileName ) 
			newFileNameOnly = removeExtension(newFileName)
			newFileExtension = getExtension(newFileName).lower()
			allowedExtensions = Config.AllowedExtensions[resourceType]
			deniedExtensions = Config.DeniedExtensions[resourceType]

			if (allowedExtensions):
				# Check for allowed
				isAllowed = False
				if (newFileExtension in allowedExtensions):
					isAllowed = True
			elif (deniedExtensions):
				# Check for denied
				isAllowed = True
				if (newFileExtension in deniedExtensions):
					isAllowed = False
			else:
				# No extension limitations
				isAllowed = True

			if (isAllowed):
				# Upload to operating system
				# Map the virtual path to the local server path
				currentFolderPath = mapServerFolder(self.userFilesFolder, currentFolder)
				i = 0
				while (True):
					newFilePath = os.path.join (currentFolderPath,newFileName)
					if os.path.exists(newFilePath):
						i += 1
						newFileName = "%s(%04d).%s" % (
								newFileNameOnly, i, newFileExtension
								)
						errorNo= 201 # file renamed
					else:
						# Read file contents and write to the desired path (similar to php's move_uploaded_file)
						fout = file(newFilePath, 'wb')
						while (True):
							chunk = newFile.file.read(100000)
							if not chunk: break
							fout.write (chunk)
						fout.close()

						if os.path.exists ( newFilePath ):
							oldumask = os.umask(0) 
							os.chmod( newFilePath, 0755 ) 
							os.umask( oldumask ) 

						newFileUrl = self.webUserFilesFolder + currentFolder + newFileName

						return self.sendUploadResults( errorNo , newFileUrl, newFileName )
			else:
				return self.sendUploadResults( errorNo = 203, customMsg = "Extension not allowed" )
		else:
			return self.sendUploadResults( errorNo = 202, customMsg = "No File" )

--- NEW FILE: wsgi.py ---
#!/usr/bin/env python

"""
FCKeditor - The text editor for Internet - http://www.fckeditor.net
Copyright (C) 2003-2007 Frederico Caldeira Knabben

== BEGIN LICENSE ==

Licensed under the terms of any of the following licenses at your
choice:

 - GNU General Public License Version 2 or later (the "GPL")
   http://www.gnu.org/licenses/gpl.html

 - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
   http://www.gnu.org/licenses/lgpl.html

 - Mozilla Public License Version 1.1 or later (the "MPL")
   http://www.mozilla.org/MPL/MPL-1.1.html

== END LICENSE ==

Connector/QuickUpload for Python (WSGI wrapper).

See config.py for configuration settings

"""

from connector import FCKeditorConnector
from upload import FCKeditorQuickUpload

import cgitb
from cStringIO import StringIO

# Running from WSGI capable server (recomended)
def App(environ, start_response): 
	"WSGI entry point. Run the connector"
	if environ['SCRIPT_NAME'].endswith("connector.py"):
		conn = FCKeditorConnector(environ)
	elif environ['SCRIPT_NAME'].endswith("upload.py"):
		conn = FCKeditorQuickUpload(environ)
	else:
		start_response ("200 Ok", [('Content-Type','text/html')])
		yield "Unknown page requested: "
		yield environ['SCRIPT_NAME']
		return
	try:
		# run the connector
		data = conn.doResponse()
		# Start WSGI response:
		start_response ("200 Ok", conn.headers)
		# Send response text
		yield data
	except:
		start_response("500 Internal Server Error",[("Content-type","text/html")])
		file = StringIO()
		cgitb.Hook(file = file).handle()    
		yield file.getvalue()

--- NEW FILE: fckconnector.py ---
#!/usr/bin/env python

"""
FCKeditor - The text editor for Internet - http://www.fckeditor.net
Copyright (C) 2003-2007 Frederico Caldeira Knabben

== BEGIN LICENSE ==

Licensed under the terms of any of the following licenses at your
choice:

- GNU General Public License Version 2 or later (the "GPL")
http://www.gnu.org/licenses/gpl.html

- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
http://www.gnu.org/licenses/lgpl.html

- Mozilla Public License Version 1.1 or later (the "MPL")
http://www.mozilla.org/MPL/MPL-1.1.html

== END LICENSE ==

Base Connector for Python (CGI and WSGI).

See config.py for configuration settings

"""
import cgi, os

from fckutil import *
from fckcommands import * 	# default command's implementation
from fckoutput import * 	# base http, xml and html output mixins
import config as Config

class FCKeditorConnectorBase( object ):
	"The base connector class. Subclass it to extend functionality (see Zope example)"

	def __init__(self, environ=None):
		"Constructor: Here you should parse request fields, initialize variables, etc."
		self.request = FCKeditorRequest(environ) # Parse request
		self.headers = []						# Clean Headers 
		if environ:
			self.environ = environ
		else:
			self.environ = os.environ

	# local functions

	def setHeader(self, key, value):
		self.headers.append ((key, value))
		return

class FCKeditorRequest(object):
	"A wrapper around the request object"
	def __init__(self, environ):
		if environ: # WSGI
			self.request = cgi.FieldStorage(fp=environ['wsgi.input'],
							environ=environ,
							keep_blank_values=1)
			self.environ = environ
		else: # plain old cgi
			self.environ = os.environ
			self.request = cgi.FieldStorage()
		if 'REQUEST_METHOD' in self.environ and 'QUERY_STRING' in self.environ:
			if self.environ['REQUEST_METHOD'].upper()=='POST':
				# we are in a POST, but GET query_string exists
				# cgi parses by default POST data, so parse GET QUERY_STRING too
				self.get_request = cgi.FieldStorage(fp=None,
							environ={
							'REQUEST_METHOD':'GET',
							'QUERY_STRING':self.environ['QUERY_STRING'],
							},
							)
		else:
			self.get_request={}

	def has_key(self, key):
		return self.request.has_key(key) or self.get_request.has_key(key)

	def get(self, key, default=None):
		if key in self.request.keys():
			field = self.request[key]
		elif key in self.get_request.keys():
			field = self.get_request[key]
		else:
			return default
		if hasattr(field,"filename") and field.filename: #file upload, do not convert return value
			return field
		else:
			return field.value

--- NEW FILE: htaccess.txt ---
# replace the name of this file to .htaccess (if using apache), 
# and set the proper options and paths according your enviroment

Allow from all

# If using mod_python uncomment this:
PythonPath "[r'C:\Archivos de programa\Apache Software Foundation\Apache2.2\htdocs\fckeditor\editor\filemanager\connectors\py'] + sys.path"


# Recomended: WSGI application running with mod_python and modpython_gateway
SetHandler python-program
PythonHandler modpython_gateway::handler
PythonOption wsgi.application wsgi::App


# Emulated CGI with mod_python and cgihandler
#AddHandler mod_python .py
#PythonHandler mod_python.cgihandler


# Plain old CGI
#Options +ExecCGI 
#AddHandler cgi-script py

--- NEW FILE: fckoutput.py ---
#!/usr/bin/env python

"""
FCKeditor - The text editor for Internet - http://www.fckeditor.net
Copyright (C) 2003-2007 Frederico Caldeira Knabben

== BEGIN LICENSE ==

Licensed under the terms of any of the following licenses at your
choice:

- GNU General Public License Version 2 or later (the "GPL")
http://www.gnu.org/licenses/gpl.html

- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
http://www.gnu.org/licenses/lgpl.html

- Mozilla Public License Version 1.1 or later (the "MPL")
http://www.mozilla.org/MPL/MPL-1.1.html

== END LICENSE ==

Connector for Python (CGI and WSGI).

"""

from time import gmtime, strftime
import string

def escape(text, replace=string.replace):
	"""
	Converts the special characters '<', '>', and '&'.

	RFC 1866 specifies that these characters be represented
	in HTML as &lt; &gt; and &amp; respectively. In Python
	1.5 we use the new string.replace() function for speed.
	"""
	text = replace(text, '&', '&amp;') # must be done 1st
	text = replace(text, '<', '&lt;')
	text = replace(text, '>', '&gt;')
	text = replace(text, '"', '&quot;')
	return text

def convertToXmlAttribute(value):
	if (value is None):
		value = ""
	return escape(value)

class BaseHttpMixin(object):
	def setHttpHeaders(self, content_type='text/xml'):
		"Purpose: to prepare the headers for the xml to return"
		# Prevent the browser from caching the result.
		# Date in the past
		self.setHeader('Expires','Mon, 26 Jul 1997 05:00:00 GMT')
		# always modified
		self.setHeader('Last-Modified',strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime())) 
		# HTTP/1.1
		self.setHeader('Cache-Control','no-store, no-cache, must-revalidate') 
		self.setHeader('Cache-Control','post-check=0, pre-check=0') 
		# HTTP/1.0
		self.setHeader('Pragma','no-cache') 

		# Set the response format.
		self.setHeader( 'Content-Type', content_type + '; charset=utf-8' )
		return

class BaseXmlMixin(object):
	def createXmlHeader(self, command, resourceType, currentFolder, url):
		"Purpose: returns the xml header"
		self.setHttpHeaders()
		# Create the XML document header
		s =  """<?xml version="1.0" encoding="utf-8" ?>"""
		# Create the main connector node
		s += """<Connector command="%s" resourceType="%s">""" % (
				command,
				resourceType
				)
		# Add the current folder node
		s += """<CurrentFolder path="%s" url="%s" />""" % (
				convertToXmlAttribute(currentFolder),
				convertToXmlAttribute(url),
				)
		return s

	def createXmlFooter(self):
		"Purpose: returns the xml footer"
		return """</Connector>"""

	def sendError(self, number, text):
		"Purpose: in the event of an error, return an xml based error"
		self.setHttpHeaders()
		return ("""<?xml version="1.0" encoding="utf-8" ?>""" +
				"""<Connector>""" +
				self.sendErrorNode (number, text) +
				"""</Connector>""" )
		
	def sendErrorNode(self, number, text):
		return """<Error number="%s" text="%s" />""" % (number, convertToXmlAttribute(text))

class BaseHtmlMixin(object):
	def sendUploadResults( self, errorNo = 0, fileUrl = '', fileName = '', customMsg = '' ):
		self.setHttpHeaders("text/html")
		"This is the function that sends the results of the uploading process"
		return """<script type="text/javascript">
			window.parent.OnUploadCompleted(%(errorNumber)s,"%(fileUrl)s","%(fileName)s","%(customMsg)s"); 
			</script>""" % {
			'errorNumber': errorNo,
			'fileUrl': fileUrl.replace ('"', '\\"'),
			'fileName': fileName.replace ( '"', '\\"' ) , 
			'customMsg': customMsg.replace ( '"', '\\"' ),
			}
--- NEW FILE: fckutil.py ---
#!/usr/bin/env python

"""
FCKeditor - The text editor for Internet - http://www.fckeditor.net
Copyright (C) 2003-2007 Frederico Caldeira Knabben

== BEGIN LICENSE ==

Licensed under the terms of any of the following licenses at your
choice:

- GNU General Public License Version 2 or later (the "GPL")
http://www.gnu.org/licenses/gpl.html

- GNU Lesser General Public License Version 2.1 or later (the "LGPL")
http://www.gnu.org/licenses/lgpl.html

- Mozilla Public License Version 1.1 or later (the "MPL")
http://www.mozilla.org/MPL/MPL-1.1.html

== END LICENSE ==

Utility functions for the File Manager Connector for Python 

"""

import string, re
import os
import config as Config

# Generic manipulation functions

def removeExtension(fileName):
	index = fileName.rindex(".")
	newFileName = fileName[0:index]
	return newFileName

def getExtension(fileName):
	index = fileName.rindex(".") + 1
	fileExtension = fileName[index:]
	return fileExtension

def removeFromStart(string, char):
	return string.lstrip(char)

def removeFromEnd(string, char):
	return string.rstrip(char)

# Path functions

def combinePaths( basePath, folder ):
	return removeFromEnd( basePath, '/' ) + '/' + removeFromStart( folder, '/' ) 

def getFileName(filename):
	" Purpose: helper function to extrapolate the filename " 
	for splitChar in ["/", "\\"]:
		array = filename.split(splitChar)
		if (len(array) > 1):
			filename = array[-1]
	return filename

def sanitizeFolderName( newFolderName ):
	"Do a cleanup of the folder name to avoid possible problems"
	# Remove . \ / | : ? *
	return re.sub( '\\.|\\\\|\\/|\\||\\:|\\?|\\*', '_', newFolderName )

def sanitizeFileName( newFileName ):
	"Do a cleanup of the file name to avoid possible problems"
	# Replace dots in the name with underscores (only one dot can be there... security issue).
	if ( Config.ForceSingleExtension ): # remove dots
		newFileName = re.sub ( '/\\.(?![^.]*$)/', '_', newFileName ) ;
	newFileName = newFileName.replace('\\','/')		# convert windows to unix path
	newFileName = os.path.basename (newFileName)	# strip directories
	# Remove \ / | : ? *
	return re.sub ( '/\\\\|\\/|\\||\\:|\\?|\\*/', '_', newFileName )

def getCurrentFolder(currentFolder):
	if not currentFolder: 
		currentFolder = '/' 

	# Check the current folder syntax (must begin and end with a slash).
	if (currentFolder[-1] <> "/"):
		currentFolder += "/"
	if (currentFolder[0] <> "/"):
		currentFolder = "/" + currentFolder
				
	# Ensure the folder path has no double-slashes
	while '//' in currentFolder:
		currentFolder = currentFolder.replace('//','/') 

	# Check for invalid folder paths (..)
	if '..' in currentFolder:
		return None

	return currentFolder 

def mapServerPath( environ, url):
	" Emulate the asp Server.mapPath function. Given an url path return the physical directory that it corresponds to "
	# This isn't correct but for the moment there's no other solution
	# If this script is under a virtual directory or symlink it will detect the problem and stop
	return combinePaths( getRootPath(environ), url )

def mapServerFolder(resourceTypePath, folderPath):
	return combinePaths ( resourceTypePath  , folderPath ) 

def getRootPath(environ):
	"Purpose: returns the root path on the server"
	# WARNING: this may not be thread safe, and doesn't work w/ VirtualServer/mod_python
	# Use Config.UserFilesAbsolutePath instead

	if environ.has_key('DOCUMENT_ROOT'):
		return environ['DOCUMENT_ROOT']
	else:
		realPath = os.path.realpath( './' ) 
		selfPath = environ['SCRIPT_FILENAME']
		selfPath = selfPath [ :  selfPath.rfind( '/'  ) ] 		
		selfPath = selfPath.replace( '/', os.path.sep) 
		
		position = realPath.find(selfPath) 

		# This can check only that this script isn't run from a virtual dir
		# But it avoids the problems that arise if it isn't checked
		raise realPath 
		if ( position < 0 or position <> len(realPath) - len(selfPath) or realPath[ : position ]==''):
			raise Exception('Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/py/config.py".')
		return realPath[ : position ]




From blaine at qs1489.pair.com  Sat Feb  9 07:54:04 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:04 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/office2003/images
	toolbar.arrowright.gif, 1.2, 1.3 toolbar.bg.gif, 1.2,
	1.3 toolbar.buttonarrow.gif, 1.2, 1.3 toolbar.collapse.gif,
	1.2, 1.3 toolbar.end.gif, 1.2, 1.3 toolbar.expand.gif, 1.2,
	1.3 toolbar.separator.gif, 1.2, 1.3 toolbar.start.gif, 1.3, 1.4
Message-ID: <20080209125404.8120F10FE17@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/office2003/images
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/skins/office2003/images

Added Files:
	toolbar.arrowright.gif toolbar.bg.gif toolbar.buttonarrow.gif 
	toolbar.collapse.gif toolbar.end.gif toolbar.expand.gif 
	toolbar.separator.gif toolbar.start.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: toolbar.bg.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.expand.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.end.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.separator.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.collapse.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.start.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.arrowright.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.buttonarrow.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:03 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:03 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/default/images
	toolbar.arrowright.gif, 1.2, 1.3 toolbar.buttonarrow.gif, 1.2,
	1.3 toolbar.collapse.gif, 1.2, 1.3 toolbar.end.gif, 1.2,
	1.3 toolbar.expand.gif, 1.2, 1.3 toolbar.separator.gif, 1.2,
	1.3 toolbar.start.gif, 1.3, 1.4
Message-ID: <20080209125403.7AE3C10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/default/images
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/skins/default/images

Added Files:
	toolbar.arrowright.gif toolbar.buttonarrow.gif 
	toolbar.collapse.gif toolbar.end.gif toolbar.expand.gif 
	toolbar.separator.gif toolbar.start.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: toolbar.expand.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.end.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.separator.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.collapse.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.start.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.arrowright.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: toolbar.buttonarrow.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:04 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:04 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/skins/silver
	fck_dialog.css, 1.3, 1.4 fck_editor.css, 1.5,
	1.6 fck_strip.gif, 1.2, 1.3
Message-ID: <20080209125404.80E8710FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/silver
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/skins/silver

Added Files:
	fck_dialog.css fck_editor.css fck_strip.gif 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_dialog.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Styles used by the dialog boxes.
 */

body
{
	margin: 0px;
	padding: 10px;
	background-color: #f7f7f7;
}

body, td, input, select, textarea
{
	font-size: 11px;
	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
}

body, .BackColor
{
	background-color: #f7f7f7;
}

.PopupBody
{
	margin: 0px;
	padding: 0px;
}

.PopupTitle
{
	padding-right: 10px;
	padding-left: 10px;
	font-weight: bold;
	font-size: 14pt;
	padding-bottom: 3px;
	color: #504845;
	padding-top: 3px;
	background-color: #dedede;
}

.PopupButtons
{
	border-top: #cec6b5 1px solid;
	background-color: #DEDEDE;
	padding: 7px 10px 7px 10px;
}

.Button
{
	border: #7a7261 1px solid;
	color: #504845;
	background-color: #cec6b5;
}

#btnOk
{
	width: 100px;
}

.DarkBackground
{
	background-color: #d7d79f;
}

.LightBackground
{
	background-color: #ffffbe;
}

.PopupTitleBorder
{
	border-bottom: #cec6b5 1px solid;
}

.PopupTabArea
{
	color: #504845;
	background-color: #DEDEDE;
}

.PopupTabEmptyArea
{
	padding-left: 10px ;
	border-bottom: #cec6b5 1px solid;
}

.PopupTab, .PopupTabSelected
{
	border-right: #cec6b5 1px solid;
	border-top: #cec6b5 1px solid;
	border-left: #cec6b5 1px solid;
	padding: 3px 5px 3px 5px;
	color: #504845;
}

.PopupTab
{
	margin-top: 1px;
	border-bottom: #cec6b5 1px solid;
	cursor: pointer;
	cursor: hand;
}

.PopupTabSelected
{
	font-weight:bold;
	cursor: default;
	padding-top: 4px;
	border-bottom: #f1f1e3 1px solid;
	background-color: #f7f7f7;
}

.PopupSelectionBox
{
	border: #a9a9a9 1px solid !important;
	background-color: #dcdcdc !important;
	cursor: pointer;
	cursor: hand;
}

#tdBrowse 
{
	vertical-align: bottom;
}
--- NEW FILE: fck_editor.css ---
/*
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Styles used by the editor IFRAME and Toolbar.
 */

/*
	### Basic Editor IFRAME Styles.
*/

body
{
	padding: 1px;
	margin: 0;
	background-color: #ffffff;
}

#xEditingArea
{
	border: #696969 1px solid;
}

.SourceField
{
	padding: 5px;
	margin: 0px;
	font-family: Monospace;
}

/*
	Toolbar
*/

.TB_ToolbarSet, .TB_Expand, .TB_Collapse
{
    cursor: default;
	background-color: #f7f7f7;
}

.TB_ToolbarSet
{
	padding: 1px;
	border-top: #efefde 1px outset;
	border-bottom: #efefde 1px outset;
}

.TB_ToolbarSet TD
{
	font-size: 11px;
	font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.TB_Toolbar
{
    display: inline-table;
}

.TB_Separator
{
    width: 1px;
    height: 21px;
    margin: 2px;
    background-color: #C6C3BD;
}

.TB_Start
{
    background-image: url(images/toolbar.start.gif);
    margin-left: 2px;
    margin-right: 2px;
    width: 3px;
    background-repeat: no-repeat;
    height: 27px;
    background-position: center center;
}

.TB_End
{
	display: none;
}

.TB_ExpandImg
{
	background-image: url(images/toolbar.expand.gif);
	background-repeat: no-repeat;
}

.TB_CollapseImg
{
	background-image: url(images/toolbar.collapse.gif);
	background-repeat: no-repeat;
}

.TB_SideBorder
{
	background-color: #696969;
}

.TB_Expand, .TB_Collapse
{
	padding: 2px 2px 2px 2px;
	border: #efefde 1px outset;
}

.TB_Collapse
{
	border: #efefde 1px outset;
	width: 5px;
}

.TB_Break
{
	height: 27px;
}

/*
	Toolbar Button
*/

.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
{
	padding: 1px ;
	margin:1px;
	height: 21px;
}

.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
{
	border: #cec6b5 1px solid;
}

.TB_Button_On
{
	border-color: #316ac5;
	background-color: #c1d2ee;
}

.TB_Button_On_Over, .TB_Button_Off_Over
{
    border: #316ac5 1px solid;
    background-color: #dff1ff;
}

.TB_Button_Off
{
	background: #efefef url(images/toolbar.buttonbg.gif) repeat-x;
}

.TB_Button_Off, .TB_Combo_Off
{
	opacity: 0.70; /* Safari, Opera and Mozilla */
	filter: alpha(opacity=70); /* IE */
	/* -moz-opacity: 0.70; Mozilla (Old) */
}

.TB_Button_Disabled
{
    opacity: 0.30; /* Safari, Opera and Mozilla */
    filter: gray() alpha(opacity=30); /* IE */
}

.TB_Button_Padding
{
    visibility: hidden;
    width: 3px;
    height: 21px;
}

.TB_Button_Image
{
    overflow: hidden;
    width: 16px;
    height: 16px;
    margin: 3px;
    margin-top: 4px;
    margin-bottom: 2px;
    background-repeat: no-repeat;
}

/* For composed button ( icon + text, icon + arrow ), we must compensate the table */
.TB_Button_On TABLE .TB_Button_Image,
.TB_Button_Off TABLE .TB_Button_Image,
.TB_Button_On_Over TABLE .TB_Button_Image,
.TB_Button_Off_Over TABLE .TB_Button_Image,
.TB_Button_Disabled TABLE .TB_Button_Image
{
    margin-top: 3px;
}

.TB_Button_Image img
{
    position: relative;
}

.TB_ConnectionLine
{
    background-color: #ffffff;
    height: 1px;
    margin-left: 1px;   /* ltr */
    margin-right: 1px;  /* rtl */
}

/*
	Menu
*/

.MN_Menu
{
    border: 1px solid #8f8f73;
    padding: 2px;
    background-color: #f7f7f7;
    cursor: default;
}

.MN_Menu, .MN_Menu .MN_Label
{
    font-size: 11px;
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.MN_Item_Padding
{
    visibility: hidden;
    width: 3px;
    height: 20px;
}

.MN_Icon
{
    background-color: #dedede;
    text-align: center;
    height: 20px;
}

.MN_Label
{
    padding-left: 3px;
    padding-right: 3px;
}

.MN_Separator
{
    height: 3px;
}

.MN_Separator_Line
{
    border-top: #b9b99d 1px solid;
}

.MN_Item .MN_Icon IMG
{
    filter: alpha(opacity=70);
    opacity: 0.70;
}

.MN_Item_Over
{
    color: #ffffff;
    background-color: #8a857d;
}

.MN_Item_Over .MN_Icon
{
    background-color: #6c6761;
}

.MN_Item_Disabled IMG
{
    filter: gray() alpha(opacity=30); /* IE */
    opacity: 0.30; /* Safari, Opera and Mozilla */
}

.MN_Item_Disabled .MN_Label
{
    color: #b7b7b7;
}

.MN_Arrow
{
    padding-right: 3px;
    padding-left: 3px;
}

.MN_ConnectionLine
{
    background-color: #ffffff;
}

.Menu .TB_Button_On, .Menu .TB_Button_On_Over
{
    border: #8f8f73 1px solid;
    background-color: #ffffff;
}

/*
	### Panel Styles
*/

.FCK_Panel
{
    border: #8f8f73 1px solid;
    padding: 2px;
    background-color: #ffffff;
}

.FCK_Panel, .FCK_Panel TD
{
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
    font-size: 11px;
}

/*
	### Special Combos
*/

.SC_Panel
{
    overflow: auto;
    white-space: nowrap;
    cursor: default;
    border: 1px solid #8f8f73;
    padding-left: 2px;
    padding-right: 2px;
}

.SC_Panel, .SC_Panel TD
{
    font-size: 11px;
    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
}

.SC_Item, .SC_ItemSelected
{
    margin-top: 2px;
    margin-bottom: 2px;
    background-position: left center;
    padding-left: 11px;
    padding-right: 3px;
    padding-top: 2px;
    padding-bottom: 2px;
    text-overflow: ellipsis;
    overflow: hidden;
    background-repeat: no-repeat;
    border: #dddddd 1px solid;
}

.SC_Item *, .SC_ItemSelected *
{
    margin-top: 0px;
    margin-bottom: 0px;
}

.SC_ItemSelected
{
    border: #9a9afb 1px solid;
    background-image: url(images/toolbar.arrowright.gif);
}

.SC_ItemOver
{
    border: #316ac5 1px solid;
}

.SC_Field
{
    margin-top:1px ;
    border: #b7b7a6 1px solid;
    cursor: default;
}

.SC_FieldCaption
{
    padding-top: 1px ;
    overflow: visible;
    padding-right: 5px;
    padding-left: 5px;
    opacity: 0.75; /* Safari, Opera and Mozilla */
    filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
    height: 23px;
    background-color: #f7f7f7;
}

.SC_FieldLabel
{
    white-space: nowrap;
    padding: 2px;
    width: 100%;
    cursor: default;
    background-color: #ffffff;
    text-overflow: ellipsis;
    overflow: hidden;
}

.SC_FieldButton
{
    background-position: center center;
    background-image: url(images/toolbar.buttonarrow.gif);
    border-left: #b7b7a6 1px solid;
    width: 14px;
    background-repeat: no-repeat;
}

.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption
{
    opacity: 0.30; /* Safari, Opera and Mozilla */
    filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
}

.SC_FieldOver
{
    border: #316ac5 1px solid;
}

.SC_FieldOver .SC_FieldButton
{
    border-left: #316ac5 1px solid;
}

/*
	### Color Selector Panel
*/

.ColorBoxBorder
{
    border: #808080 1px solid;
    position: static;
}

.ColorBox
{
    font-size: 1px;
    width: 10px;
    position: static;
    height: 10px;
}

.ColorDeselected, .ColorSelected
{
    cursor: default;
}

.ColorDeselected
{
    border: #ffffff 1px solid;
    padding: 2px;
    float: left;
}

.ColorSelected
{
    border: #316ac5 1px solid;
    padding: 2px;
    float: left;
    background-color: #c1d2ee;
}

--- NEW FILE: fck_strip.gif ---
(This appears to be a binary file; contents omitted.)



From blaine at qs1489.pair.com  Sat Feb  9 07:54:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sat, 09 Feb 2008 12:54:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog
	fck_about.html, 1.5, 1.6 fck_anchor.html, 1.5,
	1.6 fck_button.html, 1.3, 1.4 fck_checkbox.html, 1.4,
	1.5 fck_colorselector.html, 1.3, 1.4 fck_docprops.html, 1.4,
	1.5 fck_flash.html, 1.3, 1.4 fck_form.html, 1.3,
	1.4 fck_hiddenfield.html, 1.3, 1.4 fck_image.html, 1.6,
	1.7 fck_link.html, 1.5, 1.6 fck_listprop.html, 1.4,
	1.5 fck_paste.html, 1.4, 1.5 fck_radiobutton.html, 1.4,
	1.5 fck_replace.html, 1.3, 1.4 fck_select.html, 1.3,
	1.4 fck_smiley.html, 1.4, 1.5 fck_source.html, 1.3,
	1.4 fck_specialchar.html, 1.5, 1.6 fck_spellerpages.html, 1.3,
	1.4 fck_table.html, 1.5, 1.6 fck_tablecell.html, 1.3,
	1.4 fck_template.html, 1.5, 1.6 fck_textarea.html, 1.3,
	1.4 fck_textfield.html, 1.3, 1.4
Message-ID: <20080209125401.CC7EE10FE1C@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog
In directory qs1489.pair.com:/tmp/cvs-serv26402/editor/dialog

Added Files:
	fck_about.html fck_anchor.html fck_button.html 
	fck_checkbox.html fck_colorselector.html fck_docprops.html 
	fck_flash.html fck_form.html fck_hiddenfield.html 
	fck_image.html fck_link.html fck_listprop.html fck_paste.html 
	fck_radiobutton.html fck_replace.html fck_select.html 
	fck_smiley.html fck_source.html fck_specialchar.html 
	fck_spellerpages.html fck_table.html fck_tablecell.html 
	fck_template.html fck_textarea.html fck_textfield.html 
Log Message:
Upgrade to v2.5.1 of FCKeditor

--- NEW FILE: fck_table.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Table dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>Table Properties</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="robots" content="noindex, nofollow" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;

// Gets the table if there is one selected.
var table ;
var e = oEditor.FCKSelection.GetSelectedElement() ;

if ( ( !e && document.location.search.substr(1) == 'Parent' ) || ( e && e.tagName != 'TABLE' ) )
	e = oEditor.FCKSelection.MoveToAncestorNode( 'TABLE' ) ;

if ( e && e.tagName == "TABLE" )
	table = e ;

// Fired when the window loading process is finished. It sets the fields with the
// actual values if a table is selected in the editor.
window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	if (table)
	{
		document.getElementById('txtRows').value    = table.rows.length ;
		document.getElementById('txtColumns').value = table.rows[0].cells.length ;

		// Gets the value from the Width or the Style attribute
		var iWidth  = (table.style.width  ? table.style.width  : table.width ) ;
		var iHeight = (table.style.height ? table.style.height : table.height ) ;

		if (iWidth.indexOf('%') >= 0)			// Percentual = %
		{
			iWidth = parseInt( iWidth.substr(0,iWidth.length - 1), 10 ) ;
			document.getElementById('selWidthType').value = "percent" ;
		}
		else if (iWidth.indexOf('px') >= 0)		// Style Pixel = px
		{																										  //
			iWidth = iWidth.substr(0,iWidth.length - 2);
			document.getElementById('selWidthType').value = "pixels" ;
		}

		if (iHeight && iHeight.indexOf('px') >= 0)		// Style Pixel = px
			iHeight = iHeight.substr(0,iHeight.length - 2);

		document.getElementById('txtWidth').value		= iWidth || '' ;
		document.getElementById('txtHeight').value		= iHeight || '' ;
		document.getElementById('txtBorder').value		= GetAttribute( table, 'border', '' ) ;
		document.getElementById('selAlignment').value	= GetAttribute( table, 'align', '' ) ;
		document.getElementById('txtCellPadding').value	= GetAttribute( table, 'cellPadding', '' ) ;
		document.getElementById('txtCellSpacing').value	= GetAttribute( table, 'cellSpacing', '' ) ;
		document.getElementById('txtSummary').value     = GetAttribute( table, 'summary', '' ) ;
//		document.getElementById('cmbFontStyle').value	= table.className ;

		var eCaption = oEditor.FCKDomTools.GetFirstChild( table, 'CAPTION' ) ;
		if ( eCaption ) document.getElementById('txtCaption').value = eCaption.innerHTML ;

		document.getElementById('txtRows').disabled    = true ;
		document.getElementById('txtColumns').disabled = true ;
	}

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

// Fired when the user press the OK button
function Ok()
{
	var bExists = ( table != null ) ;

	if ( ! bExists )
		table = oEditor.FCK.EditorDocument.createElement( "TABLE" ) ;

	// Removes the Width and Height styles
	if ( bExists && table.style.width )		table.style.width = null ; //.removeAttribute("width") ;
	if ( bExists && table.style.height )	table.style.height = null ; //.removeAttribute("height") ;

	var sWidth = GetE('txtWidth').value ;
	if ( sWidth.length > 0 && GetE('selWidthType').value == 'percent' )
		sWidth += '%' ;

	SetAttribute( table, 'width'		, sWidth ) ;
	SetAttribute( table, 'height'		, GetE('txtHeight').value ) ;
	SetAttribute( table, 'border'		, GetE('txtBorder').value ) ;
	SetAttribute( table, 'align'		, GetE('selAlignment').value ) ;
	SetAttribute( table, 'cellPadding'	, GetE('txtCellPadding').value ) ;
	SetAttribute( table, 'cellSpacing'	, GetE('txtCellSpacing').value ) ;
	SetAttribute( table, 'summary'		, GetE('txtSummary').value ) ;

	var eCaption = oEditor.FCKDomTools.GetFirstChild( table, 'CAPTION' ) ;

	if ( document.getElementById('txtCaption').value != '')
	{
		if ( !eCaption )
		{
			eCaption = oEditor.FCK.EditorDocument.createElement( 'CAPTION' ) ;
			table.insertBefore( eCaption, table.firstChild ) ;
		}

		eCaption.innerHTML = document.getElementById('txtCaption').value ;
	}
	else if ( bExists && eCaption )
	{
		// TODO: It causes an IE internal error if using removeChild or
		// table.deleteCaption() (see #505).
		if ( oEditor.FCKBrowserInfo.IsIE )
			eCaption.innerHTML = '' ;
		else
			eCaption.parentNode.removeChild( eCaption ) ;
	}

	if (! bExists)
	{
		var iRows = document.getElementById('txtRows').value ;
		var iCols = document.getElementById('txtColumns').value ;

		for ( var r = 0 ; r < iRows ; r++ )
		{
			var oRow = table.insertRow(-1) ;
			for ( var c = 0 ; c < iCols ; c++ )
			{
				var oCell = oRow.insertCell(-1) ;
				if ( oEditor.FCKBrowserInfo.IsGeckoLike )
					oEditor.FCKTools.AppendBogusBr( oCell ) ;
			}
		}

		oEditor.FCKUndo.SaveUndoStep() ;

		oEditor.FCK.InsertElement( table ) ;
	}

	return true ;
}

	</script>
</head>
<body style="overflow: hidden">
	<table id="otable" cellspacing="0" cellpadding="0" width="100%" border="0" style="height: 100%">
		<tr>
			<td>
				<table cellspacing="1" cellpadding="1" width="100%" border="0">
					<tr>
						<td valign="top">
							<table cellspacing="0" cellpadding="0" border="0">
								<tr>
									<td>
										<span fcklang="DlgTableRows">Rows</span>:</td>
									<td>
										&nbsp;<input id="txtRows" type="text" maxlength="3" size="2" value="3" name="txtRows"
											onkeypress="return IsDigit(event);" /></td>
								</tr>
								<tr>
									<td>
										<span fcklang="DlgTableColumns">Columns</span>:</td>
									<td>
										&nbsp;<input id="txtColumns" type="text" maxlength="2" size="2" value="2" name="txtColumns"
											onkeypress="return IsDigit(event);" /></td>
								</tr>
								<tr>
									<td>
										&nbsp;</td>
									<td>
										&nbsp;</td>
								</tr>
								<tr>
									<td>
										<span fcklang="DlgTableBorder">Border size</span>:</td>
									<td>
										&nbsp;<input id="txtBorder" type="text" maxlength="2" size="2" value="1" name="txtBorder"
											onkeypress="return IsDigit(event);" /></td>
								</tr>
								<tr>
									<td>
										<span fcklang="DlgTableAlign">Alignment</span>:</td>
									<td>
										&nbsp;<select id="selAlignment" name="selAlignment">
											<option fcklang="DlgTableAlignNotSet" value="" selected="selected">&lt;Not set&gt;</option>
											<option fcklang="DlgTableAlignLeft" value="left">Left</option>
											<option fcklang="DlgTableAlignCenter" value="center">Center</option>
											<option fcklang="DlgTableAlignRight" value="right">Right</option>
										</select></td>
								</tr>
							</table>
						</td>
						<td>
							&nbsp;&nbsp;&nbsp;</td>
						<td align="right" valign="top">
							<table cellspacing="0" cellpadding="0" border="0">
								<tr>
									<td>
										<span fcklang="DlgTableWidth">Width</span>:</td>
									<td>
										&nbsp;<input id="txtWidth" type="text" maxlength="4" size="3" value="200" name="txtWidth"
											onkeypress="return IsDigit(event);" /></td>
									<td>
										&nbsp;<select id="selWidthType" name="selWidthType">
											<option fcklang="DlgTableWidthPx" value="pixels" selected="selected">pixels</option>
											<option fcklang="DlgTableWidthPc" value="percent">percent</option>
										</select></td>
								</tr>
								<tr>
									<td>
										<span fcklang="DlgTableHeight">Height</span>:</td>
									<td>
										&nbsp;<input id="txtHeight" type="text" maxlength="4" size="3" name="txtHeight" onkeypress="return IsDigit(event);" /></td>
									<td>
										&nbsp;<span fcklang="DlgTableWidthPx">pixels</span></td>
								</tr>
								<tr>
									<td>
										&nbsp;</td>
									<td>
										&nbsp;</td>
									<td>
										&nbsp;</td>
								</tr>
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgTableCellSpace">Cell spacing</span>:</td>
									<td>
										&nbsp;<input id="txtCellSpacing" type="text" maxlength="2" size="2" value="1" name="txtCellSpacing"
											onkeypress="return IsDigit(event);" /></td>
									<td>
										&nbsp;</td>
								</tr>
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgTableCellPad">Cell padding</span>:</td>
									<td>
										&nbsp;<input id="txtCellPadding" type="text" maxlength="2" size="2" value="1" name="txtCellPadding"
											onkeypress="return IsDigit(event);" /></td>
									<td>
										&nbsp;</td>
								</tr>
							</table>
						</td>
					</tr>
				</table>
				<table cellspacing="0" cellpadding="0" width="100%" border="0">
					<tr>
						<td nowrap="nowrap">
							<span fcklang="DlgTableCaption">Caption</span>:&nbsp;</td>
						<td>
							&nbsp;</td>
						<td width="100%" nowrap="nowrap">
							<input id="txtCaption" type="text" style="width: 100%" /></td>
					</tr>
					<tr>
						<td nowrap="nowrap">
							<span fcklang="DlgTableSummary">Summary</span>:&nbsp;</td>
						<td>
							&nbsp;</td>
						<td width="100%" nowrap="nowrap">
							<input id="txtSummary" type="text" style="width: 100%" /></td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fck_template.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Template selection dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title></title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="robots" content="noindex, nofollow" />
	<style type="text/css">
			.TplList
			{
				border: #dcdcdc 2px solid;
				background-color: #ffffff;
				overflow: auto;
				width: 90%;
			}

			.TplItem
			{
				margin: 5px;
				padding: 7px;
				border: #eeeeee 1px solid;
			}

			.TplItem TABLE
			{
				display: inline;
			}

			.TplTitle
			{
				font-weight: bold;
			}
		</style>
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor		= window.parent.InnerDialogLoaded() ;
var FCK			= oEditor.FCK ;
var FCKLang		= oEditor.FCKLang ;
var FCKConfig	= oEditor.FCKConfig ;

window.onload = function()
{
	// Set the right box height (browser dependent).
	GetE('eList').style.height = document.all ? '100%' : '295px' ;

	// Translate the dialog box texts.
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	GetE('xChkReplaceAll').checked = ( FCKConfig.TemplateReplaceAll !== false ) ;

	if ( FCKConfig.TemplateReplaceCheckbox !== false )
		GetE('xReplaceBlock').style.display = '' ;

	window.parent.SetAutoSize( true ) ;

	LoadTemplatesXml() ;
}

function LoadTemplatesXml()
{
	var oTemplate ;

	if ( !FCK._Templates )
	{
		GetE('eLoading').style.display = '' ;

		// Create the Templates array.
		FCK._Templates = new Array() ;

		// Load the XML file.
		var oXml = new oEditor.FCKXml() ;
		oXml.LoadUrl( FCKConfig.TemplatesXmlPath ) ;

		// Get the Images Base Path.
		var oAtt = oXml.SelectSingleNode( 'Templates/@imagesBasePath' ) ;
		var sImagesBasePath = oAtt ? oAtt.value : '' ;

		// Get the "Template" nodes defined in the XML file.
		var aTplNodes = oXml.SelectNodes( 'Templates/Template' ) ;

		for ( var i = 0 ; i < aTplNodes.length ; i++ )
		{
			var oNode = aTplNodes[i] ;

			oTemplate = new Object() ;

			var oPart ;

			// Get the Template Title.
			if ( (oPart = oNode.attributes.getNamedItem('title')) )
				oTemplate.Title = oPart.value ;
			else
				oTemplate.Title = 'Template ' + ( i + 1 ) ;

			// Get the Template Description.
			if ( (oPart = oXml.SelectSingleNode( 'Description', oNode )) )
				oTemplate.Description = oPart.text ? oPart.text : oPart.textContent ;

			// Get the Template Image.
			if ( (oPart = oNode.attributes.getNamedItem('image')) )
				oTemplate.Image = sImagesBasePath + oPart.value ;

			// Get the Template HTML.
			if ( (oPart = oXml.SelectSingleNode( 'Html', oNode )) )
				oTemplate.Html = oPart.text ? oPart.text : oPart.textContent ;
			else
			{
				alert( 'No HTML defined for template index ' + i + '. Please review the "' + FCKConfig.TemplatesXmlPath + '" file.' ) ;
				continue ;
			}

			FCK._Templates[ FCK._Templates.length ] = oTemplate ;
		}

		GetE('eLoading').style.display = 'none' ;
	}

	if ( FCK._Templates.length == 0 )
		GetE('eEmpty').style.display = '' ;
	else
	{
		for ( var j = 0 ; j < FCK._Templates.length ; j++ )
		{
			oTemplate = FCK._Templates[j] ;

			var oItemDiv = GetE('eList').appendChild( document.createElement( 'DIV' ) ) ;
			oItemDiv.TplIndex = j ;
			oItemDiv.className = 'TplItem' ;

			// Build the inner HTML of our new item DIV.
			var sInner = '<table><tr>' ;

			if ( oTemplate.Image )
				sInner += '<td valign="top"><img src="' + oTemplate.Image + '"><\/td>' ;

			sInner += '<td valign="top"><div class="TplTitle">' + oTemplate.Title + '<\/div>' ;

			if ( oTemplate.Description )
				sInner += '<div>' + oTemplate.Description + '<\/div>' ;

			sInner += '<\/td><\/tr><\/table>' ;

			oItemDiv.innerHTML = sInner ;

			oItemDiv.onmouseover = ItemDiv_OnMouseOver ;
			oItemDiv.onmouseout = ItemDiv_OnMouseOut ;
			oItemDiv.onclick = ItemDiv_OnClick ;
		}
	}
}

function ItemDiv_OnMouseOver()
{
	this.className += ' PopupSelectionBox' ;
}

function ItemDiv_OnMouseOut()
{
	this.className = this.className.replace( /\s*PopupSelectionBox\s*/, '' ) ;
}

function ItemDiv_OnClick()
{
	SelectTemplate( this.TplIndex ) ;
}

function SelectTemplate( index )
{
	oEditor.FCKUndo.SaveUndoStep() ;

	if ( GetE('xChkReplaceAll').checked )
		FCK.SetData( FCK._Templates[index].Html ) ;
	else
		FCK.InsertHtml( FCK._Templates[index].Html ) ;

	window.parent.Cancel( true ) ;
}

	</script>
</head>
<body style="overflow: hidden">
	<table width="100%" style="height: 100%">
		<tr>
			<td align="center">
				<span fcklang="DlgTemplatesSelMsg">Please select the template to open in the editor<br />
					(the actual contents will be lost):</span>
			</td>
		</tr>
		<tr>
			<td height="100%" align="center">
				<div id="eList" align="left" class="TplList">
					<div id="eLoading" align="center" style="display: none">
						<br />
						<span fcklang="DlgTemplatesLoading">Loading templates list. Please wait...</span>
					</div>
					<div id="eEmpty" align="center" style="display: none">
						<br />
						<span fcklang="DlgTemplatesNoTpl">(No templates defined)</span>
					</div>
				</div>
			</td>
		</tr>
		<tr id="xReplaceBlock" style="display: none">
			<td>
				<table cellpadding="0" cellspacing="0">
					<tr>
						<td>
							<input id="xChkReplaceAll" type="checkbox" /></td>
						<td>
							&nbsp;</td>
						<td>
							<label for="xChkReplaceAll" fcklang="DlgTemplatesReplace">
								Replace actual contents</label></td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fck_radiobutton.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Radio Button dialog window.
-->
<html>
	<head>
		<title>Radio Button Properties</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta content="noindex, nofollow" name="robots">
		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
		<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;

var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	if ( oActiveEl && oActiveEl.tagName.toUpperCase() == 'INPUT' && oActiveEl.type == 'radio' )
	{
		GetE('txtName').value		= oActiveEl.name ;
		GetE('txtValue').value		= oEditor.FCKBrowserInfo.IsIE ? oActiveEl.value : GetAttribute( oActiveEl, 'value' ) ;
		GetE('txtSelected').checked	= oActiveEl.checked ;
	}
	else
		oActiveEl = null ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function Ok()
{
	oEditor.FCKUndo.SaveUndoStep() ;
	
	if ( !oActiveEl )
	{
		oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
		oActiveEl.type = 'radio' ;
		oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
	}

	if ( GetE('txtName').value.length > 0 )
		oActiveEl.name = GetE('txtName').value ;

	if ( oEditor.FCKBrowserInfo.IsIE )
		oActiveEl.value = GetE('txtValue').value ;
	else
		SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;

	var bIsChecked = GetE('txtSelected').checked ;
	SetAttribute( oActiveEl, 'checked', bIsChecked ? 'checked' : null ) ;	// For Firefox
	oActiveEl.checked = bIsChecked ;

	return true ;
}

		</script>
	</head>
	<body style="OVERFLOW: hidden" scroll="no">
		<table height="100%" width="100%">
			<tr>
				<td align="center">
					<table border="0" cellpadding="0" cellspacing="0" width="80%">
						<tr>
							<td>
								<span fckLang="DlgCheckboxName">Name</span><br>
								<input type="text" size="20" id="txtName" style="WIDTH: 100%">
							</td>
						</tr>
						<tr>
							<td>
								<span fckLang="DlgCheckboxValue">Value</span><br>
								<input type="text" size="20" id="txtValue" style="WIDTH: 100%">
							</td>
						</tr>
						<tr>
							<td><input type="checkbox" id="txtSelected"><label for="txtSelected" fckLang="DlgCheckboxSelected">Checked</label></td>
						</tr>
					</table>
				</td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: fck_hiddenfield.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Hidden Field dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>Hidden Field Properties</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta content="noindex, nofollow" name="robots" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;
var FCK = oEditor.FCK ;

// Gets the document DOM
var oDOM = FCK.EditorDocument ;

// Get the selected flash embed (if available).
var oFakeImage = FCK.Selection.GetSelectedElement() ;
var oActiveEl ;

if ( oFakeImage )
{
	if ( oFakeImage.tagName == 'IMG' && oFakeImage.getAttribute('_fckinputhidden') )
		oActiveEl = FCK.GetRealElement( oFakeImage ) ;
	else
		oFakeImage = null ;
}

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	if ( oActiveEl )
	{
		GetE('txtName').value		= oActiveEl.name ;
		GetE('txtValue').value		= oActiveEl.value ;
	}

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}


function Ok()
{
	oEditor.FCKUndo.SaveUndoStep() ;
	
	if ( !oActiveEl )
	{
		oActiveEl = FCK.EditorDocument.createElement( 'INPUT' ) ;
		oActiveEl.type = 'hidden' ;

		oFakeImage = null ;
	}

	oActiveEl.name = GetE('txtName').value ;
	SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;

	if ( !oFakeImage )
	{
		oFakeImage	= oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__InputHidden', oActiveEl ) ;
		oFakeImage.setAttribute( '_fckinputhidden', 'true', 0 ) ;
		oFakeImage	= FCK.InsertElement( oFakeImage ) ;
	}
	else
		oEditor.FCKUndo.SaveUndoStep() ;

	oEditor.FCKFlashProcessor.RefreshView( oFakeImage, oActiveEl ) ;

	return true ;
}

	</script>
</head>
<body style="overflow: hidden" scroll="no">
	<table height="100%" width="100%">
		<tr>
			<td align="center">
				<table border="0" class="inhoud" cellpadding="0" cellspacing="0" width="80%">
					<tr>
						<td>
							<span fcklang="DlgHiddenName">Name</span><br />
							<input type="text" size="20" id="txtName" style="width: 100%" />
						</td>
					</tr>
					<tr>
						<td>
							<span fcklang="DlgHiddenValue">Value</span><br />
							<input type="text" size="30" id="txtValue" style="width: 100%" />
						</td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fck_link.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Link dialog window.
-->
<html>
	<head>
		<title>Link Properties</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
		<meta name="robots" content="noindex, nofollow" />
		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
		<script src="fck_link/fck_link.js" type="text/javascript"></script>
	</head>
	<body scroll="no" style="OVERFLOW: hidden">
		<div id="divInfo" style="DISPLAY: none">
			<span fckLang="DlgLnkType">Link Type</span><br />
			<select id="cmbLinkType" onchange="SetLinkType(this.value);">
				<option value="url" fckLang="DlgLnkTypeURL" selected="selected">URL</option>
				<option value="anchor" fckLang="DlgLnkTypeAnchor">Anchor in this page</option>
				<option value="email" fckLang="DlgLnkTypeEMail">E-Mail</option>
			</select>
			<br />
			<br />
			<div id="divLinkTypeUrl">
				<table cellspacing="0" cellpadding="0" width="100%" border="0" dir="ltr">
					<tr>
						<td nowrap="nowrap">
							<span fckLang="DlgLnkProto">Protocol</span><br />
							<select id="cmbLinkProtocol">
								<option value="http://" selected="selected">http://</option>
								<option value="https://">https://</option>
								<option value="ftp://">ftp://</option>
								<option value="news://">news://</option>
								<option value="" fckLang="DlgLnkProtoOther">&lt;other&gt;</option>
							</select>
						</td>
						<td nowrap="nowrap">&nbsp;</td>
						<td nowrap="nowrap" width="100%">
							<span fckLang="DlgLnkURL">URL</span><br />
							<input id="txtUrl" style="WIDTH: 100%" type="text" onkeyup="OnUrlChange();" onchange="OnUrlChange();" />
						</td>
					</tr>
				</table>
				<br />
				<div id="divBrowseServer">
				<input type="button" value="Browse Server" fckLang="DlgBtnBrowseServer" onclick="BrowseServer();" />
				</div>
			</div>
			<div id="divLinkTypeAnchor" style="DISPLAY: none" align="center">
				<div id="divSelAnchor" style="DISPLAY: none">
					<table cellspacing="0" cellpadding="0" border="0" width="70%">
						<tr>
							<td colspan="3">
								<span fckLang="DlgLnkAnchorSel">Select an Anchor</span>
							</td>
						</tr>
						<tr>
							<td width="50%">
								<span fckLang="DlgLnkAnchorByName">By Anchor Name</span><br />
								<select id="cmbAnchorName" onchange="GetE('cmbAnchorId').value='';" style="WIDTH: 100%">
									<option value="" selected="selected"></option>
								</select>
							</td>
							<td>&nbsp;&nbsp;&nbsp;</td>
							<td width="50%">
								<span fckLang="DlgLnkAnchorById">By Element Id</span><br />
								<select id="cmbAnchorId" onchange="GetE('cmbAnchorName').value='';" style="WIDTH: 100%">
									<option value="" selected="selected"></option>
								</select>
							</td>
						</tr>
					</table>
				</div>
				<div id="divNoAnchor" style="DISPLAY: none">
					<span fckLang="DlgLnkNoAnchors">&lt;No anchors available in the document&gt;</span>
				</div>
			</div>
			<div id="divLinkTypeEMail" style="DISPLAY: none">
				<span fckLang="DlgLnkEMail">E-Mail Address</span><br />
				<input id="txtEMailAddress" style="WIDTH: 100%" type="text" /><br />
				<span fckLang="DlgLnkEMailSubject">Message Subject</span><br />
				<input id="txtEMailSubject" style="WIDTH: 100%" type="text" /><br />
				<span fckLang="DlgLnkEMailBody">Message Body</span><br />
				<textarea id="txtEMailBody" style="WIDTH: 100%" rows="3" cols="20"></textarea>
			</div>
		</div>
		<div id="divUpload" style="DISPLAY: none">
			<form id="frmUpload" method="post" target="UploadWindow" enctype="multipart/form-data" action="" onsubmit="return CheckUpload();">
				<span fckLang="DlgLnkUpload">Upload</span><br />
				<input id="txtUploadFile" style="WIDTH: 100%" type="file" size="40" name="NewFile" /><br />
				<br />
				<input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
				<iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe>
			</form>
		</div>
		<div id="divTarget" style="DISPLAY: none">
			<table cellspacing="0" cellpadding="0" width="100%" border="0">
				<tr>
					<td nowrap="nowrap">
						<span fckLang="DlgLnkTarget">Target</span><br />
						<select id="cmbTarget" onchange="SetTarget(this.value);">
							<option value="" fckLang="DlgGenNotSet" selected="selected">&lt;not set&gt;</option>
							<option value="frame" fckLang="DlgLnkTargetFrame">&lt;frame&gt;</option>
							<option value="popup" fckLang="DlgLnkTargetPopup">&lt;popup window&gt;</option>
							<option value="_blank" fckLang="DlgLnkTargetBlank">New Window (_blank)</option>
							<option value="_top" fckLang="DlgLnkTargetTop">Topmost Window (_top)</option>
							<option value="_self" fckLang="DlgLnkTargetSelf">Same Window (_self)</option>
							<option value="_parent" fckLang="DlgLnkTargetParent">Parent Window (_parent)</option>
						</select>
					</td>
					<td>&nbsp;</td>
					<td id="tdTargetFrame" nowrap="nowrap" width="100%">
						<span fckLang="DlgLnkTargetFrameName">Target Frame Name</span><br />
						<input id="txtTargetFrame" style="WIDTH: 100%" type="text" onkeyup="OnTargetNameChange();"
							onchange="OnTargetNameChange();" />
					</td>
					<td id="tdPopupName" style="DISPLAY: none" nowrap="nowrap" width="100%">
						<span fckLang="DlgLnkPopWinName">Popup Window Name</span><br />
						<input id="txtPopupName" style="WIDTH: 100%" type="text" />
					</td>
				</tr>
			</table>
			<br />
			<table id="tablePopupFeatures" style="DISPLAY: none" cellspacing="0" cellpadding="0" align="center"
				border="0">
				<tr>
					<td>
						<span fckLang="DlgLnkPopWinFeat">Popup Window Features</span><br />
						<table cellspacing="0" cellpadding="0" border="0">
							<tr>
								<td valign="top" nowrap="nowrap" width="50%">
									<input id="chkPopupResizable" name="chkFeature" value="resizable" type="checkbox" /><label for="chkPopupResizable" fckLang="DlgLnkPopResize">Resizable</label><br />
									<input id="chkPopupLocationBar" name="chkFeature" value="location" type="checkbox" /><label for="chkPopupLocationBar" fckLang="DlgLnkPopLocation">Location
										Bar</label><br />
									<input id="chkPopupManuBar" name="chkFeature" value="menubar" type="checkbox" /><label for="chkPopupManuBar" fckLang="DlgLnkPopMenu">Menu
										Bar</label><br />
									<input id="chkPopupScrollBars" name="chkFeature" value="scrollbars" type="checkbox" /><label for="chkPopupScrollBars" fckLang="DlgLnkPopScroll">Scroll
										Bars</label>
								</td>
								<td></td>
								<td valign="top" nowrap="nowrap" width="50%">
									<input id="chkPopupStatusBar" name="chkFeature" value="status" type="checkbox" /><label for="chkPopupStatusBar" fckLang="DlgLnkPopStatus">Status
										Bar</label><br />
									<input id="chkPopupToolbar" name="chkFeature" value="toolbar" type="checkbox" /><label for="chkPopupToolbar" fckLang="DlgLnkPopToolbar">Toolbar</label><br />
									<input id="chkPopupFullScreen" name="chkFeature" value="fullscreen" type="checkbox" /><label for="chkPopupFullScreen" fckLang="DlgLnkPopFullScrn">Full
										Screen (IE)</label><br />
									<input id="chkPopupDependent" name="chkFeature" value="dependent" type="checkbox" /><label for="chkPopupDependent" fckLang="DlgLnkPopDependent">Dependent
										(Netscape)</label>
								</td>
							</tr>
							<tr>
								<td valign="top" nowrap="nowrap" width="50%">&nbsp;</td>
								<td></td>
								<td valign="top" nowrap="nowrap" width="50%"></td>
							</tr>
							<tr>
								<td valign="top">
									<table cellspacing="0" cellpadding="0" border="0">
										<tr>
											<td nowrap="nowrap"><span fckLang="DlgLnkPopWidth">Width</span></td>
											<td>&nbsp;<input id="txtPopupWidth" type="text" maxlength="4" size="4" /></td>
										</tr>
										<tr>
											<td nowrap="nowrap"><span fckLang="DlgLnkPopHeight">Height</span></td>
											<td>&nbsp;<input id="txtPopupHeight" type="text" maxlength="4" size="4" /></td>
										</tr>
									</table>
								</td>
								<td>&nbsp;&nbsp;</td>
								<td valign="top">
									<table cellspacing="0" cellpadding="0" border="0">
										<tr>
											<td nowrap="nowrap"><span fckLang="DlgLnkPopLeft">Left Position</span></td>
											<td>&nbsp;<input id="txtPopupLeft" type="text" maxlength="4" size="4" /></td>
										</tr>
										<tr>
											<td nowrap="nowrap"><span fckLang="DlgLnkPopTop">Top Position</span></td>
											<td>&nbsp;<input id="txtPopupTop" type="text" maxlength="4" size="4" /></td>
										</tr>
									</table>
								</td>
							</tr>
						</table>
					</td>
				</tr>
			</table>
		</div>
		<div id="divAttribs" style="DISPLAY: none">
			<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
				<tr>
					<td valign="top" width="50%">
						<span fckLang="DlgGenId">Id</span><br />
						<input id="txtAttId" style="WIDTH: 100%" type="text" />
					</td>
					<td width="1"></td>
					<td valign="top">
						<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
							<tr>
								<td width="60%">
									<span fckLang="DlgGenLangDir">Language Direction</span><br />
									<select id="cmbAttLangDir" style="WIDTH: 100%">
										<option value="" fckLang="DlgGenNotSet" selected>&lt;not set&gt;</option>
										<option value="ltr" fckLang="DlgGenLangDirLtr">Left to Right (LTR)</option>
										<option value="rtl" fckLang="DlgGenLangDirRtl">Right to Left (RTL)</option>
									</select>
								</td>
								<td width="1%">&nbsp;&nbsp;&nbsp;</td>
								<td nowrap="nowrap"><span fckLang="DlgGenAccessKey">Access Key</span><br />
									<input id="txtAttAccessKey" style="WIDTH: 100%" type="text" maxlength="1" size="1" />
								</td>
							</tr>
						</table>
					</td>
				</tr>
				<tr>
					<td valign="top" width="50%">
						<span fckLang="DlgGenName">Name</span><br />
						<input id="txtAttName" style="WIDTH: 100%" type="text" />
					</td>
					<td width="1"></td>
					<td valign="top">
						<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
							<tr>
								<td width="60%">
									<span fckLang="DlgGenLangCode">Language Code</span><br />
									<input id="txtAttLangCode" style="WIDTH: 100%" type="text" />
								</td>
								<td width="1%">&nbsp;&nbsp;&nbsp;</td>
								<td nowrap="nowrap">
									<span fckLang="DlgGenTabIndex">Tab Index</span><br />
									<input id="txtAttTabIndex" style="WIDTH: 100%" type="text" maxlength="5" size="5" />
								</td>
							</tr>
						</table>
					</td>
				</tr>
				<tr>
					<td valign="top" width="50%">&nbsp;</td>
					<td width="1"></td>
					<td valign="top"></td>
				</tr>
				<tr>
					<td valign="top" width="50%">
						<span fckLang="DlgGenTitle">Advisory Title</span><br />
						<input id="txtAttTitle" style="WIDTH: 100%" type="text" />
					</td>
					<td width="1">&nbsp;&nbsp;&nbsp;</td>
					<td valign="top">
						<span fckLang="DlgGenContType">Advisory Content Type</span><br />
						<input id="txtAttContentType" style="WIDTH: 100%" type="text" />
					</td>
				</tr>
				<tr>
					<td valign="top">
						<span fckLang="DlgGenClass">Stylesheet Classes</span><br />
						<input id="txtAttClasses" style="WIDTH: 100%" type="text" />
					</td>
					<td></td>
					<td valign="top">
						<span fckLang="DlgGenLinkCharset">Linked Resource Charset</span><br />
						<input id="txtAttCharSet" style="WIDTH: 100%" type="text" />
					</td>
				</tr>
			</table>
			<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
				<tr>
					<td>
						<span fckLang="DlgGenStyle">Style</span><br />
						<input id="txtAttStyle" style="WIDTH: 100%" type="text" />
					</td>
				</tr>
			</table>
		</div>
	</body>
</html>

--- NEW FILE: fck_button.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Button dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>Button Properties</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta content="noindex, nofollow" name="robots" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;

var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	if ( oActiveEl && oActiveEl.tagName.toUpperCase() == "INPUT" && ( oActiveEl.type == "button" || oActiveEl.type == "submit" || oActiveEl.type == "reset" ) )
	{
		GetE('txtName').value	= oActiveEl.name ;
		GetE('txtValue').value	= oActiveEl.value ;
		GetE('txtType').value	= oActiveEl.type ;

		GetE('txtType').disabled = true ;
	}
	else
		oActiveEl = null ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function Ok()
{
	oEditor.FCKUndo.SaveUndoStep() ;
	
	if ( !oActiveEl )
	{
		oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
		oActiveEl.type = GetE('txtType').value ;
		oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
	}

	oActiveEl.name = GetE('txtName').value ;
	SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;

	return true ;
}

	</script>
</head>
<body style="overflow: hidden">
	<table width="100%" style="height: 100%">
		<tr>
			<td align="center">
				<table border="0" cellpadding="0" cellspacing="0" width="80%">
					<tr>
						<td colspan="">
							<span fcklang="DlgCheckboxName">Name</span><br />
							<input type="text" size="20" id="txtName" style="width: 100%" />
						</td>
					</tr>
					<tr>
						<td>
							<span fcklang="DlgButtonText">Text (Value)</span><br />
							<input type="text" id="txtValue" style="width: 100%" />
						</td>
					</tr>
					<tr>
						<td>
							<span fcklang="DlgButtonType">Type</span><br />
							<select id="txtType">
								<option fcklang="DlgButtonTypeBtn" value="button" selected="selected">Button</option>
								<option fcklang="DlgButtonTypeSbm" value="submit">Submit</option>
								<option fcklang="DlgButtonTypeRst" value="reset">Reset</option>
							</select>
						</td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fck_listprop.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Bulleted List dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title></title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta content="noindex, nofollow" name="robots" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;
var sListType = ( location.search == '?OL' ? 'OL' : 'UL' ) ;

var oActiveEl = oEditor.FCKSelection.MoveToAncestorNode( sListType ) ;
var oActiveSel ;

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	if ( sListType == 'UL' )
		oActiveSel = GetE('selBulleted') ;
	else
	{
		if ( oActiveEl )
		{
			oActiveSel = GetE('selNumbered') ;
			GetE('eStart').style.display = '' ;
			GetE('txtStartPosition').value	= GetAttribute( oActiveEl, 'start' ) ;
		}
	}

	oActiveSel.style.display = '' ;

	if ( oActiveEl )
	{
		if ( oActiveEl.getAttribute('type') )
			oActiveSel.value = oActiveEl.getAttribute('type') ;
	}

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function Ok()
{
	if ( oActiveEl ){
		SetAttribute( oActiveEl, 'type'	, oActiveSel.value ) ;
		if(oActiveEl.tagName == 'OL')
			SetAttribute( oActiveEl, 'start', GetE('txtStartPosition').value ) ;
	}

	return true ;
}

	</script>
</head>
<body style="overflow: hidden">
	<table width="100%" style="height: 100%">
		<tr>
			<td style="text-align:center">
				<table cellspacing="0" cellpadding="0" border="0" style="margin-left: auto; margin-right: auto;">
					<tr>
						<td id="eStart" style="display: none; padding-right: 5px; padding-left: 5px">
							<span fcklang="DlgLstStart">Start</span><br />
							<input type="text" id="txtStartPosition" size="5" />
						</td>
						<td style="padding-right: 5px; padding-left: 5px">
							<span fcklang="DlgLstType">List Type</span><br />
							<select id="selBulleted" style="display: none">
								<option value="" selected="selected"></option>
								<option value="circle" fcklang="DlgLstTypeCircle">Circle</option>
								<option value="disc" fcklang="DlgLstTypeDisc">Disc</option>
								<option value="square" fcklang="DlgLstTypeSquare">Square</option>
							</select>
							<select id="selNumbered" style="display: none">
								<option value="" selected="selected"></option>
								<option value="1" fcklang="DlgLstTypeNumbers">Numbers (1, 2, 3)</option>
								<option value="a" fcklang="DlgLstTypeLCase">Lowercase Letters (a, b, c)</option>
								<option value="A" fcklang="DlgLstTypeUCase">Uppercase Letters (A, B, C)</option>
								<option value="i" fcklang="DlgLstTypeSRoman">Small Roman Numerals (i, ii, iii)</option>
								<option value="I" fcklang="DlgLstTypeLRoman">Large Roman Numerals (I, II, III)</option>
							</select>
							&nbsp;
						</td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fck_about.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * "About" dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title></title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="robots" content="noindex, nofollow" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;
var FCKLang	= oEditor.FCKLang ;

window.parent.AddTab( 'About', FCKLang.DlgAboutAboutTab ) ;
window.parent.AddTab( 'License', FCKLang.DlgAboutLicenseTab ) ;
window.parent.AddTab( 'BrowserInfo', FCKLang.DlgAboutBrowserInfoTab ) ;

// Function called when a dialog tag is selected.
function OnDialogTabChange( tabCode )
{
	ShowE('divAbout', ( tabCode == 'About' ) ) ;
	ShowE('divLicense', ( tabCode == 'License' ) ) ;
	ShowE('divInfo'	, ( tabCode == 'BrowserInfo' ) ) ;
}

function SendEMail()
{
	var eMail = 'mailto:' ;
	eMail += 'fredck' ;
	eMail += '@' ;
	eMail += 'fckeditor' ;
	eMail += '.' ;
	eMail += 'net' ;

	window.location = eMail ;
}

window.onload = function()
{
	// Translate the dialog box texts.
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	window.parent.SetAutoSize( true ) ;
}

	</script>
</head>
<body style="overflow: hidden">
	<div id="divAbout">
		<table cellpadding="0" cellspacing="0" border="0" width="100%" style="height: 100%">
			<tr>
				<td>
					<img alt="" src="fck_about/logo_fckeditor.gif" width="236" height="41" align="left" />
					<table width="80" border="0" cellspacing="0" cellpadding="5" bgcolor="#ffffff" align="right">
						<tr>
							<td align="center" nowrap="nowrap" style="border-right: #000000 1px solid; border-top: #000000 1px solid;
								border-left: #000000 1px solid; border-bottom: #000000 1px solid">
								<span fcklang="DlgAboutVersion">version</span>
								<br />
								<b>2.5.1</b><br />
								Build 17566</td>
						</tr>
					</table>
				</td>
			</tr>
			<tr style="height: 100%">
				<td align="center">
					&nbsp;<br />
					<span style="font-size: 14px" dir="ltr">
						<br />
						<b><a href="http://www.fckeditor.net/?about" target="_blank" title="Visit the FCKeditor web site">
							Support <b>Open Source</b> Software</a></b> </span>
					<br />
					<br />
					<br />
					<span fcklang="DlgAboutInfo">For further information go to</span> <a href="http://www.fckeditor.net/?About"
						target="_blank">http://www.fckeditor.net/</a>.
					<br />
					Copyright &copy; 2003-2007 <a href="#" onclick="SendEMail();">Frederico Caldeira Knabben</a>
				</td>
			</tr>
			<tr>
				<td align="center">
					<img alt="" src="fck_about/logo_fredck.gif" width="87" height="36" />
				</td>
			</tr>
		</table>
	</div>
	<div id="divLicense" style="display: none">
			<p>
				Licensed under the terms of any of the following licenses at your
				choice:
			</p>
			<ul>
				<li style="margin-bottom:15px">
					<b>GNU General Public License</b> Version 2 or later (the "GPL")<br />
					<a href="http://www.gnu.org/licenses/gpl.html" target="_blank">http://www.gnu.org/licenses/gpl.html</a>
				</li>
				<li style="margin-bottom:15px">
					<b>GNU Lesser General Public License</b> Version 2.1 or later (the "LGPL")<br />
					<a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">http://www.gnu.org/licenses/lgpl.html</a>
				</li>
				<li>
					<b>Mozilla Public License</b> Version 1.1 or later (the "MPL")<br />
					<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>
			   </li>
			</ul>
	</div>
	<div id="divInfo" style="display: none" dir="ltr">
		<table align="center" width="80%" border="0">
			<tr>
				<td>
					<script type="text/javascript">
<!--
document.write( '<b>User Agent<\/b><br />' + window.navigator.userAgent + '<br /><br />' ) ;
document.write( '<b>Browser<\/b><br />' + window.navigator.appName + ' ' + window.navigator.appVersion + '<br /><br />' ) ;
document.write( '<b>Platform<\/b><br />' + window.navigator.platform + '<br /><br />' ) ;

var sUserLang = '?' ;

if ( window.navigator.language )
	sUserLang = window.navigator.language.toLowerCase() ;
else if ( window.navigator.userLanguage )
	sUserLang = window.navigator.userLanguage.toLowerCase() ;

document.write( '<b>User Language<\/b><br />' + sUserLang ) ;
//-->
					</script>
				</td>
			</tr>
		</table>
	</div>
</body>
</html>

--- NEW FILE: fck_image.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Image Properties dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>Image Properties</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="robots" content="noindex, nofollow" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script src="fck_image/fck_image.js" type="text/javascript"></script>
	<link href="common/fck_dialog_common.css" rel="stylesheet" type="text/css" />
</head>
<body scroll="no" style="overflow: hidden">
	<div id="divInfo">
		<table cellspacing="1" cellpadding="1" border="0" width="100%" height="100%">
			<tr>
				<td>
					<table cellspacing="0" cellpadding="0" width="100%" border="0">
						<tr>
							<td width="100%">
								<span fcklang="DlgImgURL">URL</span>
							</td>
							<td id="tdBrowse" style="display: none" nowrap="nowrap" rowspan="2">
								&nbsp;
								<input id="btnBrowse" onclick="BrowseServer();" type="button" value="Browse Server"
									fcklang="DlgBtnBrowseServer" />
							</td>
						</tr>
						<tr>
							<td valign="top">
								<input id="txtUrl" style="width: 100%" type="text" onblur="UpdatePreview();" />
							</td>
						</tr>
					</table>
				</td>
			</tr>
			<tr>
				<td>
					<span fcklang="DlgImgAlt">Short Description</span><br />
					<input id="txtAlt" style="width: 100%" type="text" /><br />
				</td>
			</tr>
			<tr height="100%">
				<td valign="top">
					<table cellspacing="0" cellpadding="0" width="100%" border="0" height="100%">
						<tr>
							<td valign="top">
								<br />
								<table cellspacing="0" cellpadding="0" border="0">
									<tr>
										<td nowrap="nowrap">
											<span fcklang="DlgImgWidth">Width</span>&nbsp;</td>
										<td>
											<input type="text" size="3" id="txtWidth" onkeyup="OnSizeChanged('Width',this.value);" /></td>
										<td rowspan="2">
											<div id="btnLockSizes" class="BtnLocked" onmouseover="this.className = (bLockRatio ? 'BtnLocked' : 'BtnUnlocked' ) + ' BtnOver';"
												onmouseout="this.className = (bLockRatio ? 'BtnLocked' : 'BtnUnlocked' );" title="Lock Sizes"
												onclick="SwitchLock(this);">
											</div>
										</td>
										<td rowspan="2">
											<div id="btnResetSize" class="BtnReset" onmouseover="this.className='BtnReset BtnOver';"
												onmouseout="this.className='BtnReset';" title="Reset Size" onclick="ResetSizes();">
											</div>
										</td>
									</tr>
									<tr>
										<td nowrap="nowrap">
											<span fcklang="DlgImgHeight">Height</span>&nbsp;</td>
										<td>
											<input type="text" size="3" id="txtHeight" onkeyup="OnSizeChanged('Height',this.value);" /></td>
									</tr>
								</table>
								<br />
								<table cellspacing="0" cellpadding="0" border="0">
									<tr>
										<td nowrap="nowrap">
											<span fcklang="DlgImgBorder">Border</span>&nbsp;</td>
										<td>
											<input type="text" size="2" value="" id="txtBorder" onkeyup="UpdatePreview();" /></td>
									</tr>
									<tr>
										<td nowrap="nowrap">
											<span fcklang="DlgImgHSpace">HSpace</span>&nbsp;</td>
										<td>
											<input type="text" size="2" id="txtHSpace" onkeyup="UpdatePreview();" /></td>
									</tr>
									<tr>
										<td nowrap="nowrap">
											<span fcklang="DlgImgVSpace">VSpace</span>&nbsp;</td>
										<td>
											<input type="text" size="2" id="txtVSpace" onkeyup="UpdatePreview();" /></td>
									</tr>
									<tr>
										<td nowrap="nowrap">
											<span fcklang="DlgImgAlign">Align</span>&nbsp;</td>
										<td>
											<select id="cmbAlign" onchange="UpdatePreview();">
												<option value="" selected="selected"></option>
												<option fcklang="DlgImgAlignLeft" value="left">Left</option>
												<option fcklang="DlgImgAlignAbsBottom" value="absBottom">Abs Bottom</option>
												<option fcklang="DlgImgAlignAbsMiddle" value="absMiddle">Abs Middle</option>
												<option fcklang="DlgImgAlignBaseline" value="baseline">Baseline</option>
												<option fcklang="DlgImgAlignBottom" value="bottom">Bottom</option>
												<option fcklang="DlgImgAlignMiddle" value="middle">Middle</option>
												<option fcklang="DlgImgAlignRight" value="right">Right</option>
												<option fcklang="DlgImgAlignTextTop" value="textTop">Text Top</option>
												<option fcklang="DlgImgAlignTop" value="top">Top</option>
											</select>
										</td>
									</tr>
								</table>
							</td>
							<td>
								&nbsp;&nbsp;&nbsp;</td>
							<td width="100%" valign="top">
								<table cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed">
									<tr>
										<td>
											<span fcklang="DlgImgPreview">Preview</span></td>
									</tr>
									<tr>
										<td valign="top">
											<iframe class="ImagePreviewArea" src="fck_image/fck_image_preview.html" frameborder="0"
												marginheight="0" marginwidth="0"></iframe>
										</td>
									</tr>
								</table>
							</td>
						</tr>
					</table>
				</td>
			</tr>
		</table>
	</div>
	<div id="divUpload" style="display: none">
		<form id="frmUpload" method="post" target="UploadWindow" enctype="multipart/form-data"
			action="" onsubmit="return CheckUpload();">
			<span fcklang="DlgLnkUpload">Upload</span><br />
			<input id="txtUploadFile" style="width: 100%" type="file" size="40" name="NewFile" /><br />
			<br />
			<input id="btnUpload" type="submit" value="Send it to the Server" fcklang="DlgLnkBtnUpload" />
			<iframe name="UploadWindow" style="display: none" src="javascript:void(0)"></iframe>
		</form>
	</div>
	<div id="divLink" style="display: none">
		<table cellspacing="1" cellpadding="1" border="0" width="100%">
			<tr>
				<td>
					<div>
						<span fcklang="DlgLnkURL">URL</span><br />
						<input id="txtLnkUrl" style="width: 100%" type="text" onblur="UpdatePreview();" />
					</div>
					<div id="divLnkBrowseServer" align="right">
						<input type="button" value="Browse Server" fcklang="DlgBtnBrowseServer" onclick="LnkBrowseServer();" />
					</div>
					<div>
						<span fcklang="DlgLnkTarget">Target</span><br />
						<select id="cmbLnkTarget">
							<option value="" fcklang="DlgGenNotSet" selected="selected">&lt;not set&gt;</option>
							<option value="_blank" fcklang="DlgLnkTargetBlank">New Window (_blank)</option>
							<option value="_top" fcklang="DlgLnkTargetTop">Topmost Window (_top)</option>
							<option value="_self" fcklang="DlgLnkTargetSelf">Same Window (_self)</option>
							<option value="_parent" fcklang="DlgLnkTargetParent">Parent Window (_parent)</option>
						</select>
					</div>
				</td>
			</tr>
		</table>
	</div>
	<div id="divAdvanced" style="display: none">
		<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
			<tr>
				<td valign="top" width="50%">
					<span fcklang="DlgGenId">Id</span><br />
					<input id="txtAttId" style="width: 100%" type="text" />
				</td>
				<td width="1">
					&nbsp;&nbsp;</td>
				<td valign="top">
					<table cellspacing="0" cellpadding="0" width="100%" align="center" border="0">
						<tr>
							<td width="60%">
								<span fcklang="DlgGenLangDir">Language Direction</span><br />
								<select id="cmbAttLangDir" style="width: 100%">
									<option value="" fcklang="DlgGenNotSet" selected="selected">&lt;not set&gt;</option>
									<option value="ltr" fcklang="DlgGenLangDirLtr">Left to Right (LTR)</option>
									<option value="rtl" fcklang="DlgGenLangDirRtl">Right to Left (RTL)</option>
								</select>
							</td>
							<td width="1%">
								&nbsp;&nbsp;</td>
							<td nowrap="nowrap">
								<span fcklang="DlgGenLangCode">Language Code</span><br />
								<input id="txtAttLangCode" style="width: 100%" type="text" />&nbsp;
							</td>
						</tr>
					</table>
				</td>
			</tr>
			<tr>
				<td colspan="3">
					&nbsp;</td>
			</tr>
			<tr>
				<td colspan="3">
					<span fcklang="DlgGenLongDescr">Long Description URL</span><br />
					<input id="txtLongDesc" style="width: 100%" type="text" />
				</td>
			</tr>
			<tr>
				<td colspan="3">
					&nbsp;</td>
			</tr>
			<tr>
				<td valign="top">
					<span fcklang="DlgGenClass">Stylesheet Classes</span><br />
					<input id="txtAttClasses" style="width: 100%" type="text" />
				</td>
				<td>
				</td>
				<td valign="top">
					&nbsp;<span fcklang="DlgGenTitle">Advisory Title</span><br />
					<input id="txtAttTitle" style="width: 100%" type="text" />
				</td>
			</tr>
		</table>
		<span fcklang="DlgGenStyle">Style</span><br />
		<input id="txtAttStyle" style="width: 100%" type="text" />
	</div>
</body>
</html>

--- NEW FILE: fck_smiley.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Smileys (emoticons) dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title></title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="robots" content="noindex, nofollow" />
	<style type="text/css">
		.Hand
		{
			cursor: pointer;
			cursor: hand;
		}
	</style>
	<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

window.onload = function ()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	window.parent.SetAutoSize( true ) ;
}

function InsertSmiley( url )
{
	oEditor.FCKUndo.SaveUndoStep() ;
	var oImg = oEditor.FCK.InsertElement( 'img' ) ;
	oImg.src = url ;
	oImg.setAttribute( '_fcksavedurl', url ) ;

	// For long smileys list, it seams that IE continues loading the images in
	// the background when you quickly select one image. so, let's clear
	// everything before closing.
	document.body.innerHTML = '' ;

	window.parent.Cancel() ;
}

function over(td)
{
	td.className = 'LightBackground Hand' ;
}

function out(td)
{
	td.className = 'DarkBackground Hand' ;
}
	</script>
</head>
<body style="overflow: hidden">
	<table cellpadding="2" cellspacing="2" align="center" border="0" width="100%" height="100%">
		<script type="text/javascript">

var FCKConfig = oEditor.FCKConfig ;

var sBasePath	= FCKConfig.SmileyPath ;
var aImages		= FCKConfig.SmileyImages ;
var iCols		= FCKConfig.SmileyColumns ;
var iColWidth	= parseInt( 100 / iCols, 10 ) ;

var i = 0 ;
while (i < aImages.length)
{
	document.write( '<tr>' ) ;
	for(var j = 0 ; j < iCols ; j++)
	{
		if (aImages[i])
		{
			var sUrl = sBasePath + aImages[i] ;
			document.write( '<td width="' + iColWidth + '%" align="center" class="DarkBackground Hand" onclick="InsertSmiley(\'' + sUrl.replace(/'/g, "\\'" ) + '\')" onmouseover="over(this)" onmouseout="out(this)">' ) ;
			document.write( '<img src="' + sUrl + '" border="0" />' ) ;
		}
		else
			document.write( '<td width="' + iColWidth + '%" class="DarkBackground">&nbsp;' ) ;
		document.write( '<\/td>' ) ;
		i++ ;
	}
	document.write('<\/tr>') ;
}

		</script>
	</table>
</body>
</html>

--- NEW FILE: fck_checkbox.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Checkbox dialog window.
-->
<html>
	<head>
		<title>Checkbox Properties</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta content="noindex, nofollow" name="robots">
		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
		<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;

var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	if ( oActiveEl && oActiveEl.tagName == 'INPUT' && oActiveEl.type == 'checkbox' )
	{
		GetE('txtName').value		= oActiveEl.name ;
		GetE('txtValue').value		= oEditor.FCKBrowserInfo.IsIE ? oActiveEl.value : GetAttribute( oActiveEl, 'value' ) ;
		GetE('txtSelected').checked	= oActiveEl.checked ;
	}
	else
		oActiveEl = null ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function Ok()
{
	oEditor.FCKUndo.SaveUndoStep() ;
	
	if ( !oActiveEl )
	{
		oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
		oActiveEl.type = 'checkbox' ;
		oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
	}

	if ( GetE('txtName').value.length > 0 )
		oActiveEl.name = GetE('txtName').value ;

	if ( oEditor.FCKBrowserInfo.IsIE )
		oActiveEl.value = GetE('txtValue').value ;
	else
		SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;

	var bIsChecked = GetE('txtSelected').checked ;
	SetAttribute( oActiveEl, 'checked', bIsChecked ? 'checked' : null ) ;	// For Firefox
	oActiveEl.checked = bIsChecked ;

	return true ;
}

		</script>
	</head>
	<body style="OVERFLOW: hidden" scroll="no">
		<table height="100%" width="100%">
			<tr>
				<td align="center">
					<table border="0" cellpadding="0" cellspacing="0" width="80%">
						<tr>
							<td>
								<span fckLang="DlgCheckboxName">Name</span><br>
								<input type="text" size="20" id="txtName" style="WIDTH: 100%">
							</td>
						</tr>
						<tr>
							<td>
								<span fckLang="DlgCheckboxValue">Value</span><br>
								<input type="text" size="20" id="txtValue" style="WIDTH: 100%">
							</td>
						</tr>
						<tr>
							<td><input type="checkbox" id="txtSelected"><label for="txtSelected" fckLang="DlgCheckboxSelected">Checked</label></td>
						</tr>
					</table>
				</td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: fck_tablecell.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Cell properties dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title>Table Cell Properties</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="robots" content="noindex, nofollow" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;

// Array of selected Cells
var aCells = oEditor.FCKTableHandler.GetSelectedCells() ;

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage( document ) ;

	SetStartupValue() ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function SetStartupValue()
{
	if ( aCells.length > 0 )
	{
		var oCell = aCells[0] ;
		var iWidth = GetAttribute( oCell, 'width' ) ;

		if ( iWidth.indexOf && iWidth.indexOf( '%' ) >= 0 )
		{
			iWidth = iWidth.substr( 0, iWidth.length - 1 ) ;
			GetE('selWidthType').value = 'percent' ;
		}

		if ( oCell.attributes['noWrap'] != null && oCell.attributes['noWrap'].specified )
			GetE('selWordWrap').value = !oCell.noWrap ;

		GetE('txtWidth').value			= iWidth ;
		GetE('txtHeight').value			= GetAttribute( oCell, 'height' ) ;
		GetE('selHAlign').value			= GetAttribute( oCell, 'align' ) ;
		GetE('selVAlign').value			= GetAttribute( oCell, 'vAlign' ) ;
		GetE('txtRowSpan').value		= GetAttribute( oCell, 'rowSpan' ) ;
		GetE('txtCollSpan').value		= GetAttribute( oCell, 'colSpan' ) ;
		GetE('txtBackColor').value		= GetAttribute( oCell, 'bgColor' ) ;
		GetE('txtBorderColor').value	= GetAttribute( oCell, 'borderColor' ) ;
//		GetE('cmbFontStyle').value		= oCell.className ;
	}
}

// Fired when the user press the OK button
function Ok()
{
	for( i = 0 ; i < aCells.length ; i++ )
	{
		if ( GetE('txtWidth').value.length > 0 )
			aCells[i].width	= GetE('txtWidth').value + ( GetE('selWidthType').value == 'percent' ? '%' : '') ;
		else
			aCells[i].removeAttribute( 'width', 0 ) ;

		if ( GetE('selWordWrap').value == 'false' )
			SetAttribute( aCells[i], 'noWrap', 'nowrap' ) ;  
		else
			aCells[i].removeAttribute( 'noWrap' ) ;

		SetAttribute( aCells[i], 'height'		, GetE('txtHeight').value ) ;
		SetAttribute( aCells[i], 'align'		, GetE('selHAlign').value ) ;
		SetAttribute( aCells[i], 'vAlign'		, GetE('selVAlign').value ) ;
		SetAttribute( aCells[i], 'rowSpan'		, GetE('txtRowSpan').value ) ;
		SetAttribute( aCells[i], 'colSpan'		, GetE('txtCollSpan').value ) ;
		SetAttribute( aCells[i], 'bgColor'		, GetE('txtBackColor').value ) ;
		SetAttribute( aCells[i], 'borderColor'	, GetE('txtBorderColor').value ) ;
//		SetAttribute( aCells[i], 'className'	, GetE('cmbFontStyle').value ) ;
	}

	return true ;
}

function SelectBackColor( color )
{
	if ( color && color.length > 0 )
		GetE('txtBackColor').value = color ;
}

function SelectBorderColor( color )
{
	if ( color && color.length > 0 )
		GetE('txtBorderColor').value = color ;
}

function SelectColor( wich )
{
	oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', oEditor.FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, wich == 'Back' ? SelectBackColor : SelectBorderColor, window ) ;
}

	</script>
</head>
<body scroll="no" style="overflow: hidden">
	<table cellspacing="0" cellpadding="0" width="100%" border="0" height="100%">
		<tr>
			<td>
				<table cellspacing="1" cellpadding="1" width="100%" border="0">
					<tr>
						<td>
							<table cellspacing="0" cellpadding="0" border="0">
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgCellWidth">Width</span>:</td>
									<td>
										&nbsp;<input onkeypress="return IsDigit(event);" id="txtWidth" type="text" maxlength="4"
											size="3" name="txtWidth" />&nbsp;<select id="selWidthType" name="selWidthType">
												<option fcklang="DlgCellWidthPx" value="pixels" selected="selected">pixels</option>
												<option fcklang="DlgCellWidthPc" value="percent">percent</option>
											</select></td>
								</tr>
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgCellHeight">Height</span>:</td>
									<td>
										&nbsp;<input id="txtHeight" type="text" maxlength="4" size="3" name="txtHeight" onkeypress="return IsDigit(event);" />&nbsp;<span
											fcklang="DlgCellWidthPx">pixels</span></td>
								</tr>
								<tr>
									<td>
										&nbsp;</td>
									<td>
										&nbsp;</td>
								</tr>
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgCellWordWrap">Word Wrap</span>:</td>
									<td>
										&nbsp;<select id="selWordWrap" name="selAlignment">
											<option fcklang="DlgCellWordWrapYes" value="true" selected="selected">Yes</option>
											<option fcklang="DlgCellWordWrapNo" value="false">No</option>
										</select></td>
								</tr>
								<tr>
									<td>
										&nbsp;</td>
									<td>
										&nbsp;</td>
								</tr>
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgCellHorAlign">Horizontal Alignment</span>:</td>
									<td>
										&nbsp;<select id="selHAlign" name="selAlignment">
											<option fcklang="DlgCellHorAlignNotSet" value="" selected>&lt;Not set&gt;</option>
											<option fcklang="DlgCellHorAlignLeft" value="left">Left</option>
											<option fcklang="DlgCellHorAlignCenter" value="center">Center</option>
											<option fcklang="DlgCellHorAlignRight" value="right">Right</option>
										</select></td>
								</tr>
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgCellVerAlign">Vertical Alignment</span>:</td>
									<td>
										&nbsp;<select id="selVAlign" name="selAlignment">
											<option fcklang="DlgCellVerAlignNotSet" value="" selected>&lt;Not set&gt;</option>
											<option fcklang="DlgCellVerAlignTop" value="top">Top</option>
											<option fcklang="DlgCellVerAlignMiddle" value="middle">Middle</option>
											<option fcklang="DlgCellVerAlignBottom" value="bottom">Bottom</option>
											<option fcklang="DlgCellVerAlignBaseline" value="baseline">Baseline</option>
										</select></td>
								</tr>
							</table>
						</td>
						<td>
							&nbsp;&nbsp;&nbsp;</td>
						<td align="right">
							<table cellspacing="0" cellpadding="0" border="0">
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgCellRowSpan">Rows Span</span>:</td>
									<td>
										&nbsp;
										<input onkeypress="return IsDigit(event);" id="txtRowSpan" type="text" maxlength="3" size="2"
											name="txtRows"></td>
									<td>
									</td>
								</tr>
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgCellCollSpan">Columns Span</span>:</td>
									<td>
										&nbsp;
										<input onkeypress="return IsDigit(event);" id="txtCollSpan" type="text" maxlength="2"
											size="2" name="txtColumns"></td>
									<td>
									</td>
								</tr>
								<tr>
									<td>
										&nbsp;</td>
									<td>
										&nbsp;</td>
									<td>
										&nbsp;</td>
								</tr>
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgCellBackColor">Background Color</span>:</td>
									<td>
										&nbsp;<input id="txtBackColor" type="text" size="8" name="txtCellSpacing"></td>
									<td>
										&nbsp;
										<input type="button" fcklang="DlgCellBtnSelect" value="Select..." onclick="SelectColor( 'Back' )"></td>
								</tr>
								<tr>
									<td nowrap="nowrap">
										<span fcklang="DlgCellBorderColor">Border Color</span>:</td>
									<td>
										&nbsp;<input id="txtBorderColor" type="text" size="8" name="txtCellPadding" /></td>
									<td>
										&nbsp;
										<input type="button" fcklang="DlgCellBtnSelect" value="Select..." onclick="SelectColor( 'Border' )" /></td>
								</tr>
							</table>
						</td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fck_replace.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * "Find" and "Replace" dialog box window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title></title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta content="noindex, nofollow" name="robots" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;
var FCKLang = oEditor.FCKLang ;

window.parent.AddTab( 'Find', FCKLang.DlgFindTitle ) ;
window.parent.AddTab( 'Replace', FCKLang.DlgReplaceTitle ) ;
var idMap = {} ;

function OnDialogTabChange( tabCode )
{
	ShowE( 'divFind', ( tabCode == 'Find' ) ) ;
	ShowE( 'divReplace', ( tabCode == 'Replace' ) ) ;
	idMap['FindText'] = 'txtFind' + tabCode ;
	idMap['CheckCase'] = 'chkCase' + tabCode ;
	idMap['CheckWord'] = 'chkWord' + tabCode ;

	if ( tabCode == 'Replace' )
		window.parent.SetAutoSize( true ) ;
}

function OnLoad()
{
	// First of all, translate the dialog box texts.
	oEditor.FCKLanguageManager.TranslatePage( document ) ;

	// Place the cursor at the start of document.
	// This will be the starting point of our search.
	var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
	range.SetStart( oEditor.FCK.EditorDocument.body, 1 ) ;
	range.SetEnd( oEditor.FCK.EditorDocument.body, 1 ) ;
	range.Collapse( true ) ;
	range.Select() ;

	// Show the appropriate tab at startup.
	if ( window.parent.name.search( 'Replace' ) == -1 )
	{
		window.parent.SetSelectedTab( 'Find' ) ;
		window.parent.SetAutoSize( true ) ;
	}
	else
		window.parent.SetSelectedTab( 'Replace' ) ;

}

function btnStat(frm)
{
	document.getElementById('btnReplace').disabled =
		document.getElementById('btnReplaceAll').disabled =
			document.getElementById('btnFind').disabled =
				( document.getElementById(idMap["FindText"]).value.length == 0 ) ;
}

function GetSelection()
{
	var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
	range.MoveToSelection() ;
	return range.CreateBookmark2() ;
}

function GetSearchString()
{
	return document.getElementById(idMap['FindText']).value ;
}

function GetReplaceString()
{
	return document.getElementById("txtReplace").value ;
}

function GetCheckCase()
{
	return !! ( document.getElementById(idMap['CheckCase']).checked ) ;
}

function GetMatchWord()
{
	return !! ( document.getElementById(idMap['CheckWord']).checked ) ;
}

// Get the data pointed to by a bookmark.
function GetData( bookmark )
{
	var cursor = oEditor.FCK.EditorDocument.documentElement ;
	for ( var i = 0 ; i < bookmark.length ; i++ )
	{
		var target = bookmark[i] ;
		var currentIndex = -1 ;
		if ( cursor.nodeType != 3 )
		{
			for (var j = 0 ; j < cursor.childNodes.length ; j++ )
			{
				var candidate = cursor.childNodes[j] ;
				if ( candidate.nodeType == 3 &&
						candidate.previousSibling &&
						candidate.previousSibling.nodeType == 3 )
					continue ;
				currentIndex++ ;
				if ( currentIndex == target )
				{
					cursor = candidate ;
					break ;
				}
			}
			if ( currentIndex < target )
				return null ;
		}
		else
		{
			if ( i != bookmark.length - 1 )
				return null ;
			while ( target >= cursor.length && cursor.nextSibling && cursor.nextSibling.nodeType == 3 )
			{
				target -= cursor.length ;
				cursor = cursor.nextSibling ;
			}
			cursor = cursor.nodeValue.charAt( target ) ;
			if ( cursor == "" )
				cursor = null ;
		}
	}
	return cursor ;
}

// With this function, we can treat the bookmark as an iterator for DFS.
function NextPosition( bookmark )
{
	// See if there's anything further down the tree.
	var next = bookmark.concat( [0] ) ;
	if ( GetData( next ) != null )
		return next ;

	// Nothing down there? See if there's anything next to me.
	var next = bookmark.slice( 0, bookmark.length - 1 ).concat( [ bookmark[ bookmark.length - 1 ] + 1 ] ) ;
	if ( GetData( next ) != null )
		return next ;

	// Nothing even next to me? See if there's anything next to my ancestors.
	for ( var i = bookmark.length - 1 ; i > 0 ; i-- )
	{
		var next = bookmark.slice( 0, i - 1 ).concat( [ bookmark[ i - 1 ] + 1 ] ) ;
		if ( GetData( next ) != null )
			return next ;
	}

	// There's absolutely nothing left to walk, return null.
	return null ;
}

// Is this character a unicode whitespace?
// Reference: http://unicode.org/Public/UNIDATA/PropList.txt
function CheckIsWhitespace( c )
{
	var code = c.charCodeAt( 0 );
	if ( code >= 9 && code <= 0xd )
		return true;
	if ( code >= 0x2000 && code <= 0x200a )
		return true;
	switch ( code )
	{
		case 0x20:
		case 0x85:
		case 0xa0:
		case 0x1680:
		case 0x180e:
		case 0x2028:
		case 0x2029:
		case 0x202f:
		case 0x205f:
		case 0x3000:
			return true;
		default:
			return false;
	}
}

// Knuth-Morris-Pratt Algorithm for stream input
KMP_NOMATCH = 0 ;
KMP_ADVANCED = 1 ;
KMP_MATCHED = 2 ;
function KmpMatch( pattern, ignoreCase )
{
	var overlap = [ -1 ] ;
	for ( var i = 0 ; i < pattern.length ; i++ )
	{
		overlap.push( overlap[i] + 1 ) ;
		while ( overlap[ i + 1 ] > 0 && pattern.charAt( i ) != pattern.charAt( overlap[ i + 1 ] - 1 ) )
			overlap[ i + 1 ] = overlap[ overlap[ i + 1 ] - 1 ] + 1 ;
	}
	this._Overlap = overlap ;
	this._State = 0 ;
	this._IgnoreCase = ( ignoreCase === true ) ;
	if ( ignoreCase )
		this.Pattern = pattern.toLowerCase();
	else
		this.Pattern = pattern ;
}
KmpMatch.prototype = {
	"FeedCharacter" : function( c )
	{
		if ( this._IgnoreCase )
			c = c.toLowerCase();

		while ( true )
		{
			if ( c == this.Pattern.charAt( this._State ) )
			{
				this._State++ ;
				if ( this._State == this.Pattern.length )
				{
					// found a match, start over, don't care about partial matches involving the current match
					this._State = 0;
					return KMP_MATCHED;
				}
				return KMP_ADVANCED;
			}
			else if ( this._State == 0 )
				return KMP_NOMATCH;
			else
				this._State = this._Overlap[ this._State ];
		}

		return null ;
	},
	"Reset" : function()
	{
		this._State = 0 ;
	}
};

function _Find()
{
	// Start from the end of the current selection.
	var matcher = new KmpMatch( GetSearchString(), ! GetCheckCase() ) ;
	var cursor = GetSelection().End ;
	var matchState = KMP_NOMATCH ;
	var matchBookmark = null ;

	// Match finding.
	while ( true )
	{
		// Perform KMP stream matching.
		//	- Reset KMP matcher if we encountered a block element.
		var data = GetData( cursor ) ;
		if ( data )
		{
			if ( data.tagName )
			{
				if ( oEditor.FCKListsLib.BlockElements[ data.tagName.toLowerCase() ] )
				{
					matcher.Reset();
					matchBookmark = null ;
				}
			}
			else if ( data.charAt != undefined )
			{
				matchState = matcher.FeedCharacter(data) ;

				if ( matchState == KMP_NOMATCH )
					matchBookmark = null ;
				else if ( matchState == KMP_ADVANCED && matchBookmark == null )
					matchBookmark = { Start : cursor.concat( [] ) } ;
				else if ( matchState == KMP_MATCHED )
				{
					if ( matchBookmark == null )
						matchBookmark = { Start : cursor.concat( [] ) } ;
					matchBookmark.End = cursor.concat( [] ) ;
					matchBookmark.End[ matchBookmark.End.length - 1 ]++;

					// Wait, do we have to match a whole word?
					if ( GetMatchWord() )
					{
						var startOk = false ;
						var endOk = false ;
						var start = matchBookmark.Start ;
						var end = matchBookmark.End ;
						if ( start[ start.length - 1 ] == 0 )
							startOk = true ;
						else
						{
							var cursorBeforeStart = start.slice( 0, start.length - 1 ) ;
							cursorBeforeStart.push( start[ start.length - 1 ] - 1 ) ;
							var dataBeforeStart = GetData( cursorBeforeStart ) ;
							if ( dataBeforeStart == null || dataBeforeStart.charAt == undefined )
								startOk = true ;
							else if ( CheckIsWhitespace( dataBeforeStart ) )
								startOk = true ;
						}

						// this is already one character beyond the last char, no need to move
						var cursorAfterEnd = end ;
						var dataAfterEnd = GetData( cursorAfterEnd );
						if ( dataAfterEnd == null || dataAfterEnd.charAt == undefined )
							endOk = true ;
						else if ( CheckIsWhitespace( dataAfterEnd ) )
							endOk = true ;

						if ( startOk && endOk )
							break ;
						else
							matcher.Reset() ;
					}
					else
						break ;
				}
			}
		}

		// Perform DFS across the document, until we've reached the end.
		cursor = NextPosition( cursor ) ;
		if ( cursor == null )
			break;
	}

	// If we've found a match, select the match.
	if ( matchState == KMP_MATCHED )
	{
		var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
		range.MoveToBookmark2( matchBookmark ) ;
		range.Select() ;
		var focus = range._Range.endContainer ;
		while ( focus && focus.nodeType != 1 )
			focus = focus.parentNode ;

		if ( focus )
		{
			if ( oEditor.FCKBrowserInfo.IsSafari )
				oEditor.FCKDomTools.ScrollIntoView( focus, false ) ;
			else
				focus.scrollIntoView( false ) ;
		}

		return true;
	}
	else
		return false;
}

function Find()
{
	var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
	range.MoveToSelection() ;
	range.Collapse( false ) ;
	range.Select() ;

	if ( ! _Find() )
		alert( FCKLang.DlgFindNotFoundMsg ) ;
}

function Replace()
{
	var selection = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
	selection.MoveToSelection() ;

	if ( selection.CheckIsCollapsed() )
	{
		if (! _Find() )
			alert( FCKLang.DlgFindNotFoundMsg ) ;
	}
	else
	{
		oEditor.FCKUndo.SaveUndoStep() ;
		selection.DeleteContents() ;
		selection.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
		selection.Collapse( false ) ;
		selection.Select() ;
	}
}

function ReplaceAll()
{
	oEditor.FCKUndo.SaveUndoStep() ;
	var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;

	var replaceCount = 0 ;

	while ( _Find() )
	{
		range.MoveToSelection() ;
		range.DeleteContents() ;
		range.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
		range.Collapse( false ) ;
		range.Select() ;
		replaceCount++ ;
	}
	if ( replaceCount == 0 )
		alert( FCKLang.DlgFindNotFoundMsg ) ;
	window.parent.Cancel() ;
}
	</script>
</head>
<body onload="OnLoad()" style="overflow: hidden">
	<div id="divFind" style="display: none">
		<table cellspacing="3" cellpadding="2" width="100%" border="0">
			<tr>
				<td nowrap="nowrap">
					<label for="txtFindFind" fcklang="DlgReplaceFindLbl">
						Find what:</label>
				</td>
				<td width="100%">
					<input id="txtFindFind" onkeyup="btnStat(this.form)" style="width: 100%" tabindex="1"
						type="text" />
				</td>
				<td>
					<input id="btnFind" style="width: 80px" disabled="disabled" onclick="Find();"
						type="button" value="Find" fcklang="DlgFindFindBtn" />
				</td>
			</tr>
			<tr>
				<td valign="bottom" colspan="3">
					&nbsp;<input id="chkCaseFind" tabindex="3" type="checkbox" /><label for="chkCaseFind" fcklang="DlgReplaceCaseChk">Match
						case</label>
					<br />
					&nbsp;<input id="chkWordFind" tabindex="4" type="checkbox" /><label for="chkWordFind" fcklang="DlgReplaceWordChk">Match
						whole word</label>
				</td>
			</tr>
		</table>
	</div>
	<div id="divReplace" style="display:none">
		<table cellspacing="3" cellpadding="2" width="100%" border="0">
			<tr>
				<td nowrap="nowrap">
					<label for="txtFindReplace" fcklang="DlgReplaceFindLbl">
						Find what:</label>
				</td>
				<td width="100%">
					<input id="txtFindReplace" onkeyup="btnStat(this.form)" style="width: 100%" tabindex="1"
						type="text" />
				</td>
				<td>
					<input id="btnReplace" style="width: 80px" disabled="disabled" onclick="Replace();"
						type="button" value="Replace" fcklang="DlgReplaceReplaceBtn" />
				</td>
			</tr>
			<tr>
				<td valign="top" nowrap="nowrap">
					<label for="txtReplace" fcklang="DlgReplaceReplaceLbl">
						Replace with:</label>
				</td>
				<td valign="top">
					<input id="txtReplace" style="width: 100%" tabindex="2" type="text" />
				</td>
				<td>
					<input id="btnReplaceAll" style="width: 80px" disabled="disabled" onclick="ReplaceAll()" type="button"
						value="Replace All" fcklang="DlgReplaceReplAllBtn" />
				</td>
			</tr>
			<tr>
				<td valign="bottom" colspan="3">
					&nbsp;<input id="chkCaseReplace" tabindex="3" type="checkbox" /><label for="chkCaseReplace" fcklang="DlgReplaceCaseChk">Match
						case</label>
					<br />
					&nbsp;<input id="chkWordReplace" tabindex="4" type="checkbox" /><label for="chkWordReplace" fcklang="DlgReplaceWordChk">Match
						whole word</label>
				</td>
			</tr>
		</table>
	</div>
</body>
</html>

--- NEW FILE: fck_colorselector.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Color Selection dialog window.
-->
<html>
	<head>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
		<meta name="robots" content="noindex, nofollow" />
		<style TYPE="text/css">
			#ColorTable		{ cursor: pointer ; cursor: hand ; }
			#hicolor		{ height: 74px ; width: 74px ; border-width: 1px ; border-style: solid ; }
			#hicolortext	{ width: 75px ; text-align: right ; margin-bottom: 7px ; }
			#selhicolor		{ height: 20px ; width: 74px ; border-width: 1px ; border-style: solid ; }
			#selcolor		{ width: 75px ; height: 20px ; margin-top: 0px ; margin-bottom: 7px ; }
			#btnClear		{ width: 75px ; height: 22px ; margin-bottom: 6px ; }
			.ColorCell		{ height: 15px ; width: 15px ; }
		</style>
		<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

function OnLoad()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	CreateColorTable() ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function CreateColorTable()
{
	// Get the target table.
	var oTable = document.getElementById('ColorTable') ;

	// Create the base colors array.
	var aColors = ['00','33','66','99','cc','ff'] ;

	// This function combines two ranges of three values from the color array into a row.
	function AppendColorRow( rangeA, rangeB )
	{
		for ( var i = rangeA ; i < rangeA + 3 ; i++ )
		{
			var oRow = oTable.insertRow(-1) ;

			for ( var j = rangeB ; j < rangeB + 3 ; j++ )
			{
				for ( var n = 0 ; n < 6 ; n++ )
				{
					AppendColorCell( oRow, '#' + aColors[j] + aColors[n] + aColors[i] ) ;
				}
			}
		}
	}

	// This function create a single color cell in the color table.
	function AppendColorCell( targetRow, color )
	{
		var oCell = targetRow.insertCell(-1) ;
		oCell.className = 'ColorCell' ;
		oCell.bgColor = color ;

		oCell.onmouseover = function()
		{
			document.getElementById('hicolor').style.backgroundColor = this.bgColor ;
			document.getElementById('hicolortext').innerHTML = this.bgColor ;
		}

		oCell.onclick = function()
		{
			document.getElementById('selhicolor').style.backgroundColor = this.bgColor ;
			document.getElementById('selcolor').value = this.bgColor ;
		}
	}

	AppendColorRow( 0, 0 ) ;
	AppendColorRow( 3, 0 ) ;
	AppendColorRow( 0, 3 ) ;
	AppendColorRow( 3, 3 ) ;

	// Create the last row.
	var oRow = oTable.insertRow(-1) ;

	// Create the gray scale colors cells.
	for ( var n = 0 ; n < 6 ; n++ )
	{
		AppendColorCell( oRow, '#' + aColors[n] + aColors[n] + aColors[n] ) ;
	}

	// Fill the row with black cells.
	for ( var i = 0 ; i < 12 ; i++ )
	{
		AppendColorCell( oRow, '#000000' ) ;
	}
}

function Clear()
{
	document.getElementById('selhicolor').style.backgroundColor = '' ;
	document.getElementById('selcolor').value = '' ;
}

function ClearActual()
{
	document.getElementById('hicolor').style.backgroundColor = '' ;
	document.getElementById('hicolortext').innerHTML = '&nbsp;' ;
}

function UpdateColor()
{
	try		  { document.getElementById('selhicolor').style.backgroundColor = document.getElementById('selcolor').value ; }
	catch (e) { Clear() ; }
}

function Ok()
{
	if ( typeof(window.parent.dialogArguments.CustomValue) == 'function' )
		window.parent.dialogArguments.CustomValue( document.getElementById('selcolor').value ) ;

	return true ;
}
		</script>
	</head>
	<body onload="OnLoad()" scroll="no" style="OVERFLOW: hidden">
		<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
			<tr>
				<td align="center" valign="middle">
					<table border="0" cellspacing="5" cellpadding="0" width="100%">
						<tr>
							<td valign="top" align="center" nowrap width="100%">
								<table id="ColorTable" border="0" cellspacing="0" cellpadding="0" width="270" onmouseout="ClearActual();">
								</table>
							</td>
							<td valign="top" align="left" nowrap>
								<span fckLang="DlgColorHighlight">Highlight</span>
								<div id="hicolor"></div>
								<div id="hicolortext">&nbsp;</div>
								<span fckLang="DlgColorSelected">Selected</span>
								<div id="selhicolor"></div>
								<input id="selcolor" type="text" maxlength="20" onchange="UpdateColor();">
								<br>
								<input id="btnClear" type="button" fckLang="DlgColorBtnClear" value="Clear" onclick="Clear();" />
							</td>
						</tr>
					</table>
				</td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: fck_textfield.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Text field dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title></title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta content="noindex, nofollow" name="robots" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;

var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	if ( oActiveEl && oActiveEl.tagName == 'INPUT' && ( oActiveEl.type == 'text' || oActiveEl.type == 'password' ) )
	{
		GetE('txtName').value	= oActiveEl.name ;
		GetE('txtValue').value	= oActiveEl.value ;
		GetE('txtSize').value	= GetAttribute( oActiveEl, 'size' ) ;
		GetE('txtMax').value	= GetAttribute( oActiveEl, 'maxLength' ) ;
		GetE('txtType').value	= oActiveEl.type ;

		GetE('txtType').disabled = true ;
	}
	else
		oActiveEl = null ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function Ok()
{
	if ( isNaN( GetE('txtMax').value ) || GetE('txtMax').value < 0 )
	{
		alert( "Maximum characters must be a positive number." ) ;
		GetE('txtMax').focus() ;
		return false ;
	}
	else if( isNaN( GetE('txtSize').value ) || GetE('txtSize').value < 0 )
	{
		alert( "Width must be a positive number." ) ;
		GetE('txtSize').focus() ;
		return false ;
	}

	if ( !oActiveEl )
	{
		oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
		oActiveEl.type = GetE('txtType').value ;
		oEditor.FCKUndo.SaveUndoStep() ;
		oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
	}

	oActiveEl.name = GetE('txtName').value ;
	SetAttribute( oActiveEl, 'value'	, GetE('txtValue').value ) ;
	SetAttribute( oActiveEl, 'size'		, GetE('txtSize').value ) ;
	SetAttribute( oActiveEl, 'maxlength', GetE('txtMax').value ) ;

	return true ;
}

	</script>
</head>
<body style="overflow: hidden">
	<table width="100%" style="height: 100%">
		<tr>
			<td align="center">
				<table cellspacing="0" cellpadding="0" border="0">
					<tr>
						<td>
							<span fcklang="DlgTextName">Name</span><br />
							<input id="txtName" type="text" size="20" />
						</td>
						<td>
						</td>
						<td>
							<span fcklang="DlgTextValue">Value</span><br />
							<input id="txtValue" type="text" size="25" />
						</td>
					</tr>
					<tr>
						<td>
							<span fcklang="DlgTextCharWidth">Character Width</span><br />
							<input id="txtSize" type="text" size="5" />
						</td>
						<td>
						</td>
						<td>
							<span fcklang="DlgTextMaxChars">Maximum Characters</span><br />
							<input id="txtMax" type="text" size="5" />
						</td>
					</tr>
					<tr>
						<td>
							<span fcklang="DlgTextType">Type</span><br />
							<select id="txtType">
								<option value="text" selected="selected" fcklang="DlgTextTypeText">Text</option>
								<option value="password" fcklang="DlgTextTypePass">Password</option>
							</select>
						</td>
						<td>
							&nbsp;</td>
						<td>
						</td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fck_spellerpages.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Spell Check dialog window.
-->
<html>
	<head>
		<title>Spell Check</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta content="noindex, nofollow" name="robots">
		<script src="fck_spellerpages/spellerpages/spellChecker.js"></script>
		<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;
var FCKLang = oEditor.FCKLang ;

window.onload = function()
{
	document.getElementById('txtHtml').value = oEditor.FCK.EditorDocument.body.innerHTML ;

	var oSpeller = new spellChecker( document.getElementById('txtHtml') ) ;
	oSpeller.spellCheckScript = oEditor.FCKConfig.SpellerPagesServerScript || 'server-scripts/spellchecker.php' ;
	oSpeller.OnFinished = oSpeller_OnFinished ;
	oSpeller.openChecker() ;
}

function OnSpellerControlsLoad( controlsWindow )
{
	// Translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage( controlsWindow.document ) ;
}

function oSpeller_OnFinished( numberOCorrections )
{
	if ( numberOCorrections > 0 )
		oEditor.FCK.SetData( document.getElementById('txtHtml').value ) ;
	window.parent.Cancel() ;
}

		</script>
	</head>
	<body style="OVERFLOW: hidden" scroll="no" style="padding:0px;">
		<input type="hidden" id="txtHtml" value="">
		<iframe id="frmSpell" src="javascript:void(0)" name="spellchecker" width="100%" height="100%" frameborder="0"></iframe>
	</body>
</html>

--- NEW FILE: fck_docprops.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Link dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title></title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta content="noindex, nofollow" name="robots" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor		= window.parent.InnerDialogLoaded() ;
var FCK			= oEditor.FCK ;
var FCKLang		= oEditor.FCKLang ;
var FCKConfig	= oEditor.FCKConfig ;

//#### Dialog Tabs

// Set the dialog tabs.
window.parent.AddTab( 'General'		, FCKLang.DlgDocGeneralTab ) ;
window.parent.AddTab( 'Background'	, FCKLang.DlgDocBackTab ) ;
window.parent.AddTab( 'Colors'		, FCKLang.DlgDocColorsTab ) ;
window.parent.AddTab( 'Meta'		, FCKLang.DlgDocMetaTab ) ;

// Function called when a dialog tag is selected.
function OnDialogTabChange( tabCode )
{
	ShowE( 'divGeneral'		, ( tabCode == 'General' ) ) ;
	ShowE( 'divBackground'	, ( tabCode == 'Background' ) ) ;
	ShowE( 'divColors'		, ( tabCode == 'Colors' ) ) ;
	ShowE( 'divMeta'		, ( tabCode == 'Meta' ) ) ;

	ShowE( 'ePreview'		, ( tabCode == 'Background' || tabCode == 'Colors' ) ) ;
}

//#### Get Base elements from the document: BEGIN

// The HTML element of the document.
var oHTML = FCK.EditorDocument.getElementsByTagName('html')[0] ;

// The HEAD element of the document.
var oHead = oHTML.getElementsByTagName('head')[0] ;

var oBody = FCK.EditorDocument.body ;

// This object contains all META tags defined in the document.
var oMetaTags = new Object() ;

// Get all META tags defined in the document.
AppendMetaCollection( oMetaTags, oHead.getElementsByTagName('meta') ) ;
AppendMetaCollection( oMetaTags, oHead.getElementsByTagName('fck:meta') ) ;

function AppendMetaCollection( targetObject, metaCollection )
{
	// Loop throw all METAs and put it in the HashTable.
	for ( var i = 0 ; i < metaCollection.length ; i++ )
	{
		// Try to get the "name" attribute.
		var sName = GetAttribute( metaCollection[i], 'name', GetAttribute( metaCollection[i], '___fcktoreplace:name', '' ) ) ;

		// If no "name", try with the "http-equiv" attribute.
		if ( sName.length == 0 )
		{
			if ( oEditor.FCKBrowserInfo.IsIE )
			{
				// Get the http-equiv value from the outerHTML.
				var oHttpEquivMatch = metaCollection[i].outerHTML.match( oEditor.FCKRegexLib.MetaHttpEquiv ) ;
				if ( oHttpEquivMatch )
					sName = oHttpEquivMatch[1] ;
			}
			else
				sName = GetAttribute( metaCollection[i], 'http-equiv', '' ) ;
		}

		if ( sName.length > 0 )
			targetObject[ sName.toLowerCase() ] = metaCollection[i] ;
	}
}

//#### END

// Set a META tag in the document.
function SetMetadata( name, content, isHttp )
{
	if ( content.length == 0 )
	{
		RemoveMetadata( name ) ;
		return ;
	}

	var oMeta = oMetaTags[ name.toLowerCase() ] ;

	if ( !oMeta )
	{
		oMeta = oHead.appendChild( FCK.EditorDocument.createElement('META') ) ;

		if ( isHttp )
			SetAttribute( oMeta, 'http-equiv', name ) ;
		else
		{
			// On IE, it is not possible to set the "name" attribute of the META tag.
			// So a temporary attribute is used and it is replaced when getting the
			// editor's HTML/XHTML value. This is sad, I know :(
			if ( oEditor.FCKBrowserInfo.IsIE )
				SetAttribute( oMeta, '___fcktoreplace:name', name ) ;
			else
				SetAttribute( oMeta, 'name', name ) ;
		}

		oMetaTags[ name.toLowerCase() ] = oMeta ;
	}

	SetAttribute( oMeta, 'content', content ) ;
//	oMeta.content = content ;
}

function RemoveMetadata( name )
{
	var oMeta = oMetaTags[ name.toLowerCase() ] ;

	if ( oMeta && oMeta != null )
	{
		oMeta.parentNode.removeChild( oMeta ) ;
		oMetaTags[ name.toLowerCase() ] = null ;
	}
}

function GetMetadata( name )
{
	var oMeta = oMetaTags[ name.toLowerCase() ] ;

	if ( oMeta && oMeta != null )
		return oMeta.getAttribute( 'content', 2 ) ;
	else
		return '' ;
}

window.onload = function ()
{
	// Show/Hide the "Browse Server" button.
	GetE('tdBrowse').style.display = oEditor.FCKConfig.ImageBrowser ? "" : "none";

	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage( document ) ;

	FillFields() ;

	UpdatePreview() ;

	// Show the "Ok" button.
	window.parent.SetOkButton( true ) ;

	window.parent.SetAutoSize( true ) ;
}

function FillFields()
{
	// ### General Info
	GetE('txtPageTitle').value = FCK.EditorDocument.title ;

	GetE('selDirection').value	= GetAttribute( oHTML, 'dir', '' ) ;
	GetE('txtLang').value		= GetAttribute( oHTML, 'xml:lang', GetAttribute( oHTML, 'lang', '' ) ) ;	// "xml:lang" takes precedence to "lang".

	// Character Set Encoding.
//	if ( oEditor.FCKBrowserInfo.IsIE )
//		var sCharSet = FCK.EditorDocument.charset ;
//	else
		var sCharSet = GetMetadata( 'Content-Type' ) ;

	if ( sCharSet != null && sCharSet.length > 0 )
	{
//		if ( !oEditor.FCKBrowserInfo.IsIE )
			sCharSet = sCharSet.match( /[^=]*$/ ) ;

		GetE('selCharSet').value = sCharSet ;

		if ( GetE('selCharSet').selectedIndex == -1 )
		{
			GetE('selCharSet').value = '...' ;
			GetE('txtCustomCharSet').value = sCharSet ;

			CheckOther( GetE('selCharSet'), 'txtCustomCharSet' ) ;
		}
	}

	// Document Type.
	if ( FCK.DocTypeDeclaration && FCK.DocTypeDeclaration.length > 0 )
	{
		GetE('selDocType').value = FCK.DocTypeDeclaration ;

		if ( GetE('selDocType').selectedIndex == -1 )
		{
			GetE('selDocType').value = '...' ;
			GetE('txtDocType').value = FCK.DocTypeDeclaration ;

			CheckOther( GetE('selDocType'), 'txtDocType' ) ;
		}
	}

	// Document Type.
	GetE('chkIncXHTMLDecl').checked = ( FCK.XmlDeclaration && FCK.XmlDeclaration.length > 0 ) ;

	// ### Background
	GetE('txtBackColor').value = GetAttribute( oBody, 'bgColor'		, '' ) ;
	GetE('txtBackImage').value = GetAttribute( oBody, 'background'	, '' ) ;
	GetE('chkBackNoScroll').checked = ( GetAttribute( oBody, 'bgProperties', '' ).toLowerCase() == 'fixed' ) ;

	// ### Colors
	GetE('txtColorText').value		= GetAttribute( oBody, 'text'	, '' ) ;
	GetE('txtColorLink').value		= GetAttribute( oBody, 'link'	, '' ) ;
	GetE('txtColorVisited').value	= GetAttribute( oBody, 'vLink'	, '' ) ;
	GetE('txtColorActive').value	= GetAttribute( oBody, 'aLink'	, '' ) ;

	// ### Margins
	GetE('txtMarginTop').value		= GetAttribute( oBody, 'topMargin'		, '' ) ;
	GetE('txtMarginLeft').value		= GetAttribute( oBody, 'leftMargin'		, '' ) ;
	GetE('txtMarginRight').value	= GetAttribute( oBody, 'rightMargin'	, '' ) ;
	GetE('txtMarginBottom').value	= GetAttribute( oBody, 'bottomMargin'	, '' ) ;

	// ### Meta Data
	GetE('txtMetaKeywords').value		= GetMetadata( 'keywords' ) ;
	GetE('txtMetaDescription').value	= GetMetadata( 'description' ) ;
	GetE('txtMetaAuthor').value			= GetMetadata( 'author' ) ;
	GetE('txtMetaCopyright').value		= GetMetadata( 'copyright' ) ;
}

// Called when the "Ok" button is clicked.
function Ok()
{
	// ### General Info
	FCK.EditorDocument.title = GetE('txtPageTitle').value ;

	var oHTML = FCK.EditorDocument.getElementsByTagName('html')[0] ;

	SetAttribute( oHTML, 'dir'		, GetE('selDirection').value ) ;
	SetAttribute( oHTML, 'lang'		, GetE('txtLang').value ) ;
	SetAttribute( oHTML, 'xml:lang'	, GetE('txtLang').value ) ;

	// Character Set Enconding.
	var sCharSet = GetE('selCharSet').value ;
	if ( sCharSet == '...' )
		sCharSet = GetE('txtCustomCharSet').value ;

	if ( sCharSet.length > 0 )
			sCharSet = 'text/html; charset=' + sCharSet ;

//	if ( oEditor.FCKBrowserInfo.IsIE )
//		FCK.EditorDocument.charset = sCharSet ;
//	else
		SetMetadata( 'Content-Type', sCharSet, true ) ;

	// Document Type
	var sDocType = GetE('selDocType').value ;
	if ( sDocType == '...' )
		sDocType = GetE('txtDocType').value ;

	FCK.DocTypeDeclaration = sDocType ;

	// XHTML Declarations.
	if ( GetE('chkIncXHTMLDecl').checked )
	{
		if ( sCharSet.length == 0 )
			sCharSet = 'utf-8' ;

		FCK.XmlDeclaration = '<' + '?xml version="1.0" encoding="' + sCharSet + '"?>' ;

		SetAttribute( oHTML, 'xmlns', 'http://www.w3.org/1999/xhtml' ) ;
	}
	else
	{
		FCK.XmlDeclaration = null ;
		oHTML.removeAttribute( 'xmlns', 0 ) ;
	}

	// ### Background
	SetAttribute( oBody, 'bgcolor'		, GetE('txtBackColor').value ) ;
	SetAttribute( oBody, 'background'	, GetE('txtBackImage').value ) ;
	SetAttribute( oBody, 'bgproperties'	, GetE('chkBackNoScroll').checked ? 'fixed' : '' ) ;

	// ### Colors
	SetAttribute( oBody, 'text'	, GetE('txtColorText').value ) ;
	SetAttribute( oBody, 'link'	, GetE('txtColorLink').value ) ;
	SetAttribute( oBody, 'vlink', GetE('txtColorVisited').value ) ;
	SetAttribute( oBody, 'alink', GetE('txtColorActive').value ) ;

	// ### Margins
	SetAttribute( oBody, 'topmargin'	, GetE('txtMarginTop').value ) ;
	SetAttribute( oBody, 'leftmargin'	, GetE('txtMarginLeft').value ) ;
	SetAttribute( oBody, 'rightmargin'	, GetE('txtMarginRight').value ) ;
	SetAttribute( oBody, 'bottommargin'	, GetE('txtMarginBottom').value ) ;

	// ### Meta data
	SetMetadata( 'keywords'		, GetE('txtMetaKeywords').value ) ;
	SetMetadata( 'description'	, GetE('txtMetaDescription').value ) ;
	SetMetadata( 'author'		, GetE('txtMetaAuthor').value ) ;
	SetMetadata( 'copyright'	, GetE('txtMetaCopyright').value ) ;

	return true ;
}

var bPreviewIsLoaded = false ;
var oPreviewWindow ;
var oPreviewBody ;

// Called by the Preview page when loaded.
function OnPreviewLoad( previewWindow, previewBody )
{
	oPreviewWindow	= previewWindow ;
	oPreviewBody	= previewBody ;

	bPreviewIsLoaded = true ;
	UpdatePreview() ;
}

function UpdatePreview()
{
	if ( !bPreviewIsLoaded )
		return ;

	// ### Background
	SetAttribute( oPreviewBody, 'bgcolor'		, GetE('txtBackColor').value ) ;
	SetAttribute( oPreviewBody, 'background'	, GetE('txtBackImage').value ) ;
	SetAttribute( oPreviewBody, 'bgproperties'	, GetE('chkBackNoScroll').checked ? 'fixed' : '' ) ;

	// ### Colors
	SetAttribute( oPreviewBody, 'text', GetE('txtColorText').value ) ;

	oPreviewWindow.SetLinkColor( GetE('txtColorLink').value ) ;
	oPreviewWindow.SetVisitedColor( GetE('txtColorVisited').value ) ;
	oPreviewWindow.SetActiveColor( GetE('txtColorActive').value ) ;
}

function CheckOther( combo, txtField )
{
	var bNotOther = ( combo.value != '...' ) ;

	GetE(txtField).style.backgroundColor = ( bNotOther ? '#cccccc' : '' ) ;
	GetE(txtField).disabled = bNotOther ;
}

function SetColor( inputId, color )
{
	GetE( inputId ).value = color + '' ;
	UpdatePreview() ;
}

function SelectBackColor( color )		{ SetColor('txtBackColor', color ) ; }
function SelectColorText( color )		{ SetColor('txtColorText', color ) ; }
function SelectColorLink( color )		{ SetColor('txtColorLink', color ) ; }
function SelectColorVisited( color )	{ SetColor('txtColorVisited', color ) ; }
function SelectColorActive( color )		{ SetColor('txtColorActive', color ) ; }

function SelectColor( wich )
{
	switch ( wich )
	{
		case 'Back'			: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, SelectBackColor, window ) ; return ;
		case 'ColorText'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, SelectColorText, window ) ; return ;
		case 'ColorLink'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, SelectColorLink, window ) ; return ;
		case 'ColorVisited'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, SelectColorVisited, window ) ; return ;
		case 'ColorActive'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, SelectColorActive, window ) ; return ;
	}
}

function BrowseServerBack()
{
	OpenFileBrowser( FCKConfig.ImageBrowserURL, FCKConfig.ImageBrowserWindowWidth, FCKConfig.ImageBrowserWindowHeight ) ;
}

function SetUrl( url )
{
	GetE('txtBackImage').value = url ;
	UpdatePreview() ;
}

	</script>
</head>
<body style="overflow: hidden">
	<table cellspacing="0" cellpadding="0" width="100%" border="0" style="height: 100%">
		<tr>
			<td valign="top" style="height: 100%">
				<div id="divGeneral">
					<span fcklang="DlgDocPageTitle">Page Title</span><br />
					<input id="txtPageTitle" style="width: 100%" type="text" />
					<br />
					<table cellspacing="0" cellpadding="0" border="0">
						<tr>
							<td>
								<span fcklang="DlgDocLangDir">Language Direction</span><br />
								<select id="selDirection">
									<option value="" selected="selected"></option>
									<option value="ltr" fcklang="DlgDocLangDirLTR">Left to Right (LTR)</option>
									<option value="rtl" fcklang="DlgDocLangDirRTL">Right to Left (RTL)</option>
								</select>
							</td>
							<td>
								&nbsp;&nbsp;&nbsp;</td>
							<td>
								<span fcklang="DlgDocLangCode">Language Code</span><br />
								<input id="txtLang" type="text" />
							</td>
						</tr>
					</table>
					<br />
					<table cellspacing="0" cellpadding="0" width="100%" border="0">
						<tr>
							<td style="white-space: nowrap">
								<span fcklang="DlgDocCharSet">Character Set Encoding</span><br />
								<select id="selCharSet" onchange="CheckOther( this, 'txtCustomCharSet' );">
									<option value="" selected="selected"></option>
									<option value="us-ascii">ASCII</option>
									<option fcklang="DlgDocCharSetCE" value="iso-8859-2">Central European</option>
									<option fcklang="DlgDocCharSetCT" value="big5">Chinese Traditional (Big5)</option>
									<option fcklang="DlgDocCharSetCR" value="iso-8859-5">Cyrillic</option>
									<option fcklang="DlgDocCharSetGR" value="iso-8859-7">Greek</option>
									<option fcklang="DlgDocCharSetJP" value="iso-2022-jp">Japanese</option>
									<option fcklang="DlgDocCharSetKR" value="iso-2022-kr">Korean</option>
									<option fcklang="DlgDocCharSetTR" value="iso-8859-9">Turkish</option>
									<option fcklang="DlgDocCharSetUN" value="utf-8">Unicode (UTF-8)</option>
									<option fcklang="DlgDocCharSetWE" value="iso-8859-1">Western European</option>
									<option fcklang="DlgOpOther" value="...">&lt;Other&gt;</option>
								</select>
							</td>
							<td>
								&nbsp;&nbsp;&nbsp;</td>
							<td width="100%">
								<span fcklang="DlgDocCharSetOther">Other Character Set Encoding</span><br />
								<input id="txtCustomCharSet" style="width: 100%; background-color: #cccccc" disabled="disabled"
									type="text" />
							</td>
						</tr>
						<tr>
							<td colspan="3">
								&nbsp;</td>
						</tr>
						<tr>
							<td nowrap="nowrap">
								<span fcklang="DlgDocDocType">Document Type Heading</span><br />
								<select id="selDocType" name="selDocType" onchange="CheckOther( this, 'txtDocType' );">
									<option value="" selected="selected"></option>
									<option value='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'>HTML
										4.01 Transitional</option>
									<option value='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'>
										HTML 4.01 Strict</option>
									<option value='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'>
										HTML 4.01 Frameset</option>
									<option value='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'>
										XHTML 1.0 Transitional</option>
									<option value='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'>
										XHTML 1.0 Strict</option>
									<option value='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">'>
										XHTML 1.0 Frameset</option>
									<option value='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'>
										XHTML 1.1</option>
									<option value='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'>HTML 3.2</option>
									<option value='<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">'>HTML 2.0</option>
									<option value="..." fcklang="DlgOpOther">&lt;Other&gt;</option>
								</select>
							</td>
							<td>
							</td>
							<td width="100%">
								<span fcklang="DlgDocDocTypeOther">Other Document Type Heading</span><br />
								<input id="txtDocType" style="width: 100%; background-color: #cccccc" disabled="disabled"
									type="text" />
							</td>
						</tr>
					</table>
					<br />
					<input id="chkIncXHTMLDecl" type="checkbox" />
					<label for="chkIncXHTMLDecl" fcklang="DlgDocIncXHTML">
						Include XHTML Declarations</label>
				</div>
				<div id="divBackground" style="display: none">
					<span fcklang="DlgDocBgColor">Background Color</span><br />
					<input id="txtBackColor" type="text" onchange="UpdatePreview();" onkeyup="UpdatePreview();" />&nbsp;<input
						id="btnSelBackColor" onclick="SelectColor( 'Back' )" type="button" value="Select..."
						fcklang="DlgCellBtnSelect" /><br />
					<br />
					<span fcklang="DlgDocBgImage">Background Image URL</span><br />
					<table cellspacing="0" cellpadding="0" width="100%" border="0">
						<tr>
							<td width="100%">
								<input id="txtBackImage" style="width: 100%" type="text" onchange="UpdatePreview();"
									onkeyup="UpdatePreview();" /></td>
							<td id="tdBrowse" nowrap="nowrap">
								&nbsp;<input id="btnBrowse" onclick="BrowseServerBack();" type="button" fcklang="DlgBtnBrowseServer"
									value="Browse Server" /></td>
						</tr>
					</table>
					<input id="chkBackNoScroll" type="checkbox" onclick="UpdatePreview();" />
					<label for="chkBackNoScroll" fcklang="DlgDocBgNoScroll">
						Nonscrolling Background</label>
				</div>
				<div id="divColors" style="display: none">
					<table cellspacing="0" cellpadding="0" width="100%" border="0">
						<tr>
							<td>
								<span fcklang="DlgDocCText">Text</span><br />
								<input id="txtColorText" type="text" onchange="UpdatePreview();" onkeyup="UpdatePreview();" /><input
									onclick="SelectColor( 'ColorText' )" type="button" value="Select..." fcklang="DlgCellBtnSelect" />
								<br />
								<span fcklang="DlgDocCLink">Link</span><br />
								<input id="txtColorLink" type="text" onchange="UpdatePreview();" onkeyup="UpdatePreview();" /><input
									onclick="SelectColor( 'ColorLink' )" type="button" value="Select..." fcklang="DlgCellBtnSelect" />
								<br />
								<span fcklang="DlgDocCVisited">Visited Link</span><br />
								<input id="txtColorVisited" type="text" onchange="UpdatePreview();" onkeyup="UpdatePreview();" /><input
									onclick="SelectColor( 'ColorVisited' )" type="button" value="Select..." fcklang="DlgCellBtnSelect" />
								<br />
								<span fcklang="DlgDocCActive">Active Link</span><br />
								<input id="txtColorActive" type="text" onchange="UpdatePreview();" onkeyup="UpdatePreview();" /><input
									onclick="SelectColor( 'ColorActive' )" type="button" value="Select..." fcklang="DlgCellBtnSelect" />
							</td>
							<td valign="middle" align="center">
								<table cellspacing="2" cellpadding="0" border="0">
									<tr>
										<td>
											<span fcklang="DlgDocMargins">Page Margins</span></td>
									</tr>
									<tr>
										<td style="border: #000000 1px solid; padding: 5px">
											<table cellpadding="0" cellspacing="0" border="0" dir="ltr">
												<tr>
													<td align="center" colspan="3">
														<span fcklang="DlgDocMaTop">Top</span><br />
														<input id="txtMarginTop" type="text" size="3" />
													</td>
												</tr>
												<tr>
													<td align="left">
														<span fcklang="DlgDocMaLeft">Left</span><br />
														<input id="txtMarginLeft" type="text" size="3" />
													</td>
													<td>
														&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
													<td align="right">
														<span fcklang="DlgDocMaRight">Right</span><br />
														<input id="txtMarginRight" type="text" size="3" />
													</td>
												</tr>
												<tr>
													<td align="center" colspan="3">
														<span fcklang="DlgDocMaBottom">Bottom</span><br />
														<input id="txtMarginBottom" type="text" size="3" />
													</td>
												</tr>
											</table>
										</td>
									</tr>
								</table>
							</td>
						</tr>
					</table>
				</div>
				<div id="divMeta" style="display: none">
					<span fcklang="DlgDocMeIndex">Document Indexing Keywords (comma separated)</span><br />
					<textarea id="txtMetaKeywords" style="width: 100%" rows="2" cols="20"></textarea>
					<br />
					<span fcklang="DlgDocMeDescr">Document Description</span><br />
					<textarea id="txtMetaDescription" style="width: 100%" rows="4" cols="20"></textarea>
					<br />
					<span fcklang="DlgDocMeAuthor">Author</span><br />
					<input id="txtMetaAuthor" style="width: 100%" type="text" /><br />
					<br />
					<span fcklang="DlgDocMeCopy">Copyright</span><br />
					<input id="txtMetaCopyright" type="text" style="width: 100%" />
				</div>
			</td>
		</tr>
		<tr id="ePreview" style="display: none">
			<td>
				<span fcklang="DlgDocPreview">Preview</span><br />
				<iframe id="frmPreview" src="fck_docprops/fck_document_preview.html" width="100%"
					height="100"></iframe>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fck_specialchar.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Special Chars Selector dialog window.
-->
<html>
	<head>
		<meta name="robots" content="noindex, nofollow">
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<style type="text/css">
				.Hand
				{
					cursor: pointer ;
					cursor: hand ;
				}
				.Sample { font-size: 24px; }
		</style>
		<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

var oSample ;

function insertChar(charValue)
{
	oEditor.FCKUndo.SaveUndoStep() ;
	oEditor.FCK.InsertHtml( charValue || "" ) ;
	window.parent.Cancel() ;
}

function over(td)
{
	if ( ! oSample )
		return ;
	oSample.innerHTML = td.innerHTML ;
	td.className = 'LightBackground SpecialCharsOver Hand' ;
}

function out(td)
{
	if ( ! oSample )
		return ;
	oSample.innerHTML = "&nbsp;" ;
	td.className = 'DarkBackground SpecialCharsOut Hand' ;
}

function setDefaults()
{
	// Gets the sample placeholder.
	oSample = document.getElementById("SampleTD") ;

	// First of all, translates the dialog box texts.
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	window.parent.SetAutoSize( true ) ;
}

		</script>
	</head>
	<body onload="setDefaults()" style="overflow: hidden">
		<table cellpadding="0" cellspacing="0" width="100%" height="100%">
			<tr>
				<td width="100%">
					<table cellpadding="1" cellspacing="1" align="center" border="0" width="100%" height="100%">
						<script type="text/javascript">
var aChars = ["!","&quot;","#","$","%","&amp;","\\'","(",")","*","+","-",".","/","0","1","2","3","4","5","6","7","8","9",":",";","&lt;","=","&gt;","?","@","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","[","]","^","_","`","a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","{","|","}","~","&euro;","&lsquo;","&rsquo;","&rsquo;","&ldquo;","&rdquo;","&ndash;","&mdash;","&iexcl;","&cent;","&pound;","&curren;","&yen;","&brvbar;","&sect;","&uml;","&copy;","&ordf;","&laquo;","&not;","&reg;","&macr;","&deg;","&plusmn;","&sup2;","&sup3;","&acute;","&micro;","&para;","&middot;","&cedil;","&sup1;","&ordm;","&raquo;","&frac14;","&frac12;","&frac34;","&iquest;","&Agrave;","&Aacute;","&Acirc;","&Atilde;","&Auml;","&Aring;","&AElig;","&Ccedil;","&Egrave;","&Eacute;","&Ecirc;","&Euml;","&Igrave;","&Iacute;","&Icirc;","&Iuml;","&ETH;","&Ntilde;","&Ograve;","&Oacute;","&Ocirc;","&Otilde
 ;","&Ouml;","&times;","&Oslash;","&Ugrave;","&Uacute;","&Ucirc;","&Uuml;","&Yacute;","&THORN;","&szlig;","&agrave;","&aacute;","&acirc;","&atilde;","&auml;","&aring;","&aelig;","&ccedil;","&egrave;","&eacute;","&ecirc;","&euml;","&igrave;","&iacute;","&icirc;","&iuml;","&eth;","&ntilde;","&ograve;","&oacute;","&ocirc;","&otilde;","&ouml;","&divide;","&oslash;","&ugrave;","&uacute;","&ucirc;","&uuml;","&uuml;","&yacute;","&thorn;","&yuml;","&OElig;","&oelig;","&sbquo;","&#8219;","&bdquo;","&hellip;","&trade;","&#9658;","&bull;","&rarr;","&rArr;","&hArr;","&diams;","&asymp;"] ;

var cols = 20 ;

var i = 0 ;
while (i < aChars.length)
{
	document.write("<TR>") ;
	for(var j = 0 ; j < cols ; j++)
	{
		if (aChars[i])
		{
			document.write('<TD width="1%" class="DarkBackground SpecialCharsOut Hand" align="center" onclick="insertChar(\'' + aChars[i].replace(/&/g, "&amp;") + '\')" onmouseover="over(this)" onmouseout="out(this)">') ;
			document.write(aChars[i]) ;
		}
		else
			document.write("<TD class='DarkBackground SpecialCharsOut'>&nbsp;") ;
		document.write("<\/TD>") ;
		i++ ;
	}
	document.write("<\/TR>") ;
}
						</script>
					</table>
				</td>
				<td nowrap>&nbsp;&nbsp;&nbsp;&nbsp;</td>
				<td valign="top">
					<table width="40" cellpadding="0" cellspacing="0" border="0">
						<tr>
							<td id="SampleTD" width="40" height="40" align="center" class="DarkBackground SpecialCharsOut Sample">&nbsp;</td>
						</tr>
					</table>
				</td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: fck_form.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Form dialog window.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title></title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta content="noindex, nofollow" name="robots" />
	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
	<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;

var oActiveEl = oEditor.FCKSelection.MoveToAncestorNode( 'FORM' ) ;

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	if ( oActiveEl )
	{
		GetE('txtName').value	= oActiveEl.name ;
		GetE('txtAction').value	= oActiveEl.getAttribute( 'action', 2 ) ;
		GetE('txtMethod').value	= oActiveEl.method ;
	}
	else
		oActiveEl = null ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function Ok()
{
	if ( !oActiveEl )
	{
		oActiveEl = oEditor.FCK.InsertElement( 'form' ) ;

		if ( oEditor.FCKBrowserInfo.IsGeckoLike )
			oEditor.FCKTools.AppendBogusBr( oActiveEl ) ;
	}

	oActiveEl.name = GetE('txtName').value ;
	SetAttribute( oActiveEl, 'action', GetE('txtAction').value ) ;
	oActiveEl.method = GetE('txtMethod').value ;

	return true ;
}

	</script>
</head>
<body style="overflow: hidden">
	<table width="100%" style="height: 100%">
		<tr>
			<td align="center">
				<table cellspacing="0" cellpadding="0" width="80%" border="0">
					<tr>
						<td>
							<span fcklang="DlgFormName">Name</span><br />
							<input style="width: 100%" type="text" id="txtName" />
						</td>
					</tr>
					<tr>
						<td>
							<span fcklang="DlgFormAction">Action</span><br />
							<input style="width: 100%" type="text" id="txtAction" />
						</td>
					</tr>
					<tr>
						<td>
							<span fcklang="DlgFormMethod">Method</span><br />
							<select id="txtMethod">
								<option value="get" selected="selected">GET</option>
								<option value="post">POST</option>
							</select>
						</td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fck_select.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Select dialog window.
-->
<html>
	<head>
		<title>Select Properties</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta content="noindex, nofollow" name="robots">
		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
		<script type="text/javascript" src="fck_select/fck_select.js"></script>
		<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;

var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;

var oListText ;
var oListValue ;

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	oListText	= document.getElementById( 'cmbText' ) ;
	oListValue	= document.getElementById( 'cmbValue' ) ;

	if ( oActiveEl && oActiveEl.tagName == 'SELECT' )
	{
		GetE('txtName').value		= oActiveEl.name ;
		GetE('txtSelValue').value	= oActiveEl.value ;
		GetE('txtLines').value		= GetAttribute( oActiveEl, 'size' ) ;
		GetE('chkMultiple').checked	= oActiveEl.multiple ;

		// Load the actual options
		for ( var i = 0 ; i < oActiveEl.options.length ; i++ )
		{
			var sText	= HTMLDecode( oActiveEl.options[i].innerHTML ) ;
			var sValue	= oActiveEl.options[i].value ;

			AddComboOption( oListText, sText, sText ) ;
			AddComboOption( oListValue, sValue, sValue ) ;
		}
	}
	else
		oActiveEl = null ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function Ok()
{
	oEditor.FCKUndo.SaveUndoStep() ;
	
	var sSize = GetE('txtLines').value ;
	if ( sSize == null || isNaN( sSize ) || sSize <= 1 )
		sSize = '' ;

	if ( !oActiveEl )
	{
		oActiveEl = oEditor.FCK.InsertElement( 'select' ) ;
	}

	SetAttribute( oActiveEl, 'name'	, GetE('txtName').value ) ;
	SetAttribute( oActiveEl, 'size'	, sSize ) ;
	oActiveEl.multiple = ( sSize.length > 0 && GetE('chkMultiple').checked ) ;

	// Remove all options.
	while ( oActiveEl.options.length > 0 )
		oActiveEl.remove(0) ;

	// Add all available options.
	for ( var i = 0 ; i < oListText.options.length ; i++ )
	{
		var sText	= oListText.options[i].value ;
		var sValue	= oListValue.options[i].value ;
		if ( sValue.length == 0 ) sValue = sText ;

		var oOption = AddComboOption( oActiveEl, sText, sValue, oDOM ) ;

		if ( sValue == GetE('txtSelValue').value )
		{
			SetAttribute( oOption, 'selected', 'selected' ) ;
			oOption.selected = true ;
		}
	}

	return true ;
}

		</script>
	</head>
	<body style="overflow: hidden">
		<table width="100%" height="100%">
			<tr>
				<td>
					<table width="100%">
						<tr>
							<td nowrap><span fckLang="DlgSelectName">Name</span>&nbsp;</td>
							<td width="100%" colSpan="2"><input id="txtName" style="WIDTH: 100%" type="text"></td>
						</tr>
						<tr>
							<td nowrap><span fckLang="DlgSelectValue">Value</span>&nbsp;</td>
							<td width="100%" colSpan="2"><input id="txtSelValue" style="WIDTH: 100%; BACKGROUND-COLOR: buttonface" type="text" readonly></td>
						</tr>
						<tr>
							<td nowrap><span fckLang="DlgSelectSize">Size</span>&nbsp;</td>
							<td nowrap><input id="txtLines" type="text" size="2" value="">&nbsp;<span fckLang="DlgSelectLines">lines</span></td>
							<td nowrap align="right"><input id="chkMultiple" name="chkMultiple" type="checkbox"><label for="chkMultiple" fckLang="DlgSelectChkMulti">Allow
									multiple selections</label></td>
						</tr>
					</table>
					<br>
					<hr style="POSITION: absolute">
					<span style="LEFT: 10px; POSITION: relative; TOP: -7px" class="BackColor">&nbsp;<span fckLang="DlgSelectOpAvail">Available
							Options</span>&nbsp;</span>
					<table width="100%">
						<tr>
							<td width="50%"><span fckLang="DlgSelectOpText">Text</span><br>
								<input id="txtText" style="WIDTH: 100%" type="text" name="txtText">
							</td>
							<td width="50%"><span fckLang="DlgSelectOpValue">Value</span><br>
								<input id="txtValue" style="WIDTH: 100%" type="text" name="txtValue">
							</td>
							<td vAlign="bottom"><input onclick="Add();" type="button" fckLang="DlgSelectBtnAdd" value="Add"></td>
							<td vAlign="bottom"><input onclick="Modify();" type="button" fckLang="DlgSelectBtnModify" value="Modify"></td>
						</tr>
						<tr>
							<td rowSpan="2"><select id="cmbText" style="WIDTH: 100%" onchange="GetE('cmbValue').selectedIndex = this.selectedIndex;Select(this);"
									size="5" name="cmbText"></select>
							</td>
							<td rowSpan="2"><select id="cmbValue" style="WIDTH: 100%" onchange="GetE('cmbText').selectedIndex = this.selectedIndex;Select(this);"
									size="5" name="cmbValue"></select>
							</td>
							<td vAlign="top" colSpan="2">
							</td>
						</tr>
						<tr>
							<td vAlign="bottom" colSpan="2"><input style="WIDTH: 100%" onclick="Move(-1);" type="button" fckLang="DlgSelectBtnUp" value="Up">
								<br>
								<input style="WIDTH: 100%" onclick="Move(1);" type="button" fckLang="DlgSelectBtnDown"
									value="Down">
							</td>
						</tr>
						<TR>
							<TD vAlign="bottom" colSpan="4"><INPUT onclick="SetSelectedValue();" type="button" fckLang="DlgSelectBtnSetValue" value="Set as selected value">&nbsp;&nbsp;
								<input onclick="Delete();" type="button" fckLang="DlgSelectBtnDelete" value="Delete"></TD>
						</TR>
					</table>
				</td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: fck_textarea.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Text Area dialog window.
-->
<html>
	<head>
		<title>Text Area Properties</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta content="noindex, nofollow" name="robots">
		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
		<script type="text/javascript">

var oEditor = window.parent.InnerDialogLoaded() ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;

var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	if ( oActiveEl && oActiveEl.tagName == 'TEXTAREA' )
	{
		GetE('txtName').value		= oActiveEl.name ;
		GetE('txtCols').value		= GetAttribute( oActiveEl, 'cols' ) ;
		GetE('txtRows').value		= GetAttribute( oActiveEl, 'rows' ) ;
	}
	else
		oActiveEl = null ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function Ok()
{
	oEditor.FCKUndo.SaveUndoStep() ;
	
	if ( !oActiveEl )
	{
		oActiveEl = oEditor.FCK.InsertElement( 'textarea' ) ;
	}

	oActiveEl.name = GetE('txtName').value ;
	SetAttribute( oActiveEl, 'cols', GetE('txtCols').value ) ;
	SetAttribute( oActiveEl, 'rows', GetE('txtRows').value ) ;

	return true ;
}

		</script>
	</head>
	<body style="overflow: hidden">
		<table height="100%" width="100%">
			<tr>
				<td align="center">
					<table border="0" cellpadding="0" cellspacing="0" width="80%">
						<tr>
							<td>
								<span fckLang="DlgTextareaName">Name</span><br>
								<input type="text" id="txtName" style="WIDTH: 100%">
								<span fckLang="DlgTextareaCols">Collumns</span><br>
								<input id="txtCols" type="text" size="5">
								<br>
								<span fckLang="DlgTextareaRows">Rows</span><br>
								<input id="txtRows" type="text" size="5">
							</td>
						</tr>
					</table>
				</td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: fck_flash.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Flash Properties dialog window.
-->
<html>
	<head>
		<title>Flash Properties</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta content="noindex, nofollow" name="robots">
		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
		<script src="fck_flash/fck_flash.js" type="text/javascript"></script>
		<link href="common/fck_dialog_common.css" type="text/css" rel="stylesheet">
	</head>
	<body scroll="no" style="OVERFLOW: hidden">
		<div id="divInfo">
			<table cellSpacing="1" cellPadding="1" width="100%" border="0">
				<tr>
					<td>
						<table cellSpacing="0" cellPadding="0" width="100%" border="0">
							<tr>
								<td width="100%"><span fckLang="DlgImgURL">URL</span>
								</td>
								<td id="tdBrowse" style="DISPLAY: none" noWrap rowSpan="2">&nbsp; <input id="btnBrowse" onclick="BrowseServer();" type="button" value="Browse Server" fckLang="DlgBtnBrowseServer">
								</td>
							</tr>
							<tr>
								<td vAlign="top"><input id="txtUrl" onblur="UpdatePreview();" style="WIDTH: 100%" type="text">
								</td>
							</tr>
						</table>
					</td>
				</tr>
				<TR>
					<TD>
						<table cellSpacing="0" cellPadding="0" border="0">
							<TR>
								<TD nowrap>
									<span fckLang="DlgImgWidth">Width</span><br>
									<input id="txtWidth" onkeypress="return IsDigit(event);" type="text" size="3">
								</TD>
								<TD>&nbsp;</TD>
								<TD>
									<span fckLang="DlgImgHeight">Height</span><br>
									<input id="txtHeight" onkeypress="return IsDigit(event);" type="text" size="3">
								</TD>
							</TR>
						</table>
					</TD>
				</TR>
				<tr>
					<td vAlign="top">
						<table cellSpacing="0" cellPadding="0" width="100%" border="0">
							<tr>
								<td valign="top" width="100%">
									<table cellSpacing="0" cellPadding="0" width="100%">
										<tr>
											<td><span fckLang="DlgImgPreview">Preview</span></td>
										</tr>
										<tr>
											<td id="ePreviewCell" valign="top" class="FlashPreviewArea"><iframe src="fck_flash/fck_flash_preview.html" frameborder="0" marginheight="0" marginwidth="0"></iframe></td>
										</tr>
									</table>
								</td>
							</tr>
						</table>
					</td>
				</tr>
			</table>
		</div>
		<div id="divUpload" style="DISPLAY: none">
			<form id="frmUpload" method="post" target="UploadWindow" enctype="multipart/form-data" action="" onsubmit="return CheckUpload();">
				<span fckLang="DlgLnkUpload">Upload</span><br />
				<input id="txtUploadFile" style="WIDTH: 100%" type="file" size="40" name="NewFile" /><br />
				<br />
				<input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
				<iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe>
			</form>
		</div>
		<div id="divAdvanced" style="DISPLAY: none">
			<TABLE cellSpacing="0" cellPadding="0" border="0">
				<TR>
					<TD nowrap>
						<span fckLang="DlgFlashScale">Scale</span><BR>
						<select id="cmbScale">
							<option value="" selected></option>
							<option value="showall" fckLang="DlgFlashScaleAll">Show all</option>
							<option value="noborder" fckLang="DlgFlashScaleNoBorder">No Border</option>
							<option value="exactfit" fckLang="DlgFlashScaleFit">Exact Fit</option>
						</select></TD>
					<TD>&nbsp;&nbsp;&nbsp; &nbsp;
					</TD>
					<td valign="bottom">
						<table>
							<tr>
								<td><input id="chkAutoPlay" type="checkbox" checked></td>
								<td><label for="chkAutoPlay" nowrap fckLang="DlgFlashChkPlay">Auto Play</label>&nbsp;&nbsp;</td>
								<td><input id="chkLoop" type="checkbox" checked></td>
								<td><label for="chkLoop" nowrap fckLang="DlgFlashChkLoop">Loop</label>&nbsp;&nbsp;</td>
								<td><input id="chkMenu" type="checkbox" checked></td>
								<td><label for="chkMenu" nowrap fckLang="DlgFlashChkMenu">Enable Flash Menu</label></td>
							</tr>
						</table>
					</td>
				</TR>
			</TABLE>
			<br>
			&nbsp;
			<table cellSpacing="0" cellPadding="0" width="100%" align="center" border="0">
				<tr>
					<td vAlign="top" width="50%"><span fckLang="DlgGenId">Id</span><br>
						<input id="txtAttId" style="WIDTH: 100%" type="text">
					</td>
					<td>&nbsp;&nbsp;</td>
					<td vAlign="top" nowrap><span fckLang="DlgGenClass">Stylesheet Classes</span><br>
						<input id="txtAttClasses" style="WIDTH: 100%" type="text">
					</td>
					<td>&nbsp;&nbsp;</td>
					<td vAlign="top" nowrap width="50%">&nbsp;<span fckLang="DlgGenTitle">Advisory Title</span><br>
						<input id="txtAttTitle" style="WIDTH: 100%" type="text">
					</td>
				</tr>
			</table>
			<span fckLang="DlgGenStyle">Style</span><br>
			<input id="txtAttStyle" style="WIDTH: 100%" type="text">
		</div>
	</body>
</html>

--- NEW FILE: fck_source.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Source editor dialog window.
-->
<html>
	<head>
		<title>Source</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta name="robots" content="noindex, nofollow">
		<link href="common/fck_dialog_common.css" rel="stylesheet" type="text/css" />
		<script language="javascript">

var oEditor		= window.parent.InnerDialogLoaded() ;
var FCK			= oEditor.FCK ;
var FCKConfig	= oEditor.FCKConfig ;

window.onload = function()
{
	// EnableXHTML and EnableSourceXHTML has been deprecated
//	document.getElementById('txtSource').value = ( FCKConfig.EnableXHTML && FCKConfig.EnableSourceXHTML ? FCK.GetXHTML( FCKConfig.FormatSource ) : FCK.GetHTML( FCKConfig.FormatSource ) ) ;
	document.getElementById('txtSource').value = FCK.GetXHTML( FCKConfig.FormatSource ) ;

	// Activate the "OK" button.
	window.parent.SetOkButton( true ) ;
}

//#### The OK button was hit.
function Ok()
{
	if ( oEditor.FCKBrowserInfo.IsIE )
		oEditor.FCKUndo.SaveUndoStep() ;

	FCK.SetData( document.getElementById('txtSource').value, false ) ;

	return true ;
}
		</script>
	</head>
	<body scroll="no" style="OVERFLOW: hidden">
		<table width="100%" height="100%">
			<tr>
				<td height="100%"><textarea id="txtSource" dir="ltr" style="PADDING-RIGHT: 5px; PADDING-LEFT: 5px; FONT-SIZE: 14px; PADDING-BOTTOM: 5px; WIDTH: 100%; PADDING-TOP: 5px; FONT-FAMILY: Monospace; HEIGHT: 100%">Loading. Please wait...</textarea></td>
			</tr>
		</table>
	</body>
</html>

--- NEW FILE: fck_paste.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * This dialog is shown when, for some reason (usually security settings),
 * the user is not able to paste data from the clipboard to the editor using
 * the toolbar buttons or the context menu.
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
	<title></title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="robots" content="noindex, nofollow" />

	<script type="text/javascript">
var oEditor = window.parent.InnerDialogLoaded() ;
var FCK = oEditor.FCK;
var FCKTools	= oEditor.FCKTools ;
var FCKConfig	= oEditor.FCKConfig ;

window.onload = function ()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	var sPastingType = window.parent.dialogArguments.CustomValue ;

	if ( sPastingType == 'Word' || sPastingType == 'Security' )
	{
		if ( sPastingType == 'Security' )
			document.getElementById( 'xSecurityMsg' ).style.display = '' ;

		var oFrame = document.getElementById('frmData') ;
		oFrame.style.display = '' ;

		// Avoid errors if the pasted content has any script that fails: #389
		var oDoc = oFrame.contentWindow.document ;
		oDoc.open() ;
		oDoc.write('<html><head><script>window.onerror = function() { return true ; };<\/script><\/head><body><\/body><\/html>') ;
		oDoc.close() ;
		
		if ( oFrame.contentDocument )
			oFrame.contentDocument.designMode = 'on' ;
		else
			oFrame.contentWindow.document.body.contentEditable = true ;

		// Set the focus on the pasting area
		oFrame.contentWindow.focus();
	}
	else
	{
		document.getElementById('txtData').style.display = '' ;
	}

	if ( sPastingType != 'Word' )
		document.getElementById('oWordCommands').style.display = 'none' ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function Ok()
{
	// Before doing anything, save undo snapshot.
	oEditor.FCKUndo.SaveUndoStep() ;

	var sHtml ;

	var sPastingType = window.parent.dialogArguments.CustomValue ;

	if ( sPastingType == 'Word' || sPastingType == 'Security' )
	{
		var oFrame = document.getElementById('frmData') ;
		var oBody ;

		if ( oFrame.contentDocument )
			oBody = oFrame.contentDocument.body ;
		else
			oBody = oFrame.contentWindow.document.body ;

		if ( sPastingType == 'Word' )
		{
			// If a plugin creates a FCK.CustomCleanWord function it will be called instead of the default one
			if ( typeof( FCK.CustomCleanWord ) == 'function' )
				sHtml = FCK.CustomCleanWord( oBody, document.getElementById('chkRemoveFont').checked, document.getElementById('chkRemoveStyles').checked ) ;
			else
				sHtml = CleanWord( oBody, document.getElementById('chkRemoveFont').checked, document.getElementById('chkRemoveStyles').checked ) ;
		}
		else
			sHtml = oBody.innerHTML ;

		// Fix relative anchor URLs (IE automatically adds the current page URL).
		var re = new RegExp( window.location + "#", "g" ) ;
		sHtml = sHtml.replace( re, '#') ;
	}
	else
	{
		sHtml = oEditor.FCKTools.HTMLEncode( document.getElementById('txtData').value )  ;
		sHtml = FCKTools.ProcessLineBreaks( oEditor, FCKConfig, sHtml ) ;

		// FCK.InsertHtml() does not work for us, since document fragments cannot contain node fragments. :(
		// Use the marker method instead. It's primitive, but it works.
		var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
		var oDoc = oEditor.FCK.EditorDocument ;
		range.MoveToSelection() ;
		range.DeleteContents() ;
		var marker = [] ;
		for ( var i = 0 ; i < 5 ; i++ )
			marker.push( parseInt(Math.random() * 100000, 10 ) ) ;
		marker = marker.join( "" ) ;
		range.InsertNode ( oDoc.createTextNode( marker ) ) ;
		var bookmark = range.CreateBookmark() ;

		// Now we've got a marker indicating the paste position in the editor document.
		// Find its position in the HTML code.
		var htmlString = oDoc.body.innerHTML ;
		var index = htmlString.indexOf( marker ) ;

		// Split it the HTML code up, add the code we generated, and put them back together.
		var htmlList = [] ;
		htmlList.push( htmlString.substr( 0, index ) ) ;
		htmlList.push( sHtml ) ;
		htmlList.push( htmlString.substr( index + marker.length ) ) ;
		htmlString = htmlList.join( "" ) ;

		if ( oEditor.FCKBrowserInfo.IsIE )
			oEditor.FCK.SetInnerHtml( htmlString ) ;
		else
			oDoc.body.innerHTML = htmlString ;

		range.MoveToBookmark( bookmark ) ;
		range.Collapse( false ) ;
		range.Select() ;
		range.Release() ;
		return true ;
	}

	oEditor.FCK.InsertHtml( sHtml ) ;

	return true ;
}

function CleanUpBox()
{
	var oFrame = document.getElementById('frmData') ;

	if ( oFrame.contentDocument )
		oFrame.contentDocument.body.innerHTML = '' ;
	else
		oFrame.contentWindow.document.body.innerHTML = '' ;
}


// This function will be called from the PasteFromWord dialog (fck_paste.html)
// Input: oNode a DOM node that contains the raw paste from the clipboard
// bIgnoreFont, bRemoveStyles booleans according to the values set in the dialog
// Output: the cleaned string
function CleanWord( oNode, bIgnoreFont, bRemoveStyles )
{
	var html = oNode.innerHTML ;

	html = html.replace(/<o:p>\s*<\/o:p>/g, '') ;
	html = html.replace(/<o:p>.*?<\/o:p>/g, '&nbsp;') ;

	// Remove mso-xxx styles.
	html = html.replace( /\s*mso-[^:]+:[^;"]+;?/gi, '' ) ;

	// Remove margin styles.
	html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*;/gi, '' ) ;
	html = html.replace( /\s*MARGIN: 0cm 0cm 0pt\s*"/gi, "\"" ) ;

	html = html.replace( /\s*TEXT-INDENT: 0cm\s*;/gi, '' ) ;
	html = html.replace( /\s*TEXT-INDENT: 0cm\s*"/gi, "\"" ) ;

	html = html.replace( /\s*TEXT-ALIGN: [^\s;]+;?"/gi, "\"" ) ;

	html = html.replace( /\s*PAGE-BREAK-BEFORE: [^\s;]+;?"/gi, "\"" ) ;

	html = html.replace( /\s*FONT-VARIANT: [^\s;]+;?"/gi, "\"" ) ;

	html = html.replace( /\s*tab-stops:[^;"]*;?/gi, '' ) ;
	html = html.replace( /\s*tab-stops:[^"]*/gi, '' ) ;

	// Remove FONT face attributes.
	if ( bIgnoreFont )
	{
		html = html.replace( /\s*face="[^"]*"/gi, '' ) ;
		html = html.replace( /\s*face=[^ >]*/gi, '' ) ;

		html = html.replace( /\s*FONT-FAMILY:[^;"]*;?/gi, '' ) ;
	}

	// Remove Class attributes
	html = html.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3") ;

	// Remove styles.
	if ( bRemoveStyles )
		html = html.replace( /<(\w[^>]*) style="([^\"]*)"([^>]*)/gi, "<$1$3" ) ;

	// Remove empty styles.
	html =  html.replace( /\s*style="\s*"/gi, '' ) ;

	html = html.replace( /<SPAN\s*[^>]*>\s*&nbsp;\s*<\/SPAN>/gi, '&nbsp;' ) ;

	html = html.replace( /<SPAN\s*[^>]*><\/SPAN>/gi, '' ) ;

	// Remove Lang attributes
	html = html.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3") ;

	html = html.replace( /<SPAN\s*>(.*?)<\/SPAN>/gi, '$1' ) ;

	html = html.replace( /<FONT\s*>(.*?)<\/FONT>/gi, '$1' ) ;

	// Remove XML elements and declarations
	html = html.replace(/<\\?\?xml[^>]*>/gi, '' ) ;

	// Remove Tags with XML namespace declarations: <o:p><\/o:p>
	html = html.replace(/<\/?\w+:[^>]*>/gi, '' ) ;

	// Remove comments [SF BUG-1481861].
	html = html.replace(/<\!--.*?-->/g, '' ) ;

	html = html.replace( /<(U|I|STRIKE)>&nbsp;<\/\1>/g, '&nbsp;' ) ;

	html = html.replace( /<H\d>\s*<\/H\d>/gi, '' ) ;

	// Remove "display:none" tags.
	html = html.replace( /<(\w+)[^>]*\sstyle="[^"]*DISPLAY\s?:\s?none(.*?)<\/\1>/ig, '' ) ;

	// Remove language tags
	html = html.replace( /<(\w[^>]*) language=([^ |>]*)([^>]*)/gi, "<$1$3") ;

	// Remove onmouseover and onmouseout events (from MS Word comments effect)
	html = html.replace( /<(\w[^>]*) onmouseover="([^\"]*)"([^>]*)/gi, "<$1$3") ;
	html = html.replace( /<(\w[^>]*) onmouseout="([^\"]*)"([^>]*)/gi, "<$1$3") ;

	if ( FCKConfig.CleanWordKeepsStructure )
	{
		// The original <Hn> tag send from Word is something like this: <Hn style="margin-top:0px;margin-bottom:0px">
		html = html.replace( /<H(\d)([^>]*)>/gi, '<h$1>' ) ;

		// Word likes to insert extra <font> tags, when using MSIE. (Wierd).
		html = html.replace( /<(H\d)><FONT[^>]*>(.*?)<\/FONT><\/\1>/gi, '<$1>$2<\/$1>' );
		html = html.replace( /<(H\d)><EM>(.*?)<\/EM><\/\1>/gi, '<$1>$2<\/$1>' );
	}
	else
	{
		html = html.replace( /<H1([^>]*)>/gi, '<div$1><b><font size="6">' ) ;
		html = html.replace( /<H2([^>]*)>/gi, '<div$1><b><font size="5">' ) ;
		html = html.replace( /<H3([^>]*)>/gi, '<div$1><b><font size="4">' ) ;
		html = html.replace( /<H4([^>]*)>/gi, '<div$1><b><font size="3">' ) ;
		html = html.replace( /<H5([^>]*)>/gi, '<div$1><b><font size="2">' ) ;
		html = html.replace( /<H6([^>]*)>/gi, '<div$1><b><font size="1">' ) ;

		html = html.replace( /<\/H\d>/gi, '<\/font><\/b><\/div>' ) ;

		// Transform <P> to <DIV>
		var re = new RegExp( '(<P)([^>]*>.*?)(<\/P>)', 'gi' ) ;	// Different because of a IE 5.0 error
		html = html.replace( re, '<div$2<\/div>' ) ;

		// Remove empty tags (three times, just to be sure).
		// This also removes any empty anchor
		html = html.replace( /<([^\s>]+)(\s[^>]*)?>\s*<\/\1>/g, '' ) ;
		html = html.replace( /<([^\s>]+)(\s[^>]*)?>\s*<\/\1>/g, '' ) ;
		html = html.replace( /<([^\s>]+)(\s[^>]*)?>\s*<\/\1>/g, '' ) ;
	}

	return html ;
}

	</script>

</head>
<body style="overflow: hidden">
	<table cellspacing="0" cellpadding="0" width="100%" border="0" style="height: 98%">
		<tr>
			<td>
				<div id="xSecurityMsg" style="display: none">
					<span fcklang="DlgPasteSec">Because of your browser security settings,
						the editor is not able to access your clipboard data directly. You are required
						to paste it again in this window.</span><br />
					&nbsp;
				</div>
				<div>
					<span fcklang="DlgPasteMsg2">Please paste inside the following box using the keyboard
						(<strong>Ctrl+V</strong>) and hit <strong>OK</strong>.</span><br />
					&nbsp;
				</div>
			</td>
		</tr>
		<tr>
			<td valign="top" height="100%" style="border-right: #000000 1px solid; border-top: #000000 1px solid;
				border-left: #000000 1px solid; border-bottom: #000000 1px solid">
				<textarea id="txtData" cols="80" rows="5" style="border: #000000 1px; display: none;
					width: 99%; height: 98%"></textarea>
				<iframe id="frmData" src="javascript:void(0)" height="98%" width="99%" frameborder="0"
					style="border-right: #000000 1px; border-top: #000000 1px; display: none; border-left: #000000 1px;
					border-bottom: #000000 1px; background-color: #ffffff"></iframe>
			</td>
		</tr>
		<tr id="oWordCommands">
			<td>
				<table border="0" cellpadding="0" cellspacing="0" width="100%">
					<tr>
						<td nowrap="nowrap">
							<input id="chkRemoveFont" type="checkbox" checked="checked" />
							<label for="chkRemoveFont" fcklang="DlgPasteIgnoreFont">
								Ignore Font Face definitions</label>
							<br />
							<input id="chkRemoveStyles" type="checkbox" />
							<label for="chkRemoveStyles" fcklang="DlgPasteRemoveStyles">
								Remove Styles definitions</label>
						</td>
						<td align="right" valign="top">
							<input type="button" fcklang="DlgPasteCleanBox" value="Clean Up Box" onclick="CleanUpBox()" />
						</td>
					</tr>
				</table>
			</td>
		</tr>
	</table>
</body>
</html>

--- NEW FILE: fck_anchor.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<!--
 * FCKeditor - The text editor for Internet - http://www.fckeditor.net
 * Copyright (C) 2003-2007 Frederico Caldeira Knabben
 *
 * == BEGIN LICENSE ==
 *
 * Licensed under the terms of any of the following licenses at your
 * choice:
 *
 *  - GNU General Public License Version 2 or later (the "GPL")
 *    http://www.gnu.org/licenses/gpl.html
 *
 *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
 *    http://www.gnu.org/licenses/lgpl.html
 *
 *  - Mozilla Public License Version 1.1 or later (the "MPL")
 *    http://www.mozilla.org/MPL/MPL-1.1.html
 *
 * == END LICENSE ==
 *
 * Anchor dialog window.
-->
<html>
	<head>
		<title>Anchor Properties</title>
		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
		<meta content="noindex, nofollow" name="robots">
		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
		<script type="text/javascript">

var oEditor	= window.parent.InnerDialogLoaded() ;
var FCK		= oEditor.FCK ;
var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
var FCKTools = oEditor.FCKTools ;
var FCKRegexLib = oEditor.FCKRegexLib ;

// Gets the document DOM
var oDOM = oEditor.FCK.EditorDocument ;

var oFakeImage = FCK.Selection.GetSelectedElement() ;
var oAnchor ;

if ( oFakeImage )
{
	if ( oFakeImage.tagName == 'IMG' && oFakeImage.getAttribute('_fckanchor') )
		oAnchor = FCK.GetRealElement( oFakeImage ) ;
	else
		oFakeImage = null ;
}

//Search for a real anchor
if ( !oFakeImage )
{
	oAnchor = FCK.Selection.MoveToAncestorNode( 'A' ) ;
	if ( oAnchor )
		FCK.Selection.SelectNode( oAnchor ) ;
}

window.onload = function()
{
	// First of all, translate the dialog box texts
	oEditor.FCKLanguageManager.TranslatePage(document) ;

	if ( oAnchor )
		GetE('txtName').value = oAnchor.name ;
	else
		oAnchor = null ;

	window.parent.SetOkButton( true ) ;
	window.parent.SetAutoSize( true ) ;
}

function Ok()
{
	var sNewName = GetE('txtName').value ;

	// Remove any illegal character in a name attribute:
	// A name should start with a letter, but the validator passes anyway.
	sNewName = sNewName.replace( /[^\w-_\.:]/g, '_' ) ;

	if ( sNewName.length == 0 )
	{
		// Remove the anchor if the user leaves the name blank
		if ( oAnchor )
		{
			// Removes the current anchor from the document using the new command
			FCK.Commands.GetCommand( 'AnchorDelete' ).Execute() ;
			return true ;
		}

		alert( oEditor.FCKLang.DlgAnchorErrorName ) ;
		return false ;
	}

	oEditor.FCKUndo.SaveUndoStep() ;

	if ( oAnchor )	// Modifying an existent anchor.
	{
		ReadjustLinksToAnchor( oAnchor.name, sNewName );

		// Buggy explorer, bad bad browser. http://alt-tag.com/blog/archives/2006/02/ie-dom-bugs/
		// Instead of just replacing the .name for the existing anchor (in order to preserve the content), we must remove the .name
		// and assign .name, although it won't appear until it's specially processed in fckxhtml.js

		// We remove the previous name
		oAnchor.removeAttribute( 'name' ) ;
		// Now we set it, but later we must process it specially
		oAnchor.name = sNewName ;

		return true ;
	}

	// Create a new anchor preserving the current selection
	var aNewAnchors = oEditor.FCK.CreateLink( '#' ) ;

	if ( aNewAnchors.length == 0 )
	{
		// Nothing was selected, so now just create a normal A
		aNewAnchors.push( oEditor.FCK.InsertElement( 'a' ) ) ;
	}
	else
	{
		// Remove the fake href
		for ( var i = 0 ; i < aNewAnchors.length ; i++ )
			aNewAnchors[i].removeAttribute( 'href' ) ;
	}

	// More than one anchors may have been created, so interact through all of them (see #220).
	for ( var i = 0 ; i < aNewAnchors.length ; i++ )
	{
		oAnchor = aNewAnchors[i] ;

		// Set the name
		oAnchor.name = sNewName ;

		// IE does require special processing to show the Anchor's image
		// Opera doesn't allow to select empty anchors
		if ( FCKBrowserInfo.IsIE || FCKBrowserInfo.IsOpera )
		{
			if ( oAnchor.innerHTML != '' )
			{
				if ( FCKBrowserInfo.IsIE )
					oAnchor.className += ' FCK__AnchorC' ;
			}
			else
			{
				// Create a fake image for both IE and Opera
				var oImg = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oAnchor.cloneNode(true) ) ;
				oImg.setAttribute( '_fckanchor', 'true', 0 ) ;

				oAnchor.parentNode.insertBefore( oImg, oAnchor ) ;
				oAnchor.parentNode.removeChild( oAnchor ) ;
			}

		}
	}

	return true ;
}

// Checks all the links in the current page pointing to the current name and changes them to the new name
function ReadjustLinksToAnchor( sCurrent, sNew )
{
	var oDoc = FCK.EditorDocument ;

	var aLinks = oDoc.getElementsByTagName( 'A' ) ;

	var sReference = '#' + sCurrent ;
	// The url of the document, so we check absolute and partial references.
	var sFullReference = oDoc.location.href.replace( /(#.*$)/, '') ;
	sFullReference += sReference ;

	var oLink ;
	var i = aLinks.length - 1 ;
	while ( i >= 0 && ( oLink = aLinks[i--] ) )
	{
		var sHRef = oLink.getAttribute( '_fcksavedurl' ) ;
		if ( sHRef == null )
			sHRef = oLink.getAttribute( 'href' , 2 ) || '' ;

		if ( sHRef == sReference || sHRef == sFullReference )
		{
			oLink.href = '#' + sNew ;
			SetAttribute( oLink, '_fcksavedurl', '#' + sNew ) ;
		}
	}
}

		</script>
	</head>
	<body style="overflow: hidden">
		<table height="100%" width="100%">
			<tr>
				<td align="center">
					<table border="0" cellpadding="0" cellspacing="0" width="80%">
						<tr>
							<td>
								<span fckLang="DlgAnchorName">Anchor Name</span><BR>
								<input id="txtName" style="WIDTH: 100%" type="text">
							</td>
						</tr>
					</table>
				</td>
			</tr>
		</table>
	</body>
</html>



From dhaun at qs1489.pair.com  Sun Feb 10 08:08:08 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 13:08:08 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/config
	configuration.thtml, 1.10, 1.11
Message-ID: <20080210130808.5D9BD10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/config
In directory qs1489.pair.com:/tmp/cvs-serv76291/admin/config

Modified Files:
	configuration.thtml 
Log Message:
Missing </div>


Index: configuration.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/config/configuration.thtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** configuration.thtml	2 Feb 2008 21:56:34 -0000	1.10
--- configuration.thtml	10 Feb 2008 13:08:06 -0000	1.11
***************
*** 8,12 ****
      <tr>
          <td class="block-featured-left" style="vertical-align:top;">
!             <div class="block-bg-left"> {config_menu}
          </td>
          <td>
--- 8,12 ----
      <tr>
          <td class="block-featured-left" style="vertical-align:top;">
!             <div class="block-bg-left"> {config_menu} </div>
          </td>
          <td>
***************
*** 53,55 ****
          </td>
      </tr>
! </table>
\ No newline at end of file
--- 53,55 ----
          </td>
      </tr>
! </table>



From dhaun at qs1489.pair.com  Sun Feb 10 10:18:14 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 15:18:14 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls/templates/admin
	polleditor.thtml, 1.10, 1.11
Message-ID: <20080210151814.D8BEE10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/admin
In directory qs1489.pair.com:/tmp/cvs-serv81460/admin

Modified Files:
	polleditor.thtml 
Log Message:
Fixed HTML (<table> not allowed in a <p>)


Index: polleditor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/admin/polleditor.thtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** polleditor.thtml	30 Dec 2007 13:38:14 -0000	1.10
--- polleditor.thtml	10 Feb 2008 15:18:12 -0000	1.11
***************
*** 41,45 ****
                                      <h2>{lang_permissions}</h2>
                                      <p>{lang_permissionskey}</p>
!                                     <p>{permissions_editor}</p>
                                      <p>{lang_permissions_msg}</p>
                                      <p><input type="submit" name="mode" value="{lang_save}"{xhtml}><input type="submit" name="mode" value="{lang_cancel}"{xhtml}>{delete_option}</p>
--- 41,45 ----
                                      <h2>{lang_permissions}</h2>
                                      <p>{lang_permissionskey}</p>
!                                     <div>{permissions_editor}</div>
                                      <p>{lang_permissions_msg}</p>
                                      <p><input type="submit" name="mode" value="{lang_save}"{xhtml}><input type="submit" name="mode" value="{lang_cancel}"{xhtml}>{delete_option}</p>



From dhaun at qs1489.pair.com  Sun Feb 10 12:09:39 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 17:09:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.23,
	1.24
Message-ID: <20080210170939.C5E8810FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv85353/system/classes

Modified Files:
	config.class.php 
Log Message:
Decoupled config subgroup and fieldset order from the language files. Now we can reorder / regroup options simply by database updates.


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** config.class.php	9 Feb 2008 12:22:28 -0000	1.23
--- config.class.php	10 Feb 2008 17:09:37 -0000	1.24
***************
*** 312,317 ****
          $q_string = "SELECT name, type, selectionArray, "
              . "fieldset, value FROM {$_TABLES['conf_values']}" .
!             " WHERE group_name='{$group}' and subgroup='{$subgroup}' " .
!             " ORDER BY sort_order ASC";
          $Qresult = DB_query($q_string);
          $res = array();
--- 312,318 ----
          $q_string = "SELECT name, type, selectionArray, "
              . "fieldset, value FROM {$_TABLES['conf_values']}" .
!             " WHERE group_name='{$group}' AND subgroup='{$subgroup}' " .
!             " AND (type <> 'fieldset' AND type <> 'subgroup') " .
!             " ORDER BY fieldset,sort_order ASC";
          $Qresult = DB_query($q_string);
          $res = array();
***************
*** 357,374 ****
      }
  
!     function get_sgroups($group)
      {
          global $_TABLES;
  
!         $q_string = "SELECT subgroup FROM {$_TABLES['conf_values']} WHERE " .
!             "group_name='{$group}' " .
!             "GROUP BY subgroup";
          $res = DB_query($q_string);
-         $return = array();
          while ($row = DB_fetchArray($res)) {
!             $return[] = $row[0];
          }
  
!         return $return;
      }
  
--- 358,375 ----
      }
  
!     function _get_sgroups($group)
      {
          global $_TABLES;
  
!         $q_string = "SELECT name,subgroup FROM {$_TABLES['conf_values']} WHERE "
!                   . "type = 'subgroup' AND group_name = '$group' "
!                   . "ORDER BY subgroup";
!         $retval = array();
          $res = DB_query($q_string);
          while ($row = DB_fetchArray($res)) {
!             $retval[$row['name']] = $row['subgroup'];
          }
  
!         return $retval;
      }
  
***************
*** 418,427 ****
                  $t->set_var("group_select_value", $group);
                  $t->set_var("group_display", ucwords($group));
!                 $subgroups = $this->get_sgroups($group);
!                 $innerloopcntr=1;
!                 foreach ($subgroups as $sgroup) {
                      if ($grp == $group AND $sg == $sgroup) {
!                         $t->set_var('group_active_name',ucwords($group));
!                         $t->set_var('subgroup_active_name',$LANG_configsubgroups[$group][$sgroup]);
                          $t->set_var('select_id', 'id="current"');
                      } else {
--- 419,434 ----
                  $t->set_var("group_select_value", $group);
                  $t->set_var("group_display", ucwords($group));
!                 $subgroups = $this->_get_sgroups($group);
!                 $innerloopcntr = 1;
!                 foreach ($subgroups as $sgname => $sgroup) {
                      if ($grp == $group AND $sg == $sgroup) {
!                         $t->set_var('group_active_name', ucwords($group));
!                         if (isset($LANG_configsubgroups[$group][$sgname])) {
!                             $t->set_var('subgroup_active_name',
!                                     $LANG_configsubgroups[$group][$sgname]);
!                         } else {
!                             $t->set_var('subgroup_active_name',
!                                     $LANG_configsubgroups[$group][$sgroup]);
!                         }
                          $t->set_var('select_id', 'id="current"');
                      } else {
***************
*** 451,457 ****
  
          $ext_info = $this->_get_extended($sg, $grp);
!         foreach ($ext_info as $fset=>$params) {
              $fs_contents = '';
!             foreach ($params as $name=>$e) {
                  $fs_contents .=
                      $this->_UI_get_conf_element($name,
--- 458,464 ----
  
          $ext_info = $this->_get_extended($sg, $grp);
!         foreach ($ext_info as $fset => $params) {
              $fs_contents = '';
!             foreach ($params as $name => $e) {
                  $fs_contents .=
                      $this->_UI_get_conf_element($name,
***************
*** 493,497 ****
      function _UI_get_fs($group, $contents, $fs_id, &$t)
      {
!         global $LANG_fs;
  
          if (!array_key_exists($group, $LANG_fs)) {
--- 500,504 ----
      function _UI_get_fs($group, $contents, $fs_id, &$t)
      {
!         global $_TABLES, $LANG_fs;
  
          if (!array_key_exists($group, $LANG_fs)) {
***************
*** 499,503 ****
          }
          $t->set_var('fs_contents', $contents);
!         $t->set_var('fs_display', $LANG_fs[$group][$fs_id]);
          $t->set_var('fs_notes', '');
          $t->parse('sg_contents', 'fieldset', true);
--- 506,516 ----
          }
          $t->set_var('fs_contents', $contents);
!         $fs_index = DB_getItem($_TABLES['conf_values'], 'name',
!                         "type = 'fieldset' AND fieldset = $fs_id AND group_name = '$group'");
!         if (empty($fs_index)) {
!             $t->set_var('fs_display', $LANG_fs[$group][$fs_id]);
!         } else {
!             $t->set_var('fs_display', $LANG_fs[$group][$fs_index]);
!         }
          $t->set_var('fs_notes', '');
          $t->parse('sg_contents', 'fieldset', true);
***************
*** 543,547 ****
          if ($deletable) {
              $t->set_var('delete', $t->parse('output', 'delete-button'));
!         } elseif ($this->ref == 'Core' ) {
              $t->set_var('unset_link',
                          "(<a href='#' onClick='unset(\"{$name}\");'>X</a>)");
--- 556,560 ----
          if ($deletable) {
              $t->set_var('delete', $t->parse('output', 'delete-button'));
!         } elseif (false) { // ??? } elseif ($this->ref == 'Core' ) {
              $t->set_var('unset_link',
                          "(<a href='#' onClick='unset(\"{$name}\");'>X</a>)");
***************
*** 729,739 ****
          }
          $retval .= COM_startBlock($subgroup_title, '',
!                         COM_getBlockTemplate('configmanager_subblock', 'header'));
  
!         $sgroups = $this->get_sgroups($conf_group);
          if (count($sgroups) > 0) {
!             $i =0;
!             foreach ($sgroups as $sgroup) {
!                 $group_display =  $LANG_configsubgroups[$conf_group][$sgroup];
                  // Create a menu item for each sub config group - disable the link for the current selected one
                  if ($i == $sg) {
--- 742,756 ----
          }
          $retval .= COM_startBlock($subgroup_title, '',
!                     COM_getBlockTemplate('configmanager_subblock', 'header'));
  
!         $sgroups = $this->_get_sgroups($conf_group);
          if (count($sgroups) > 0) {
!             $i = 0;
!             foreach ($sgroups as $sgname => $sgroup) {
!                 if (isset($LANG_configsubgroups[$conf_group][$sgname])) {
!                     $group_display = $LANG_configsubgroups[$conf_group][$sgname];
!                 } else {
!                     $group_display = $LANG_configsubgroups[$conf_group][$sgroup];
!                 }
                  // Create a menu item for each sub config group - disable the link for the current selected one
                  if ($i == $sg) {
***************
*** 752,754 ****
  }
  
! ?>
\ No newline at end of file
--- 769,771 ----
  }
  
! ?>



From dhaun at qs1489.pair.com  Sun Feb 10 12:09:39 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 17:09:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links install_defaults.php, 1.1,
	1.2
Message-ID: <20080210170939.E44D710FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links
In directory qs1489.pair.com:/tmp/cvs-serv85353/plugins/links

Modified Files:
	install_defaults.php 
Log Message:
Decoupled config subgroup and fieldset order from the language files. Now we can reorder / regroup options simply by database updates.


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/install_defaults.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** install_defaults.php	3 Feb 2008 19:11:50 -0000	1.1
--- install_defaults.php	10 Feb 2008 17:09:37 -0000	1.2
***************
*** 173,176 ****
--- 173,178 ----
      if (!$c->group_exists('links')) {
  
+         $c->add('sg_main', NULL, 'subgroup', 0, 0, NULL, 0, true, 'links');
+         $c->add('fs_public', NULL, 'fieldset', 0, 0, NULL, 0, true, 'links');
          $c->add('linksloginrequired', $_LI_DEFAULT['linksloginrequired'],
                  'select', 0, 0, 0, 10, true, 'links');
***************
*** 183,186 ****
--- 185,189 ----
          $c->add('show_category_descriptions', $_LI_DEFAULT['show_category_descriptions'], 'select', 0, 0, 1, 50, true, 'links');
  
+         $c->add('fs_admin', NULL, 'fieldset', 0, 1, NULL, 0, true, 'links');
          $c->add('hidenewlinks', $_LI_DEFAULT['hidenewlinks'], 'select',
                  0, 1, 0, 60, true, 'links');
***************
*** 200,203 ****
--- 203,207 ----
                  0, 1, 0, 130, true, 'links');
  
+         $c->add('fs_permissions', NULL, 'fieldset', 0, 2, NULL, 0, true, 'links');
          $c->add('default_permissions', $_LI_DEFAULT['default_permissions'],
                  '@select', 0, 2, 12, 140, true, 'links');



From dhaun at qs1489.pair.com  Sun Feb 10 12:09:39 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 17:09:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links/language english.php, 1.28,
	1.29 english_utf-8.php, 1.15, 1.16
Message-ID: <20080210170940.01C4E10FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links/language
In directory qs1489.pair.com:/tmp/cvs-serv85353/plugins/links/language

Modified Files:
	english.php english_utf-8.php 
Log Message:
Decoupled config subgroup and fieldset order from the language files. Now we can reorder / regroup options simply by database updates.


Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/language/english.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** english.php	3 Feb 2008 19:11:50 -0000	1.28
--- english.php	10 Feb 2008 17:09:37 -0000	1.29
***************
*** 276,286 ****
  
  $LANG_configsubgroups['links'] = array(
!     0 => 'Main Settings'
  );
  
  $LANG_fs['links'] = array(
!     0 => 'Public Links List Settings',
!     1 => 'Links Admin Settings',
!     2 => 'Default Permissions'
  );
  
--- 276,286 ----
  
  $LANG_configsubgroups['links'] = array(
!     'sg_main' => 'Main Settings'
  );
  
  $LANG_fs['links'] = array(
!     'fs_public' => 'Public Links List Settings',
!     'fs_admin' => 'Links Admin Settings',
!     'fs_permissions' => 'Default Permissions'
  );
  

Index: english_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/language/english_utf-8.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** english_utf-8.php	3 Feb 2008 19:11:50 -0000	1.15
--- english_utf-8.php	10 Feb 2008 17:09:37 -0000	1.16
***************
*** 276,286 ****
  
  $LANG_configsubgroups['links'] = array(
!     0 => 'Main Settings'
  );
  
  $LANG_fs['links'] = array(
!     0 => 'Public Links List Settings',
!     1 => 'Links Admin Settings',
!     2 => 'Default Permissions'
  );
  
--- 276,286 ----
  
  $LANG_configsubgroups['links'] = array(
!     'sg_main' => 'Main Settings'
  );
  
  $LANG_fs['links'] = array(
!     'fs_public' => 'Public Links List Settings',
!     'fs_admin' => 'Links Admin Settings',
!     'fs_permissions' => 'Default Permissions'
  );
  



From dhaun at qs1489.pair.com  Sun Feb 10 12:09:39 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 17:09:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install
	config-install.php, 1.25, 1.26
Message-ID: <20080210170939.D96AD10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv85353/public_html/admin/install

Modified Files:
	config-install.php 
Log Message:
Decoupled config subgroup and fieldset order from the language files. Now we can reorder / regroup options simply by database updates.


Index: config-install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/config-install.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** config-install.php	3 Feb 2008 20:52:55 -0000	1.25
--- config-install.php	10 Feb 2008 17:09:37 -0000	1.26
***************
*** 42,230 ****
      $c = config::get_instance();
  
!     $c->add('path_html','','text',0,1,NULL,10,TRUE);
      $c->add('site_url','','text',0,0,NULL,20,TRUE);
      $c->add('site_admin_url','','text',0,0,NULL,30,TRUE);
-     $c->add('site_mail','','text',0,3,NULL,40,TRUE);
-     $c->add('noreply_mail','','text',0,3,NULL,50,TRUE);
      $c->add('site_name','','text',0,0,NULL,60,TRUE);
      $c->add('site_slogan','','text',0,0,NULL,70,TRUE);
      $c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
!     $c->add('path_log','','text',0,1,NULL,90,TRUE);
!     $c->add('path_language','','text',0,1,NULL,100,TRUE);
!     $c->add('backup_path','','text',0,1,NULL,110,TRUE);
!     $c->add('path_data','','text',0,1,NULL,120,TRUE);
!     $c->add('path_images','','text',0,1,NULL,130,TRUE);
      $c->add('have_pear','','select',0,4,1,135,TRUE);
      $c->add('path_pear','','text',0,4,NULL,140,TRUE);
!     $c->add('mail_settings',array ('backend' => 'mail', 'sendmail_path' => '/usr/bin/sendmail', 'sendmail_args' => '', 'host' => 'smtp.example.com','port' => '25', 'auth' => false, 'username' => 'smtp-username','password' => 'smtp-password'),'@text',0,3,NULL,160,TRUE);
      $c->add('allow_mysqldump',1,'select',0,5,0,170,TRUE);
      $c->add('mysqldump_path','/usr/bin/mysqldump','text',0,5,NULL,175,TRUE);
      $c->add('mysqldump_options','-Q','text',0,5,NULL,180,TRUE);
!     $c->add('theme','professional','fn:themeList',2,2,NULL,190,TRUE);
!     $c->add('menu_elements',array('contribute','search','stats','directory','plugins'),'%text',2,2,NULL,200,TRUE);
!     $c->add('path_themes','','text',2,2,NULL,210,TRUE);
!     $c->add('disable_new_user_registration',FALSE,'select',4,6,0,220,TRUE);
!     $c->add('allow_user_themes',1,'select',4,6,0,230,TRUE);
!     $c->add('allow_user_language',1,'select',4,6,0,240,TRUE);
!     $c->add('allow_user_photo',1,'select',4,6,0,250,TRUE);
!     $c->add('allow_username_change',0,'select',4,6,0,260,TRUE);
!     $c->add('allow_account_delete',0,'select',4,6,0,270,TRUE);
!     $c->add('hide_author_exclusion',0,'select',4,6,0,280,TRUE);
!     $c->add('show_fullname',0,'select',4,6,0,290,TRUE);
!     $c->add('show_servicename',TRUE,'select',4,6,1,300,TRUE);
!     $c->add('custom_registration',FALSE,'select',4,6,1,310,TRUE);
!     $c->add('user_login_method',array('standard' => true, 'openid' => false, '3rdparty' => false),'@select',4,6,1,320,TRUE);
!     $c->add('spamx',128,'text',4,8,NULL,330,TRUE);
!     $c->add('sort_admin',TRUE,'select',3,9,1,340,TRUE);
!     $c->add('language','english','fn:languageList',6,11,NULL,350,TRUE);
!     $c->add('locale','en_GB','text',6,10,NULL,360,TRUE);
!     $c->add('date','%A, %B %d %Y @ %I:%M %p %Z','text',6,10,NULL,370,TRUE);
!     $c->add('daytime','%m/%d %I:%M%p','text',6,10,NULL,380,TRUE);
!     $c->add('shortdate','%x','text',6,10,NULL,390,TRUE);
!     $c->add('dateonly','%d-%b','text',6,10,NULL,400,TRUE);
!     $c->add('timeonly','%I:%M%p','text',6,10,NULL,410,TRUE);
!     $c->add('week_start','Sun','select',6,10,14,420,TRUE);
!     $c->add('hour_mode',12,'select',6,10,6,430,TRUE);
!     $c->add('thousand_separator',",",'text',6,10,NULL,440,TRUE);
!     $c->add('decimal_separator',".",'text',6,10,NULL,450,TRUE);
!     $c->add('decimal_count',"2",'text',6,10,NULL,460,TRUE);
!     $c->add('language_files',array('en'=>'english_utf-8', 'de'=>'german_formal_utf-8'),'*text',6,11,NULL,470,FALSE);
!     $c->add('languages',array('en'=>'English', 'de'=>'Deutsch'),'*text',6,11,NULL,480,FALSE);
!     $c->add('timezone','Etc/GMT-6','text',6,10,NULL,490,FALSE);
!     $c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','text',0,0,NULL,510,TRUE);
!     $c->add('rootdebug',FALSE,'select',7,12,1,520,TRUE);
!     $c->add('cookie_session','gl_session','text',7,13,NULL,530,TRUE);
!     $c->add('cookie_name','geeklog','text',7,13,NULL,540,TRUE);
!     $c->add('cookie_password','password','text',7,13,NULL,550,TRUE);
!     $c->add('cookie_theme','theme','text',7,13,NULL,560,TRUE);
!     $c->add('cookie_language','language','text',7,13,NULL,570,TRUE);
!     $c->add('cookie_tzid','timezone','text',7,13,NULL,575,TRUE);
!     $c->add('cookie_ip',0,'select',7,13,0,580,TRUE);
!     $c->add('default_perm_cookie_timeout',28800,'text',7,13,NULL,590,TRUE);
!     $c->add('session_cookie_timeout',7200,'text',7,13,NULL,600,TRUE);
!     $c->add('cookie_path','/','text',7,13,NULL,610,TRUE);
!     $c->add('cookiedomain','','text',7,13,NULL,620,TRUE);
!     $c->add('cookiesecure',FALSE,'select',7,13,1,630,TRUE);
!     $c->add('lastlogin',TRUE,'select',4,14,1,640,TRUE);
!     $c->add('pdf_enabled',0,'select',7,7,0,660,TRUE);
!     $c->add('num_search_results',10,'text',0,15,NULL,670,TRUE);
!     $c->add('loginrequired',0,'select',4,14,0,680,TRUE);
!     $c->add('submitloginrequired',0,'select',4,14,0,690,TRUE);
!     $c->add('commentsloginrequired',0,'select',4,14,0,700,TRUE);
!     $c->add('statsloginrequired',0,'select',4,14,0,710,TRUE);
!     $c->add('searchloginrequired',0,'select',4,14,16,720,TRUE);
!     $c->add('profileloginrequired',0,'select',4,14,0,730,TRUE);
!     $c->add('emailuserloginrequired',0,'select',4,14,0,740,TRUE);
!     $c->add('emailstoryloginrequired',0,'select',4,14,0,750,TRUE);
!     $c->add('directoryloginrequired',0,'select',4,14,0,760,TRUE);
!     $c->add('storysubmission',1,'select',4,17,0,770,TRUE);
!     $c->add('usersubmission',0,'select',4,16,0,780,TRUE);
!     $c->add('listdraftstories',0,'select',4,17,0,790,TRUE);
!     $c->add('notification',array(),'%text',7,7,NULL,800,TRUE);
!     $c->add('postmode','plaintext','select',4,17,5,810,TRUE);
!     $c->add('speedlimit',45,'text',4,17,NULL,820,TRUE);
!     $c->add('skip_preview',0,'select',4,17,0,830,TRUE);
!     $c->add('advanced_editor',FALSE,'select',4,17,1,840,TRUE);
!     $c->add('wikitext_editor',FALSE,'select',4,17,1,850,TRUE);
!     $c->add('cron_schedule_interval',86400,'text',7,7,NULL,860,TRUE);
!     $c->add('sortmethod','sortnum','select',3,18,15,870,TRUE);
!     $c->add('showstorycount',1,'select',3,18,0,880,TRUE);
!     $c->add('showsubmissioncount',1,'select',3,18,0,890,TRUE);
!     $c->add('hide_home_link',0,'select',3,18,0,900,TRUE);
!     $c->add('whosonline_threshold',300,'text',3,19,NULL,910,TRUE);
!     $c->add('whosonline_anonymous',0,'select',3,19,0,920,TRUE);
!     $c->add('emailstories',0,'select',7,20,0,930,TRUE);
!     $c->add('emailstorieslength',1,'text',7,20,NULL,940,TRUE);
!     $c->add('emailstoriesperdefault',0,'select',7,20,0,950,TRUE);
!     $c->add('allow_domains','','text',4,16,NULL,960,TRUE);
!     $c->add('disallow_domains','','text',4,16,NULL,970,TRUE);
!     $c->add('newstoriesinterval',86400,'text',3,21,NULL,980,TRUE);
!     $c->add('newcommentsinterval',172800,'text',3,21,NULL,990,TRUE);
!     $c->add('newtrackbackinterval',172800,'text',3,21,NULL,1000,TRUE);
!     $c->add('hidenewstories',0,'select',3,21,0,1010,TRUE);
!     $c->add('hidenewcomments',0,'select',3,21,0,1020,TRUE);
!     $c->add('hidenewtrackbacks',0,'select',3,21,0,1030,TRUE);
!     $c->add('hidenewplugins',0,'select',3,21,0,1040,TRUE);
!     $c->add('title_trim_length',20,'text',3,21,NULL,1050,TRUE);
!     $c->add('trackback_enabled',TRUE,'select',1,22,1,1060,TRUE);
!     $c->add('trackback_code',0,'select',1,22,3,1070,TRUE);
!     $c->add('trackbackspeedlimit',300,'text',1,22,NULL,1080,TRUE);
!     $c->add('check_trackback_link',2,'select',1,22,4,1090,TRUE);
!     $c->add('multiple_trackbacks',0,'select',1,22,2,1100,TRUE);
!     $c->add('pingback_enabled',TRUE,'select',1,23,1,1110,TRUE);
!     $c->add('pingback_excerpt',TRUE,'select',1,23,1,1120,TRUE);
!     $c->add('pingback_self',0,'select',1,23,13,1130,TRUE);
!     $c->add('ping_enabled',TRUE,'select',1,23,1,1140,TRUE);
!     $c->add('link_documentation',1,'select',3,9,0,1150,TRUE);
!     $c->add('link_versionchecker',1,'select',3,9,0,1160,TRUE);
!     $c->add('maximagesperarticle',5,'text',1,24,NULL,1170,TRUE);
!     $c->add('limitnews',10,'text',1,24,NULL,1180,TRUE);
!     $c->add('minnews',1,'text',1,24,NULL,1190,TRUE);
!     $c->add('contributedbyline',1,'select',1,24,0,1200,TRUE);
!     $c->add('hideviewscount',0,'select',1,24,0,1210,TRUE);
!     $c->add('hideemailicon',0,'select',1,24,0,1220,TRUE);
!     $c->add('hideprintericon',0,'select',1,24,0,1230,TRUE);
!     $c->add('allow_page_breaks',1,'select',1,24,0,1240,TRUE);
!     $c->add('page_break_comments','last','select',1,24,7,1250,TRUE);
!     $c->add('article_image_align','right','select',1,24,8,1260,TRUE);
!     $c->add('show_topic_icon',1,'select',1,24,0,1270,TRUE);
!     $c->add('draft_flag',0,'select',1,24,0,1280,TRUE);
!     $c->add('frontpage',1,'select',1,24,0,1290,TRUE);
!     $c->add('hide_no_news_msg',0,'select',1,24,0,1300,TRUE);
!     $c->add('hide_main_page_navigation',0,'select',1,24,0,1310,TRUE);
!     $c->add('onlyrootfeatures',0,'select',1,24,0,1320,TRUE);
!     $c->add('aftersave_story','list','select',1,24,9,1330,TRUE);
!     $c->add('aftersave_user','item','select',1,24,9,1340,TRUE);
!     $c->add('show_right_blocks',FALSE,'select',2,25,1,1350,TRUE);
!     $c->add('showfirstasfeatured',0,'select',2,25,0,1360,TRUE);
!     $c->add('backend',1,'select',0,26,0,1380,TRUE);
!     $c->add('rdf_file','','text',0,26,NULL,1390,TRUE);
!     $c->add('rdf_limit',10,'text',0,26,NULL,1400,TRUE);
!     $c->add('rdf_storytext',1,'text',0,26,NULL,1410,TRUE);
!     $c->add('rdf_language','en-gb','text',0,26,NULL,1420,TRUE);
!     $c->add('syndication_max_headlines',0,'text',0,26,NULL,1430,TRUE);
!     $c->add('copyright','2007','text',0,0,NULL,1440,FALSE);
!     $c->add('image_lib','','select',5,27,10,1450,TRUE);
!     $c->add('path_to_mogrify','','text',5,27,NULL,1460,FALSE);
!     $c->add('path_to_netpbm','','text',5,27,NULL,1470,FALSE);
!     $c->add('keep_unscaled_image',0,'select',5,28,0,1480,TRUE);
!     $c->add('allow_user_scaling',1,'select',5,28,0,1490,TRUE);
!     $c->add('debug_image_upload',TRUE,'select',5,28,1,1500,TRUE);
!     $c->add('max_image_width',160,'text',5,29,NULL,1510,TRUE);
!     $c->add('max_image_height',160,'text',5,29,NULL,1520,TRUE);
!     $c->add('max_image_size',1048576,'text',5,29,NULL,1530,TRUE);
!     $c->add('max_topicicon_width',48,'text',5,30,NULL,1540,TRUE);
!     $c->add('max_topicicon_height',48,'text',5,30,NULL,1550,TRUE);
!     $c->add('max_topicicon_size',65536,'text',5,30,NULL,1560,TRUE);
!     $c->add('max_photo_width',128,'text',5,31,NULL,1570,TRUE);
!     $c->add('max_photo_height',128,'text',5,31,NULL,1580,TRUE);
!     $c->add('max_photo_size',65536,'text',5,31,NULL,1590,TRUE);
!     $c->add('use_gravatar',FALSE,'select',5,32,1,1600,TRUE);
!     $c->add('gravatar_rating','R','text',5,32,NULL,1610,FALSE);
!     $c->add('force_photo_width',75,'text',5,31,NULL,1620,FALSE);
!     $c->add('default_photo','http://example.com/default.jpg','text',5,31,NULL,1630,FALSE);
!     $c->add('commentspeedlimit',45,'text',4,33,NULL,1640,TRUE);
!     $c->add('comment_limit',100,'text',4,33,NULL,1650,TRUE);
!     $c->add('comment_mode','threaded','select',4,33,11,1660,TRUE);
!     $c->add('comment_code',0,'select',4,33,17,1670,TRUE);
!     $c->add('passwordspeedlimit',300,'text',4,14,NULL,1680,TRUE);
!     $c->add('login_attempts',3,'text',4,14,NULL,1690,TRUE);
!     $c->add('login_speedlimit',300,'text',4,14,NULL,1700,TRUE);
      $c->add('user_html',array ('p' => array(), 'b' => array(), 'strong' => array(),'i' => array(), 'a' => array('href' => 1, 'title' => 1, 'rel' => 1),'em'     => array(),'br'     => array(),'tt'     => array(),'hr'     => array(),        'li'     => array(), 'ol'     => array(), 'ul'     => array(), 'code' => array(), 'pre'    => array()),'**placeholder',7,34,NULL,1710,TRUE);
      $c->add('admin_html',array ('p' => array('class' => 1, 'id' => 1, 'align' => 1), 'div' => array('class' => 1, 'id' => 1), 'span' => array('class' => 1, 'id' => 1), 'table' => array('class' => 1, 'id' => 1, 'width' => 1, 'border' => 1, 'cellspacing' => 1, 'cellpadding' => 1), 'tr' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1), 'th' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1, 'colspan' => 1, 'rowspan' => 1), 'td' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1, 'colspan' => 1, 'rowspan' => 1)),'**placeholder',7,34,NULL,1720,TRUE);
      $c->add('skip_html_filter_for_root',0,'select',7,34,0,1730,TRUE);
!     $c->add('allowed_protocols',array('http','ftp','https'),'%text',0,0,NULL,1740,TRUE);
!     $c->add('disable_autolinks',0,'select',7,7,0,1750,TRUE);
      $c->add('censormode',1,'select',7,35,0,1760,TRUE);
      $c->add('censorreplace','*censormode*','text',7,35,NULL,1770,TRUE);
      $c->add('censorlist', array('fuck','cunt','fucker','fucking','pussy','cock','c0ck',' cum ','twat','clit','bitch','fuk','fuking','motherfucker'),'%text',7,35,NULL,1780,TRUE);
      $c->add('ip_lookup','/nettools/whois.php?domain=*','text',7,36,NULL,1790,FALSE);
!     $c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
!     $c->add('default_permissions_block',array(3, 2, 2, 2),'@select',7,37,12,1810,TRUE);
      $c->add('default_permissions_story',array(3, 2, 2, 2),'@select',7,37,12,1820,TRUE);
!     $c->add('default_permissions_topic',array(3, 2, 2, 2),'@select',7,37,12,1830,TRUE);
!     $c->add('disable_webservices',   0, 'select', 7, 38, 0, 1840, TRUE);
!     $c->add('restrict_webservices',  0, 'select', 7, 38, 0, 1850, TRUE);
!     $c->add('atom_max_stories',     10, 'text',   7, 38, 0, 1860, TRUE);
  
  
--- 42,335 ----
      $c = config::get_instance();
  
!     // Subgroup: Site
!     $c->add('sg_site', NULL, 'subgroup', 0, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_site', NULL, 'fieldset', 0, 0, NULL, 0, TRUE);
      $c->add('site_url','','text',0,0,NULL,20,TRUE);
      $c->add('site_admin_url','','text',0,0,NULL,30,TRUE);
      $c->add('site_name','','text',0,0,NULL,60,TRUE);
      $c->add('site_slogan','','text',0,0,NULL,70,TRUE);
      $c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
!     $c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','text',0,0,NULL,510,TRUE);
!     $c->add('copyright','2007','text',0,0,NULL,1440,FALSE);
!     $c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
! 
!     $c->add('fs_mail', NULL, 'fieldset', 0, 1, NULL, 0, TRUE);
!     $c->add('site_mail','','text',0,1,NULL,40,TRUE);
!     $c->add('noreply_mail','','text',0,1,NULL,50,TRUE);
!     $c->add('mail_settings',array ('backend' => 'mail', 'sendmail_path' => '/usr/bin/sendmail', 'sendmail_args' => '', 'host' => 'smtp.example.com','port' => '25', 'auth' => false, 'username' => 'smtp-username','password' => 'smtp-password'),'@text',0,1,NULL,160,TRUE);
! 
!     $c->add('fs_syndication', NULL, 'fieldset', 0, 2, NULL, 0, TRUE);
!     $c->add('backend',1,'select',0,2,0,1380,TRUE);
!     $c->add('rdf_file','','text',0,2,NULL,1390,TRUE);
!     $c->add('rdf_limit',10,'text',0,2,NULL,1400,TRUE);
!     $c->add('rdf_storytext',1,'text',0,2,NULL,1410,TRUE);
!     $c->add('rdf_language','en-gb','text',0,2,NULL,1420,TRUE);
!     $c->add('syndication_max_headlines',0,'text',0,2,NULL,1430,TRUE);
! 
!     $c->add('fs_paths', NULL, 'fieldset', 0, 3, NULL, 0, TRUE);
!     $c->add('path_html','','text',0,3,NULL,10,TRUE);
!     $c->add('path_log','','text',0,3,NULL,90,TRUE);
!     $c->add('path_language','','text',0,3,NULL,100,TRUE);
!     $c->add('backup_path','','text',0,3,NULL,110,TRUE);
!     $c->add('path_data','','text',0,3,NULL,120,TRUE);
!     $c->add('path_images','','text',0,3,NULL,130,TRUE);
! 
!     $c->add('fs_pear', NULL, 'fieldset', 0, 4, NULL, 0, TRUE);
      $c->add('have_pear','','select',0,4,1,135,TRUE);
      $c->add('path_pear','','text',0,4,NULL,140,TRUE);
! 
!     $c->add('fs_mysql', NULL, 'fieldset', 0, 5, NULL, 0, TRUE);
      $c->add('allow_mysqldump',1,'select',0,5,0,170,TRUE);
      $c->add('mysqldump_path','/usr/bin/mysqldump','text',0,5,NULL,175,TRUE);
      $c->add('mysqldump_options','-Q','text',0,5,NULL,180,TRUE);
! 
!     $c->add('fs_search', NULL, 'fieldset', 0, 6, NULL, 0, TRUE);
!     $c->add('num_search_results',10,'text',0,6,NULL,670,TRUE);
! 
!     // Subgroup: Stories and Trackback
!     $c->add('sg_stories', NULL, 'subgroup', 1, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_story', NULL, 'fieldset', 1, 7, NULL, 0, TRUE);
!     $c->add('maximagesperarticle',5,'text',1,7,NULL,1170,TRUE);
!     $c->add('limitnews',10,'text',1,7,NULL,1180,TRUE);
!     $c->add('minnews',1,'text',1,7,NULL,1190,TRUE);
!     $c->add('contributedbyline',1,'select',1,7,0,1200,TRUE);
!     $c->add('hideviewscount',0,'select',1,7,0,1210,TRUE);
!     $c->add('hideemailicon',0,'select',1,7,0,1220,TRUE);
!     $c->add('hideprintericon',0,'select',1,7,0,1230,TRUE);
!     $c->add('allow_page_breaks',1,'select',1,7,0,1240,TRUE);
!     $c->add('page_break_comments','last','select',1,7,7,1250,TRUE);
!     $c->add('article_image_align','right','select',1,7,8,1260,TRUE);
!     $c->add('show_topic_icon',1,'select',1,7,0,1270,TRUE);
!     $c->add('draft_flag',0,'select',1,7,0,1280,TRUE);
!     $c->add('frontpage',1,'select',1,7,0,1290,TRUE);
!     $c->add('hide_no_news_msg',0,'select',1,7,0,1300,TRUE);
!     $c->add('hide_main_page_navigation',0,'select',1,7,0,1310,TRUE);
!     $c->add('onlyrootfeatures',0,'select',1,7,0,1320,TRUE);
!     $c->add('aftersave_story','list','select',1,7,9,1330,TRUE);
! 
!     $c->add('fs_trackback', NULL, 'fieldset', 1, 8, NULL, 0, TRUE);
!     $c->add('trackback_enabled',TRUE,'select',1,8,1,1060,TRUE);
!     $c->add('trackback_code',0,'select',1,8,3,1070,TRUE);
!     $c->add('trackbackspeedlimit',300,'text',1,8,NULL,1080,TRUE);
!     $c->add('check_trackback_link',2,'select',1,8,4,1090,TRUE);
!     $c->add('multiple_trackbacks',0,'select',1,8,2,1100,TRUE);
! 
!     $c->add('fs_pingback', NULL, 'fieldset', 1, 9, NULL, 0, TRUE);
!     $c->add('pingback_enabled',TRUE,'select',1,9,1,1110,TRUE);
!     $c->add('pingback_excerpt',TRUE,'select',1,9,1,1120,TRUE);
!     $c->add('pingback_self',0,'select',1,9,13,1130,TRUE);
!     $c->add('ping_enabled',TRUE,'select',1,9,1,1140,TRUE);
! 
!     // Subgroup: Theme
!     $c->add('sg_theme', NULL, 'subgroup', 2, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_theme', NULL, 'fieldset', 2, 10, NULL, 0, TRUE);
!     $c->add('theme','professional','fn:themeList',2,10,NULL,190,TRUE);
!     $c->add('menu_elements',array('contribute','search','stats','directory','plugins'),'%text',2,10,NULL,200,TRUE);
!     $c->add('path_themes','','text',2,10,NULL,210,TRUE);
! 
!     $c->add('fs_theme_advanced', NULL, 'fieldset', 2, 11, NULL, 0, TRUE);
!     $c->add('show_right_blocks',FALSE,'select',2,11,1,1350,TRUE);
!     $c->add('showfirstasfeatured',0,'select',2,11,0,1360,TRUE);
! 
!     // Subgroup: Blocks
!     $c->add('sg_blocks', NULL, 'subgroup', 3, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_admin_block', NULL, 'fieldset', 3, 12, NULL, 0, TRUE);
!     $c->add('sort_admin',TRUE,'select',3,12,1,340,TRUE);
!     $c->add('link_documentation',1,'select',3,12,0,1150,TRUE);
!     $c->add('link_versionchecker',1,'select',3,12,0,1160,TRUE);
! 
!     $c->add('fs_topics_block', NULL, 'fieldset', 3, 13, NULL, 0, TRUE);
!     $c->add('sortmethod','sortnum','select',3,13,15,870,TRUE);
!     $c->add('showstorycount',1,'select',3,13,0,880,TRUE);
!     $c->add('showsubmissioncount',1,'select',3,13,0,890,TRUE);
!     $c->add('hide_home_link',0,'select',3,13,0,900,TRUE);
! 
!     $c->add('fs_whosonline_block', NULL, 'fieldset', 3, 14, NULL, 0, TRUE);
!     $c->add('whosonline_threshold',300,'text',3,14,NULL,910,TRUE);
!     $c->add('whosonline_anonymous',0,'select',3,14,0,920,TRUE);
! 
!     $c->add('fs_whatsnew_block', NULL, 'fieldset', 3, 15, NULL, 0, TRUE);
!     $c->add('newstoriesinterval',86400,'text',3,15,NULL,980,TRUE);
!     $c->add('newcommentsinterval',172800,'text',3,15,NULL,990,TRUE);
!     $c->add('newtrackbackinterval',172800,'text',3,15,NULL,1000,TRUE);
!     $c->add('hidenewstories',0,'select',3,15,0,1010,TRUE);
!     $c->add('hidenewcomments',0,'select',3,15,0,1020,TRUE);
!     $c->add('hidenewtrackbacks',0,'select',3,15,0,1030,TRUE);
!     $c->add('hidenewplugins',0,'select',3,15,0,1040,TRUE);
!     $c->add('title_trim_length',20,'text',3,15,NULL,1050,TRUE);
! 
!     // Subgroup: Users and Submissions
!     $c->add('sg_users', NULL, 'subgroup', 4, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_users', NULL, 'fieldset', 4, 16, NULL, 0, TRUE);
!     $c->add('disable_new_user_registration',FALSE,'select',4,16,0,220,TRUE);
!     $c->add('allow_user_themes',1,'select',4,16,0,230,TRUE);
!     $c->add('allow_user_language',1,'select',4,16,0,240,TRUE);
!     $c->add('allow_user_photo',1,'select',4,16,0,250,TRUE);
!     $c->add('allow_username_change',0,'select',4,16,0,260,TRUE);
!     $c->add('allow_account_delete',0,'select',4,16,0,270,TRUE);
!     $c->add('hide_author_exclusion',0,'select',4,16,0,280,TRUE);
!     $c->add('show_fullname',0,'select',4,16,0,290,TRUE);
!     $c->add('show_servicename',TRUE,'select',4,16,1,300,TRUE);
!     $c->add('custom_registration',FALSE,'select',4,16,1,310,TRUE);
!     $c->add('user_login_method',array('standard' => true, 'openid' => false, '3rdparty' => false),'@select',4,16,1,320,TRUE);
!     $c->add('aftersave_user','item','select',4,16,9,1340,TRUE);
! 
!     $c->add('fs_spamx', NULL, 'fieldset', 4, 17, NULL, 0, TRUE);
!     $c->add('spamx',128,'text',4,17,NULL,330,TRUE);
! 
!     $c->add('fs_login', NULL, 'fieldset', 4, 18, NULL, 0, TRUE);
!     $c->add('lastlogin',TRUE,'select',4,18,1,640,TRUE);
!     $c->add('loginrequired',0,'select',4,18,0,680,TRUE);
!     $c->add('submitloginrequired',0,'select',4,18,0,690,TRUE);
!     $c->add('commentsloginrequired',0,'select',4,18,0,700,TRUE);
!     $c->add('statsloginrequired',0,'select',4,18,0,710,TRUE);
!     $c->add('searchloginrequired',0,'select',4,18,16,720,TRUE);
!     $c->add('profileloginrequired',0,'select',4,18,0,730,TRUE);
!     $c->add('emailuserloginrequired',0,'select',4,18,0,740,TRUE);
!     $c->add('emailstoryloginrequired',0,'select',4,18,0,750,TRUE);
!     $c->add('directoryloginrequired',0,'select',4,18,0,760,TRUE);
!     $c->add('passwordspeedlimit',300,'text',4,18,NULL,1680,TRUE);
!     $c->add('login_attempts',3,'text',4,18,NULL,1690,TRUE);
!     $c->add('login_speedlimit',300,'text',4,18,NULL,1700,TRUE);
! 
!     $c->add('fs_user_submission', NULL, 'fieldset', 4, 19, NULL, 0, TRUE);
!     $c->add('usersubmission',0,'select',4,19,0,780,TRUE);
!     $c->add('allow_domains','','text',4,19,NULL,960,TRUE);
!     $c->add('disallow_domains','','text',4,19,NULL,970,TRUE);
! 
!     $c->add('fs_submission', NULL, 'fieldset', 4, 20, NULL, 0, TRUE);
!     $c->add('storysubmission',1,'select',4,20,0,770,TRUE);
!     $c->add('listdraftstories',0,'select',4,20,0,790,TRUE);
!     $c->add('postmode','plaintext','select',4,20,5,810,TRUE);
!     $c->add('speedlimit',45,'text',4,20,NULL,820,TRUE);
!     $c->add('skip_preview',0,'select',4,20,0,830,TRUE);
!     $c->add('advanced_editor',FALSE,'select',4,20,1,840,TRUE);
!     $c->add('wikitext_editor',FALSE,'select',4,20,1,850,TRUE);
! 
!     $c->add('fs_comments', NULL, 'fieldset', 4, 21, NULL, 0, TRUE);
!     $c->add('commentspeedlimit',45,'text',4,21,NULL,1640,TRUE);
!     $c->add('comment_limit',100,'text',4,21,NULL,1650,TRUE);
!     $c->add('comment_mode','threaded','select',4,21,11,1660,TRUE);
!     $c->add('comment_code',0,'select',4,21,17,1670,TRUE);
! 
!     // Subgroup: Images
!     $c->add('sg_images', NULL, 'subgroup', 5, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_imagelib', NULL, 'fieldset', 5, 22, NULL, 0, TRUE);
!     $c->add('image_lib','','select',5,22,10,1450,TRUE);
!     $c->add('path_to_mogrify','','text',5,22,NULL,1460,FALSE);
!     $c->add('path_to_netpbm','','text',5,22,NULL,1470,FALSE);
! 
!     $c->add('fs_upload', NULL, 'fieldset', 5, 23, NULL, 0, TRUE);
!     $c->add('keep_unscaled_image',0,'select',5,23,0,1480,TRUE);
!     $c->add('allow_user_scaling',1,'select',5,23,0,1490,TRUE);
!     $c->add('debug_image_upload',TRUE,'select',5,23,1,1500,TRUE);
! 
!     $c->add('fs_articleimg', NULL, 'fieldset', 5, 24, NULL, 0, TRUE);
!     $c->add('max_image_width',160,'text',5,24,NULL,1510,TRUE);
!     $c->add('max_image_height',160,'text',5,24,NULL,1520,TRUE);
!     $c->add('max_image_size',1048576,'text',5,24,NULL,1530,TRUE);
! 
!     $c->add('fs_topicicon', NULL, 'fieldset', 5, 25, NULL, 0, TRUE);
!     $c->add('max_topicicon_width',48,'text',5,25,NULL,1540,TRUE);
!     $c->add('max_topicicon_height',48,'text',5,25,NULL,1550,TRUE);
!     $c->add('max_topicicon_size',65536,'text',5,25,NULL,1560,TRUE);
! 
!     $c->add('fs_userphoto', NULL, 'fieldset', 5, 26, NULL, 0, TRUE);
!     $c->add('max_photo_width',128,'text',5,26,NULL,1570,TRUE);
!     $c->add('max_photo_height',128,'text',5,26,NULL,1580,TRUE);
!     $c->add('max_photo_size',65536,'text',5,26,NULL,1590,TRUE);
!     $c->add('force_photo_width',75,'text',5,26,NULL,1620,FALSE);
!     $c->add('default_photo','http://example.com/default.jpg','text',5,26,NULL,1630,FALSE);
! 
!     $c->add('fs_gravatar', NULL, 'fieldset', 5, 27, NULL, 0, TRUE);
!     $c->add('use_gravatar',FALSE,'select',5,27,1,1600,TRUE);
!     $c->add('gravatar_rating','R','text',5,27,NULL,1610,FALSE);
! 
!     // Subgroup: Languages and Locale
!     $c->add('sg_locale', NULL, 'subgroup', 6, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_language', NULL, 'fieldset', 6, 28, NULL, 0, TRUE);
!     $c->add('language','english','fn:languageList',6,28,NULL,350,TRUE);
!     $c->add('language_files',array('en'=>'english_utf-8', 'de'=>'german_formal_utf-8'),'*text',6,28,NULL,470,FALSE);
!     $c->add('languages',array('en'=>'English', 'de'=>'Deutsch'),'*text',6,28,NULL,480,FALSE);
! 
!     $c->add('fs_locale', NULL, 'fieldset', 6, 29, NULL, 0, TRUE);
!     $c->add('locale','en_GB','text',6,29,NULL,360,TRUE);
!     $c->add('date','%A, %B %d %Y @ %I:%M %p %Z','text',6,29,NULL,370,TRUE);
!     $c->add('daytime','%m/%d %I:%M%p','text',6,29,NULL,380,TRUE);
!     $c->add('shortdate','%x','text',6,29,NULL,390,TRUE);
!     $c->add('dateonly','%d-%b','text',6,29,NULL,400,TRUE);
!     $c->add('timeonly','%I:%M%p','text',6,29,NULL,410,TRUE);
!     $c->add('week_start','Sun','select',6,29,14,420,TRUE);
!     $c->add('hour_mode',12,'select',6,29,6,430,TRUE);
!     $c->add('thousand_separator',",",'text',6,29,NULL,440,TRUE);
!     $c->add('decimal_separator',".",'text',6,29,NULL,450,TRUE);
!     $c->add('decimal_count',"2",'text',6,29,NULL,460,TRUE);
!     $c->add('timezone','Etc/GMT-6','text',6,29,NULL,490,FALSE);
! 
!     // Subgroup: Miscellaneous
!     $c->add('sg_misc', NULL, 'subgroup', 7, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_cookies', NULL, 'fieldset', 7, 30, NULL, 0, TRUE);
!     $c->add('cookie_session','gl_session','text',7,30,NULL,530,TRUE);
!     $c->add('cookie_name','geeklog','text',7,30,NULL,540,TRUE);
!     $c->add('cookie_password','password','text',7,30,NULL,550,TRUE);
!     $c->add('cookie_theme','theme','text',7,30,NULL,560,TRUE);
!     $c->add('cookie_language','language','text',7,30,NULL,570,TRUE);
!     $c->add('cookie_tzid','timezone','text',7,30,NULL,575,TRUE);
!     $c->add('cookie_ip',0,'select',7,30,0,580,TRUE);
!     $c->add('default_perm_cookie_timeout',28800,'text',7,30,NULL,590,TRUE);
!     $c->add('session_cookie_timeout',7200,'text',7,30,NULL,600,TRUE);
!     $c->add('cookie_path','/','text',7,30,NULL,610,TRUE);
!     $c->add('cookiedomain','','text',7,30,NULL,620,TRUE);
!     $c->add('cookiesecure',FALSE,'select',7,30,1,630,TRUE);
! 
!     $c->add('fs_misc', NULL, 'fieldset', 7, 31, NULL, 0, TRUE);
!     $c->add('pdf_enabled',0,'select',7,31,0,660,TRUE);
!     $c->add('notification',array(),'%text',7,31,NULL,800,TRUE);
!     $c->add('cron_schedule_interval',86400,'text',7,31,NULL,860,TRUE);
!     $c->add('disable_autolinks',0,'select',7,31,0,1750,TRUE);
! 
!     $c->add('fs_debug', NULL, 'fieldset', 7, 32, NULL, 0, TRUE);
!     $c->add('rootdebug',FALSE,'select',7,32,1,520,TRUE);
! 
!     $c->add('fs_daily_digest', NULL, 'fieldset', 7, 33, NULL, 0, TRUE);
!     $c->add('emailstories',0,'select',7,33,0,930,TRUE);
!     $c->add('emailstorieslength',1,'text',7,33,NULL,940,TRUE);
!     $c->add('emailstoriesperdefault',0,'select',7,33,0,950,TRUE);
! 
!     $c->add('fs_htmlfilter', NULL, 'fieldset', 7, 34, NULL, 0, TRUE);
      $c->add('user_html',array ('p' => array(), 'b' => array(), 'strong' => array(),'i' => array(), 'a' => array('href' => 1, 'title' => 1, 'rel' => 1),'em'     => array(),'br'     => array(),'tt'     => array(),'hr'     => array(),        'li'     => array(), 'ol'     => array(), 'ul'     => array(), 'code' => array(), 'pre'    => array()),'**placeholder',7,34,NULL,1710,TRUE);
      $c->add('admin_html',array ('p' => array('class' => 1, 'id' => 1, 'align' => 1), 'div' => array('class' => 1, 'id' => 1), 'span' => array('class' => 1, 'id' => 1), 'table' => array('class' => 1, 'id' => 1, 'width' => 1, 'border' => 1, 'cellspacing' => 1, 'cellpadding' => 1), 'tr' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1), 'th' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1, 'colspan' => 1, 'rowspan' => 1), 'td' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1, 'colspan' => 1, 'rowspan' => 1)),'**placeholder',7,34,NULL,1720,TRUE);
      $c->add('skip_html_filter_for_root',0,'select',7,34,0,1730,TRUE);
!     $c->add('allowed_protocols',array('http','ftp','https'),'%text',7,34,NULL,1740,TRUE);
! 
!     $c->add('fs_censoring', NULL, 'fieldset', 7, 35, NULL, 0, TRUE);
      $c->add('censormode',1,'select',7,35,0,1760,TRUE);
      $c->add('censorreplace','*censormode*','text',7,35,NULL,1770,TRUE);
      $c->add('censorlist', array('fuck','cunt','fucker','fucking','pussy','cock','c0ck',' cum ','twat','clit','bitch','fuk','fuking','motherfucker'),'%text',7,35,NULL,1780,TRUE);
+ 
+     $c->add('fs_iplookup', NULL, 'fieldset', 7, 36, NULL, 0, TRUE);
      $c->add('ip_lookup','/nettools/whois.php?domain=*','text',7,36,NULL,1790,FALSE);
! 
!     $c->add('fs_perm_story', NULL, 'fieldset', 7, 37, NULL, 0, TRUE);
      $c->add('default_permissions_story',array(3, 2, 2, 2),'@select',7,37,12,1820,TRUE);
! 
!     $c->add('fs_perm_topic', NULL, 'fieldset', 7, 38, NULL, 0, TRUE);
!     $c->add('default_permissions_topic',array(3, 2, 2, 2),'@select',7,38,12,1830,TRUE);
! 
!     $c->add('fs_perm_block', NULL, 'fieldset', 7, 39, NULL, 0, TRUE);
!     $c->add('default_permissions_block',array(3, 2, 2, 2),'@select',7,39,12,1810,TRUE);
! 
!     $c->add('fs_webservices', NULL, 'fieldset', 7, 40, NULL, 0, TRUE);
!     $c->add('disable_webservices',   0, 'select', 7, 40, 0, 1840, TRUE);
!     $c->add('restrict_webservices',  0, 'select', 7, 40, 0, 1850, TRUE);
!     $c->add('atom_max_stories',     10, 'text',   7, 40, 0, 1860, TRUE);
  
  



From dhaun at qs1489.pair.com  Sun Feb 10 12:09:40 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 17:09:40 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/spamx/language english.php, 1.20,
	1.21 english_utf-8.php, 1.8, 1.9
Message-ID: <20080210170940.1F03410FE18@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/language
In directory qs1489.pair.com:/tmp/cvs-serv85353/plugins/spamx/language

Modified Files:
	english.php english_utf-8.php 
Log Message:
Decoupled config subgroup and fieldset order from the language files. Now we can reorder / regroup options simply by database updates.


Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/language/english.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** english.php	27 Jan 2008 09:02:15 -0000	1.20
--- english.php	10 Feb 2008 17:09:38 -0000	1.21
***************
*** 151,159 ****
  
  $LANG_configsubgroups['spamx'] = array(
!     0 => 'Main Settings'
  );
  
  $LANG_fs['spamx'] = array(
!     0 => 'Spam-X Main Settings'
  );
  
--- 151,159 ----
  
  $LANG_configsubgroups['spamx'] = array(
!     'sg_main' => 'Main Settings'
  );
  
  $LANG_fs['spamx'] = array(
!     'fs_main' => 'Spam-X Main Settings'
  );
  

Index: english_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/language/english_utf-8.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** english_utf-8.php	27 Jan 2008 09:02:15 -0000	1.8
--- english_utf-8.php	10 Feb 2008 17:09:38 -0000	1.9
***************
*** 151,159 ****
  
  $LANG_configsubgroups['spamx'] = array(
!     0 => 'Main Settings'
  );
  
  $LANG_fs['spamx'] = array(
!     0 => 'Spam-X Main Settings'
  );
  
--- 151,159 ----
  
  $LANG_configsubgroups['spamx'] = array(
!     'sg_main' => 'Main Settings'
  );
  
  $LANG_fs['spamx'] = array(
!     'fs_main' => 'Spam-X Main Settings'
  );
  



From dhaun at qs1489.pair.com  Sun Feb 10 12:09:40 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 17:09:40 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/spamx install_defaults.php, 1.1,
	1.2
Message-ID: <20080210170940.0EAA810FE17@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/spamx
In directory qs1489.pair.com:/tmp/cvs-serv85353/plugins/spamx

Modified Files:
	install_defaults.php 
Log Message:
Decoupled config subgroup and fieldset order from the language files. Now we can reorder / regroup options simply by database updates.


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/install_defaults.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** install_defaults.php	2 Feb 2008 20:03:06 -0000	1.1
--- install_defaults.php	10 Feb 2008 17:09:37 -0000	1.2
***************
*** 92,95 ****
--- 92,97 ----
          }
  
+         $c->add('sg_main', NULL, 'subgroup', 0, 0, NULL, 0, true, 'spamx');
+         $c->add('fs_main', NULL, 'fieldset', 0, 0, NULL, 0, true, 'spamx');
          $c->add('logging', $_SPX_DEFAULT['logging'], 'select',
                  0, 0, 1, 10, true, 'spamx');



From dhaun at qs1489.pair.com  Sun Feb 10 12:09:40 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 17:09:40 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages install_defaults.php,
	1.3, 1.4
Message-ID: <20080210170940.2B1FB10FE19@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv85353/plugins/staticpages

Modified Files:
	install_defaults.php 
Log Message:
Decoupled config subgroup and fieldset order from the language files. Now we can reorder / regroup options simply by database updates.


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/install_defaults.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install_defaults.php	2 Feb 2008 16:36:33 -0000	1.3
--- install_defaults.php	10 Feb 2008 17:09:38 -0000	1.4
***************
*** 128,131 ****
--- 128,135 ----
      if (!$c->group_exists('staticpages')) {
  
+         $c->add('sg_main', NULL, 'subgroup',
+                 0, 0, NULL, 0, true, 'staticpages');
+         $c->add('fs_main', NULL, 'fieldset',
+                 0, 0, NULL, 0, true, 'staticpages');
          $c->add('allow_php', $_SP_DEFAULT['allow_php'], 'select',
                  0, 0, 0, 10, true, 'staticpages');
***************
*** 150,153 ****
--- 154,160 ----
          $c->add('atom_max_items', $_SP_DEFAULT['atom_max_items'], 'text',
                  0, 0, null, 110, true, 'staticpages');
+ 
+         $c->add('fs_permissions', NULL, 'fieldset',
+                 0, 1, NULL, 0, true, 'staticpages');
          $c->add('default_permissions', $_SP_DEFAULT['default_permissions'],
                  '@select', 0, 1, 12, 120, true, 'staticpages');



From dhaun at qs1489.pair.com  Sun Feb 10 12:09:40 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 17:09:40 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages/language english.php,
	1.30, 1.31 english_utf-8.php, 1.16, 1.17
Message-ID: <20080210170940.3B40810FE1A@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/language
In directory qs1489.pair.com:/tmp/cvs-serv85353/plugins/staticpages/language

Modified Files:
	english.php english_utf-8.php 
Log Message:
Decoupled config subgroup and fieldset order from the language files. Now we can reorder / regroup options simply by database updates.


Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/language/english.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** english.php	27 Jan 2008 09:02:15 -0000	1.30
--- english.php	10 Feb 2008 17:09:38 -0000	1.31
***************
*** 140,149 ****
  
  $LANG_configsubgroups['staticpages'] = array(
!     0 => 'Main Settings'
  );
  
  $LANG_fs['staticpages'] = array(
!     0 => 'Static Pages Main Settings',
!     1 => 'Default Permissions'
  );
  
--- 140,149 ----
  
  $LANG_configsubgroups['staticpages'] = array(
!     'sg_main' => 'Main Settings'
  );
  
  $LANG_fs['staticpages'] = array(
!     'fs_main' => 'Static Pages Main Settings',
!     'fs_permissions' => 'Default Permissions'
  );
  

Index: english_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/language/english_utf-8.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** english_utf-8.php	27 Jan 2008 09:02:15 -0000	1.16
--- english_utf-8.php	10 Feb 2008 17:09:38 -0000	1.17
***************
*** 140,149 ****
  
  $LANG_configsubgroups['staticpages'] = array(
!     0 => 'Main Settings'
  );
  
  $LANG_fs['staticpages'] = array(
!     0 => 'Static Pages Main Settings',
!     1 => 'Default Permissions'
  );
  
--- 140,149 ----
  
  $LANG_configsubgroups['staticpages'] = array(
!     'sg_main' => 'Main Settings'
  );
  
  $LANG_fs['staticpages'] = array(
!     'fs_main' => 'Static Pages Main Settings',
!     'fs_permissions' => 'Default Permissions'
  );
  



From dhaun at qs1489.pair.com  Sun Feb 10 12:09:40 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 17:09:40 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.63,
	1.64
Message-ID: <20080210170940.6BC4610FE1C@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv85353/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Decoupled config subgroup and fieldset order from the language files. Now we can reorder / regroup options simply by database updates.


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** mysql_1.4.1_to_1.5.0.php	3 Feb 2008 20:52:55 -0000	1.63
--- mysql_1.4.1_to_1.5.0.php	10 Feb 2008 17:09:38 -0000	1.64
***************
*** 49,237 ****
      $c = config::get_instance();
  
!     $c->add('path_html','','text',0,1,NULL,10,TRUE);
      $c->add('site_url','','text',0,0,NULL,20,TRUE);
      $c->add('site_admin_url','','text',0,0,NULL,30,TRUE);
-     $c->add('site_mail','','text',0,3,NULL,40,TRUE);
-     $c->add('noreply_mail','','text',0,3,NULL,50,TRUE);
      $c->add('site_name','','text',0,0,NULL,60,TRUE);
      $c->add('site_slogan','','text',0,0,NULL,70,TRUE);
      $c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
!     $c->add('path_log','','text',0,1,NULL,90,TRUE);
!     $c->add('path_language','','text',0,1,NULL,100,TRUE);
!     $c->add('backup_path','','text',0,1,NULL,110,TRUE);
!     $c->add('path_data','','text',0,1,NULL,120,TRUE);
!     $c->add('path_images','','text',0,1,NULL,130,TRUE);
      $c->add('have_pear','','select',0,4,1,135,TRUE);
      $c->add('path_pear','','text',0,4,NULL,140,TRUE);
!     $c->add('mail_settings',array ('backend' => 'mail', 'sendmail_path' => '/usr/bin/sendmail', 'sendmail_args' => '', 'host' => 'smtp.example.com','port' => '25', 'auth' => false, 'username' => 'smtp-username','password' => 'smtp-password'),'@text',0,3,NULL,160,TRUE);
      $c->add('allow_mysqldump',1,'select',0,5,0,170,TRUE);
      $c->add('mysqldump_path','/usr/bin/mysqldump','text',0,5,NULL,175,TRUE);
      $c->add('mysqldump_options','-Q','text',0,5,NULL,180,TRUE);
!     $c->add('theme','professional','fn:themeList',2,2,NULL,190,TRUE);
!     $c->add('menu_elements',array('contribute','search','stats','directory','plugins'),'%text',2,2,NULL,200,TRUE);
!     $c->add('path_themes','','text',2,2,NULL,210,TRUE);
!     $c->add('disable_new_user_registration',FALSE,'select',4,6,0,220,TRUE);
!     $c->add('allow_user_themes',1,'select',4,6,0,230,TRUE);
!     $c->add('allow_user_language',1,'select',4,6,0,240,TRUE);
!     $c->add('allow_user_photo',1,'select',4,6,0,250,TRUE);
!     $c->add('allow_username_change',0,'select',4,6,0,260,TRUE);
!     $c->add('allow_account_delete',0,'select',4,6,0,270,TRUE);
!     $c->add('hide_author_exclusion',0,'select',4,6,0,280,TRUE);
!     $c->add('show_fullname',0,'select',4,6,0,290,TRUE);
!     $c->add('show_servicename',TRUE,'select',4,6,1,300,TRUE);
!     $c->add('custom_registration',FALSE,'select',4,6,1,310,TRUE);
!     $c->add('user_login_method',array('standard' => true, 'openid' => false, '3rdparty' => false),'@select',4,6,1,320,TRUE);
!     $c->add('spamx',128,'text',4,8,NULL,330,TRUE);
!     $c->add('sort_admin',TRUE,'select',3,9,1,340,TRUE);
!     $c->add('language','english','fn:languageList',6,11,NULL,350,TRUE);
!     $c->add('locale','en_GB','text',6,10,NULL,360,TRUE);
!     $c->add('date','%A, %B %d %Y @ %I:%M %p %Z','text',6,10,NULL,370,TRUE);
!     $c->add('daytime','%m/%d %I:%M%p','text',6,10,NULL,380,TRUE);
!     $c->add('shortdate','%x','text',6,10,NULL,390,TRUE);
!     $c->add('dateonly','%d-%b','text',6,10,NULL,400,TRUE);
!     $c->add('timeonly','%I:%M%p','text',6,10,NULL,410,TRUE);
!     $c->add('week_start','Sun','select',6,10,14,420,TRUE);
!     $c->add('hour_mode',12,'select',6,10,6,430,TRUE);
!     $c->add('thousand_separator',",",'text',6,10,NULL,440,TRUE);
!     $c->add('decimal_separator',".",'text',6,10,NULL,450,TRUE);
!     $c->add('decimal_count',"2",'text',6,10,NULL,460,TRUE);
!     $c->add('language_files',array('en'=>'english_utf-8', 'de'=>'german_formal_utf-8'),'*text',6,11,NULL,470,FALSE);
!     $c->add('languages',array('en'=>'English', 'de'=>'Deutsch'),'*text',6,11,NULL,480,FALSE);
!     $c->add('timezone','Etc/GMT-6','text',6,10,NULL,490,FALSE);
!     $c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','text',0,0,NULL,510,TRUE);
!     $c->add('rootdebug',FALSE,'select',7,12,1,520,TRUE);
!     $c->add('cookie_session','gl_session','text',7,13,NULL,530,TRUE);
!     $c->add('cookie_name','geeklog','text',7,13,NULL,540,TRUE);
!     $c->add('cookie_password','password','text',7,13,NULL,550,TRUE);
!     $c->add('cookie_theme','theme','text',7,13,NULL,560,TRUE);
!     $c->add('cookie_language','language','text',7,13,NULL,570,TRUE);
!     $c->add('cookie_tzid','timezone','text',7,13,NULL,575,TRUE);
!     $c->add('cookie_ip',0,'select',7,13,0,580,TRUE);
!     $c->add('default_perm_cookie_timeout',28800,'text',7,13,NULL,590,TRUE);
!     $c->add('session_cookie_timeout',7200,'text',7,13,NULL,600,TRUE);
!     $c->add('cookie_path','/','text',7,13,NULL,610,TRUE);
!     $c->add('cookiedomain','','text',7,13,NULL,620,TRUE);
!     $c->add('cookiesecure',FALSE,'select',7,13,1,630,TRUE);
!     $c->add('lastlogin',TRUE,'select',4,14,1,640,TRUE);
!     $c->add('pdf_enabled',0,'select',7,7,0,660,TRUE);
!     $c->add('num_search_results',10,'text',0,15,NULL,670,TRUE);
!     $c->add('loginrequired',0,'select',4,14,0,680,TRUE);
!     $c->add('submitloginrequired',0,'select',4,14,0,690,TRUE);
!     $c->add('commentsloginrequired',0,'select',4,14,0,700,TRUE);
!     $c->add('statsloginrequired',0,'select',4,14,0,710,TRUE);
!     $c->add('searchloginrequired',0,'select',4,14,16,720,TRUE);
!     $c->add('profileloginrequired',0,'select',4,14,0,730,TRUE);
!     $c->add('emailuserloginrequired',0,'select',4,14,0,740,TRUE);
!     $c->add('emailstoryloginrequired',0,'select',4,14,0,750,TRUE);
!     $c->add('directoryloginrequired',0,'select',4,14,0,760,TRUE);
!     $c->add('storysubmission',1,'select',4,17,0,770,TRUE);
!     $c->add('usersubmission',0,'select',4,16,0,780,TRUE);
!     $c->add('listdraftstories',0,'select',4,17,0,790,TRUE);
!     $c->add('notification',array(),'%text',7,7,NULL,800,TRUE);
!     $c->add('postmode','plaintext','select',4,17,5,810,TRUE);
!     $c->add('speedlimit',45,'text',4,17,NULL,820,TRUE);
!     $c->add('skip_preview',0,'select',4,17,0,830,TRUE);
!     $c->add('advanced_editor',FALSE,'select',4,17,1,840,TRUE);
!     $c->add('wikitext_editor',FALSE,'select',4,17,1,850,TRUE);
!     $c->add('cron_schedule_interval',86400,'text',7,7,NULL,860,TRUE);
!     $c->add('sortmethod','sortnum','select',3,18,15,870,TRUE);
!     $c->add('showstorycount',1,'select',3,18,0,880,TRUE);
!     $c->add('showsubmissioncount',1,'select',3,18,0,890,TRUE);
!     $c->add('hide_home_link',0,'select',3,18,0,900,TRUE);
!     $c->add('whosonline_threshold',300,'text',3,19,NULL,910,TRUE);
!     $c->add('whosonline_anonymous',0,'select',3,19,0,920,TRUE);
!     $c->add('emailstories',0,'select',7,20,0,930,TRUE);
!     $c->add('emailstorieslength',1,'text',7,20,NULL,940,TRUE);
!     $c->add('emailstoriesperdefault',0,'select',7,20,0,950,TRUE);
!     $c->add('allow_domains','','text',4,16,NULL,960,TRUE);
!     $c->add('disallow_domains','','text',4,16,NULL,970,TRUE);
!     $c->add('newstoriesinterval',86400,'text',3,21,NULL,980,TRUE);
!     $c->add('newcommentsinterval',172800,'text',3,21,NULL,990,TRUE);
!     $c->add('newtrackbackinterval',172800,'text',3,21,NULL,1000,TRUE);
!     $c->add('hidenewstories',0,'select',3,21,0,1010,TRUE);
!     $c->add('hidenewcomments',0,'select',3,21,0,1020,TRUE);
!     $c->add('hidenewtrackbacks',0,'select',3,21,0,1030,TRUE);
!     $c->add('hidenewplugins',0,'select',3,21,0,1040,TRUE);
!     $c->add('title_trim_length',20,'text',3,21,NULL,1050,TRUE);
!     $c->add('trackback_enabled',TRUE,'select',1,22,1,1060,TRUE);
!     $c->add('trackback_code',0,'select',1,22,3,1070,TRUE);
!     $c->add('trackbackspeedlimit',300,'text',1,22,NULL,1080,TRUE);
!     $c->add('check_trackback_link',2,'select',1,22,4,1090,TRUE);
!     $c->add('multiple_trackbacks',0,'select',1,22,2,1100,TRUE);
!     $c->add('pingback_enabled',TRUE,'select',1,23,1,1110,TRUE);
!     $c->add('pingback_excerpt',TRUE,'select',1,23,1,1120,TRUE);
!     $c->add('pingback_self',0,'select',1,23,13,1130,TRUE);
!     $c->add('ping_enabled',TRUE,'select',1,23,1,1140,TRUE);
!     $c->add('link_documentation',1,'select',3,9,0,1150,TRUE);
!     $c->add('link_versionchecker',1,'select',3,9,0,1160,TRUE);
!     $c->add('maximagesperarticle',5,'text',1,24,NULL,1170,TRUE);
!     $c->add('limitnews',10,'text',1,24,NULL,1180,TRUE);
!     $c->add('minnews',1,'text',1,24,NULL,1190,TRUE);
!     $c->add('contributedbyline',1,'select',1,24,0,1200,TRUE);
!     $c->add('hideviewscount',0,'select',1,24,0,1210,TRUE);
!     $c->add('hideemailicon',0,'select',1,24,0,1220,TRUE);
!     $c->add('hideprintericon',0,'select',1,24,0,1230,TRUE);
!     $c->add('allow_page_breaks',1,'select',1,24,0,1240,TRUE);
!     $c->add('page_break_comments','last','select',1,24,7,1250,TRUE);
!     $c->add('article_image_align','right','select',1,24,8,1260,TRUE);
!     $c->add('show_topic_icon',1,'select',1,24,0,1270,TRUE);
!     $c->add('draft_flag',0,'select',1,24,0,1280,TRUE);
!     $c->add('frontpage',1,'select',1,24,0,1290,TRUE);
!     $c->add('hide_no_news_msg',0,'select',1,24,0,1300,TRUE);
!     $c->add('hide_main_page_navigation',0,'select',1,24,0,1310,TRUE);
!     $c->add('onlyrootfeatures',0,'select',1,24,0,1320,TRUE);
!     $c->add('aftersave_story','list','select',1,24,9,1330,TRUE);
!     $c->add('aftersave_user','item','select',1,24,9,1340,TRUE);
!     $c->add('show_right_blocks',FALSE,'select',2,25,1,1350,TRUE);
!     $c->add('showfirstasfeatured',0,'select',2,25,0,1360,TRUE);
!     $c->add('backend',1,'select',0,26,0,1380,TRUE);
!     $c->add('rdf_file','','text',0,26,NULL,1390,TRUE);
!     $c->add('rdf_limit',10,'text',0,26,NULL,1400,TRUE);
!     $c->add('rdf_storytext',1,'text',0,26,NULL,1410,TRUE);
!     $c->add('rdf_language','en-gb','text',0,26,NULL,1420,TRUE);
!     $c->add('syndication_max_headlines',0,'text',0,26,NULL,1430,TRUE);
!     $c->add('copyright','2007','text',0,0,NULL,1440,FALSE);
!     $c->add('image_lib','','select',5,27,10,1450,TRUE);
!     $c->add('path_to_mogrify','','text',5,27,NULL,1460,FALSE);
!     $c->add('path_to_netpbm','','text',5,27,NULL,1470,FALSE);
!     $c->add('keep_unscaled_image',0,'select',5,28,0,1480,TRUE);
!     $c->add('allow_user_scaling',1,'select',5,28,0,1490,TRUE);
!     $c->add('debug_image_upload',TRUE,'select',5,28,1,1500,TRUE);
!     $c->add('max_image_width',160,'text',5,29,NULL,1510,TRUE);
!     $c->add('max_image_height',160,'text',5,29,NULL,1520,TRUE);
!     $c->add('max_image_size',1048576,'text',5,29,NULL,1530,TRUE);
!     $c->add('max_topicicon_width',48,'text',5,30,NULL,1540,TRUE);
!     $c->add('max_topicicon_height',48,'text',5,30,NULL,1550,TRUE);
!     $c->add('max_topicicon_size',65536,'text',5,30,NULL,1560,TRUE);
!     $c->add('max_photo_width',128,'text',5,31,NULL,1570,TRUE);
!     $c->add('max_photo_height',128,'text',5,31,NULL,1580,TRUE);
!     $c->add('max_photo_size',65536,'text',5,31,NULL,1590,TRUE);
!     $c->add('use_gravatar',FALSE,'select',5,32,1,1600,TRUE);
!     $c->add('gravatar_rating','R','text',5,32,NULL,1610,FALSE);
!     $c->add('force_photo_width',75,'text',5,31,NULL,1620,FALSE);
!     $c->add('default_photo','http://example.com/default.jpg','text',5,31,NULL,1630,FALSE);
!     $c->add('commentspeedlimit',45,'text',4,33,NULL,1640,TRUE);
!     $c->add('comment_limit',100,'text',4,33,NULL,1650,TRUE);
!     $c->add('comment_mode','threaded','select',4,33,11,1660,TRUE);
!     $c->add('comment_code',0,'select',4,33,17,1670,TRUE);
!     $c->add('passwordspeedlimit',300,'text',4,14,NULL,1680,TRUE);
!     $c->add('login_attempts',3,'text',4,14,NULL,1690,TRUE);
!     $c->add('login_speedlimit',300,'text',4,14,NULL,1700,TRUE);
!     $c->add('user_html',array ('p' => array(), 'b' => array(), 'strong' => array(),'i' => array(), 'a' => array('href' => 1, 'title' => 1, 'rel' => 1),'em'   => array(),'br'   => array(),'tt'   => array(),'hr'   => array(),    'li'   => array(), 'ol'   => array(), 'ul'   => array(), 'code' => array(), 'pre'  => array()),'**placeholder',7,34,NULL,1710,TRUE);
      $c->add('admin_html',array ('p' => array('class' => 1, 'id' => 1, 'align' => 1), 'div' => array('class' => 1, 'id' => 1), 'span' => array('class' => 1, 'id' => 1), 'table' => array('class' => 1, 'id' => 1, 'width' => 1, 'border' => 1, 'cellspacing' => 1, 'cellpadding' => 1), 'tr' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1), 'th' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1, 'colspan' => 1, 'rowspan' => 1), 'td' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1, 'colspan' => 1, 'rowspan' => 1)),'**placeholder',7,34,NULL,1720,TRUE);
      $c->add('skip_html_filter_for_root',0,'select',7,34,0,1730,TRUE);
!     $c->add('allowed_protocols',array('http','ftp','https'),'%text',0,0,NULL,1740,TRUE);
!     $c->add('disable_autolinks',0,'select',7,7,0,1750,TRUE);
      $c->add('censormode',1,'select',7,35,0,1760,TRUE);
      $c->add('censorreplace','*censormode*','text',7,35,NULL,1770,TRUE);
      $c->add('censorlist', array('fuck','cunt','fucker','fucking','pussy','cock','c0ck',' cum ','twat','clit','bitch','fuk','fuking','motherfucker'),'%text',7,35,NULL,1780,TRUE);
      $c->add('ip_lookup','/nettools/whois.php?domain=*','text',7,36,NULL,1790,FALSE);
!     $c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
!     $c->add('default_permissions_block',array(3, 2, 2, 2),'@select',7,37,12,1810,TRUE);
      $c->add('default_permissions_story',array(3, 2, 2, 2),'@select',7,37,12,1820,TRUE);
!     $c->add('default_permissions_topic',array(3, 2, 2, 2),'@select',7,37,12,1830,TRUE);
!     $c->add('disable_webservices',   0, 'select', 7, 38, 0, 1840, TRUE);
!     $c->add('restrict_webservices',  0, 'select', 7, 38, 0, 1850, TRUE);
!     $c->add('atom_max_stories',     10, 'text',   7, 38, 0, 1860, TRUE);
  }
  
--- 49,342 ----
      $c = config::get_instance();
  
!     // Subgroup: Site
!     $c->add('sg_site', NULL, 'subgroup', 0, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_site', NULL, 'fieldset', 0, 0, NULL, 0, TRUE);
      $c->add('site_url','','text',0,0,NULL,20,TRUE);
      $c->add('site_admin_url','','text',0,0,NULL,30,TRUE);
      $c->add('site_name','','text',0,0,NULL,60,TRUE);
      $c->add('site_slogan','','text',0,0,NULL,70,TRUE);
      $c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
!     $c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','text',0,0,NULL,510,TRUE);
!     $c->add('copyright','2007','text',0,0,NULL,1440,FALSE);
!     $c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
! 
!     $c->add('fs_mail', NULL, 'fieldset', 0, 1, NULL, 0, TRUE);
!     $c->add('site_mail','','text',0,1,NULL,40,TRUE);
!     $c->add('noreply_mail','','text',0,1,NULL,50,TRUE);
!     $c->add('mail_settings',array ('backend' => 'mail', 'sendmail_path' => '/usr/bin/sendmail', 'sendmail_args' => '', 'host' => 'smtp.example.com','port' => '25', 'auth' => false, 'username' => 'smtp-username','password' => 'smtp-password'),'@text',0,1,NULL,160,TRUE);
! 
!     $c->add('fs_syndication', NULL, 'fieldset', 0, 2, NULL, 0, TRUE);
!     $c->add('backend',1,'select',0,2,0,1380,TRUE);
!     $c->add('rdf_file','','text',0,2,NULL,1390,TRUE);
!     $c->add('rdf_limit',10,'text',0,2,NULL,1400,TRUE);
!     $c->add('rdf_storytext',1,'text',0,2,NULL,1410,TRUE);
!     $c->add('rdf_language','en-gb','text',0,2,NULL,1420,TRUE);
!     $c->add('syndication_max_headlines',0,'text',0,2,NULL,1430,TRUE);
! 
!     $c->add('fs_paths', NULL, 'fieldset', 0, 3, NULL, 0, TRUE);
!     $c->add('path_html','','text',0,3,NULL,10,TRUE);
!     $c->add('path_log','','text',0,3,NULL,90,TRUE);
!     $c->add('path_language','','text',0,3,NULL,100,TRUE);
!     $c->add('backup_path','','text',0,3,NULL,110,TRUE);
!     $c->add('path_data','','text',0,3,NULL,120,TRUE);
!     $c->add('path_images','','text',0,3,NULL,130,TRUE);
! 
!     $c->add('fs_pear', NULL, 'fieldset', 0, 4, NULL, 0, TRUE);
      $c->add('have_pear','','select',0,4,1,135,TRUE);
      $c->add('path_pear','','text',0,4,NULL,140,TRUE);
! 
!     $c->add('fs_mysql', NULL, 'fieldset', 0, 5, NULL, 0, TRUE);
      $c->add('allow_mysqldump',1,'select',0,5,0,170,TRUE);
      $c->add('mysqldump_path','/usr/bin/mysqldump','text',0,5,NULL,175,TRUE);
      $c->add('mysqldump_options','-Q','text',0,5,NULL,180,TRUE);
! 
!     $c->add('fs_search', NULL, 'fieldset', 0, 6, NULL, 0, TRUE);
!     $c->add('num_search_results',10,'text',0,6,NULL,670,TRUE);
! 
!     // Subgroup: Stories and Trackback
!     $c->add('sg_stories', NULL, 'subgroup', 1, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_story', NULL, 'fieldset', 1, 7, NULL, 0, TRUE);
!     $c->add('maximagesperarticle',5,'text',1,7,NULL,1170,TRUE);
!     $c->add('limitnews',10,'text',1,7,NULL,1180,TRUE);
!     $c->add('minnews',1,'text',1,7,NULL,1190,TRUE);
!     $c->add('contributedbyline',1,'select',1,7,0,1200,TRUE);
!     $c->add('hideviewscount',0,'select',1,7,0,1210,TRUE);
!     $c->add('hideemailicon',0,'select',1,7,0,1220,TRUE);
!     $c->add('hideprintericon',0,'select',1,7,0,1230,TRUE);
!     $c->add('allow_page_breaks',1,'select',1,7,0,1240,TRUE);
!     $c->add('page_break_comments','last','select',1,7,7,1250,TRUE);
!     $c->add('article_image_align','right','select',1,7,8,1260,TRUE);
!     $c->add('show_topic_icon',1,'select',1,7,0,1270,TRUE);
!     $c->add('draft_flag',0,'select',1,7,0,1280,TRUE);
!     $c->add('frontpage',1,'select',1,7,0,1290,TRUE);
!     $c->add('hide_no_news_msg',0,'select',1,7,0,1300,TRUE);
!     $c->add('hide_main_page_navigation',0,'select',1,7,0,1310,TRUE);
!     $c->add('onlyrootfeatures',0,'select',1,7,0,1320,TRUE);
!     $c->add('aftersave_story','list','select',1,7,9,1330,TRUE);
! 
!     $c->add('fs_trackback', NULL, 'fieldset', 1, 8, NULL, 0, TRUE);
!     $c->add('trackback_enabled',TRUE,'select',1,8,1,1060,TRUE);
!     $c->add('trackback_code',0,'select',1,8,3,1070,TRUE);
!     $c->add('trackbackspeedlimit',300,'text',1,8,NULL,1080,TRUE);
!     $c->add('check_trackback_link',2,'select',1,8,4,1090,TRUE);
!     $c->add('multiple_trackbacks',0,'select',1,8,2,1100,TRUE);
! 
!     $c->add('fs_pingback', NULL, 'fieldset', 1, 9, NULL, 0, TRUE);
!     $c->add('pingback_enabled',TRUE,'select',1,9,1,1110,TRUE);
!     $c->add('pingback_excerpt',TRUE,'select',1,9,1,1120,TRUE);
!     $c->add('pingback_self',0,'select',1,9,13,1130,TRUE);
!     $c->add('ping_enabled',TRUE,'select',1,9,1,1140,TRUE);
! 
!     // Subgroup: Theme
!     $c->add('sg_theme', NULL, 'subgroup', 2, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_theme', NULL, 'fieldset', 2, 10, NULL, 0, TRUE);
!     $c->add('theme','professional','fn:themeList',2,10,NULL,190,TRUE);
!     $c->add('menu_elements',array('contribute','search','stats','directory','plugins'),'%text',2,10,NULL,200,TRUE);
!     $c->add('path_themes','','text',2,10,NULL,210,TRUE);
! 
!     $c->add('fs_theme_advanced', NULL, 'fieldset', 2, 11, NULL, 0, TRUE);
!     $c->add('show_right_blocks',FALSE,'select',2,11,1,1350,TRUE);
!     $c->add('showfirstasfeatured',0,'select',2,11,0,1360,TRUE);
! 
!     // Subgroup: Blocks
!     $c->add('sg_blocks', NULL, 'subgroup', 3, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_admin_block', NULL, 'fieldset', 3, 12, NULL, 0, TRUE);
!     $c->add('sort_admin',TRUE,'select',3,12,1,340,TRUE);
!     $c->add('link_documentation',1,'select',3,12,0,1150,TRUE);
!     $c->add('link_versionchecker',1,'select',3,12,0,1160,TRUE);
! 
!     $c->add('fs_topics_block', NULL, 'fieldset', 3, 13, NULL, 0, TRUE);
!     $c->add('sortmethod','sortnum','select',3,13,15,870,TRUE);
!     $c->add('showstorycount',1,'select',3,13,0,880,TRUE);
!     $c->add('showsubmissioncount',1,'select',3,13,0,890,TRUE);
!     $c->add('hide_home_link',0,'select',3,13,0,900,TRUE);
! 
!     $c->add('fs_whosonline_block', NULL, 'fieldset', 3, 14, NULL, 0, TRUE);
!     $c->add('whosonline_threshold',300,'text',3,14,NULL,910,TRUE);
!     $c->add('whosonline_anonymous',0,'select',3,14,0,920,TRUE);
! 
!     $c->add('fs_whatsnew_block', NULL, 'fieldset', 3, 15, NULL, 0, TRUE);
!     $c->add('newstoriesinterval',86400,'text',3,15,NULL,980,TRUE);
!     $c->add('newcommentsinterval',172800,'text',3,15,NULL,990,TRUE);
!     $c->add('newtrackbackinterval',172800,'text',3,15,NULL,1000,TRUE);
!     $c->add('hidenewstories',0,'select',3,15,0,1010,TRUE);
!     $c->add('hidenewcomments',0,'select',3,15,0,1020,TRUE);
!     $c->add('hidenewtrackbacks',0,'select',3,15,0,1030,TRUE);
!     $c->add('hidenewplugins',0,'select',3,15,0,1040,TRUE);
!     $c->add('title_trim_length',20,'text',3,15,NULL,1050,TRUE);
! 
!     // Subgroup: Users and Submissions
!     $c->add('sg_users', NULL, 'subgroup', 4, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_users', NULL, 'fieldset', 4, 16, NULL, 0, TRUE);
!     $c->add('disable_new_user_registration',FALSE,'select',4,16,0,220,TRUE);
!     $c->add('allow_user_themes',1,'select',4,16,0,230,TRUE);
!     $c->add('allow_user_language',1,'select',4,16,0,240,TRUE);
!     $c->add('allow_user_photo',1,'select',4,16,0,250,TRUE);
!     $c->add('allow_username_change',0,'select',4,16,0,260,TRUE);
!     $c->add('allow_account_delete',0,'select',4,16,0,270,TRUE);
!     $c->add('hide_author_exclusion',0,'select',4,16,0,280,TRUE);
!     $c->add('show_fullname',0,'select',4,16,0,290,TRUE);
!     $c->add('show_servicename',TRUE,'select',4,16,1,300,TRUE);
!     $c->add('custom_registration',FALSE,'select',4,16,1,310,TRUE);
!     $c->add('user_login_method',array('standard' => true, 'openid' => false, '3rdparty' => false),'@select',4,16,1,320,TRUE);
!     $c->add('aftersave_user','item','select',4,16,9,1340,TRUE);
! 
!     $c->add('fs_spamx', NULL, 'fieldset', 4, 17, NULL, 0, TRUE);
!     $c->add('spamx',128,'text',4,17,NULL,330,TRUE);
! 
!     $c->add('fs_login', NULL, 'fieldset', 4, 18, NULL, 0, TRUE);
!     $c->add('lastlogin',TRUE,'select',4,18,1,640,TRUE);
!     $c->add('loginrequired',0,'select',4,18,0,680,TRUE);
!     $c->add('submitloginrequired',0,'select',4,18,0,690,TRUE);
!     $c->add('commentsloginrequired',0,'select',4,18,0,700,TRUE);
!     $c->add('statsloginrequired',0,'select',4,18,0,710,TRUE);
!     $c->add('searchloginrequired',0,'select',4,18,16,720,TRUE);
!     $c->add('profileloginrequired',0,'select',4,18,0,730,TRUE);
!     $c->add('emailuserloginrequired',0,'select',4,18,0,740,TRUE);
!     $c->add('emailstoryloginrequired',0,'select',4,18,0,750,TRUE);
!     $c->add('directoryloginrequired',0,'select',4,18,0,760,TRUE);
!     $c->add('passwordspeedlimit',300,'text',4,18,NULL,1680,TRUE);
!     $c->add('login_attempts',3,'text',4,18,NULL,1690,TRUE);
!     $c->add('login_speedlimit',300,'text',4,18,NULL,1700,TRUE);
! 
!     $c->add('fs_user_submission', NULL, 'fieldset', 4, 19, NULL, 0, TRUE);
!     $c->add('usersubmission',0,'select',4,19,0,780,TRUE);
!     $c->add('allow_domains','','text',4,19,NULL,960,TRUE);
!     $c->add('disallow_domains','','text',4,19,NULL,970,TRUE);
! 
!     $c->add('fs_submission', NULL, 'fieldset', 4, 20, NULL, 0, TRUE);
!     $c->add('storysubmission',1,'select',4,20,0,770,TRUE);
!     $c->add('listdraftstories',0,'select',4,20,0,790,TRUE);
!     $c->add('postmode','plaintext','select',4,20,5,810,TRUE);
!     $c->add('speedlimit',45,'text',4,20,NULL,820,TRUE);
!     $c->add('skip_preview',0,'select',4,20,0,830,TRUE);
!     $c->add('advanced_editor',FALSE,'select',4,20,1,840,TRUE);
!     $c->add('wikitext_editor',FALSE,'select',4,20,1,850,TRUE);
! 
!     $c->add('fs_comments', NULL, 'fieldset', 4, 21, NULL, 0, TRUE);
!     $c->add('commentspeedlimit',45,'text',4,21,NULL,1640,TRUE);
!     $c->add('comment_limit',100,'text',4,21,NULL,1650,TRUE);
!     $c->add('comment_mode','threaded','select',4,21,11,1660,TRUE);
!     $c->add('comment_code',0,'select',4,21,17,1670,TRUE);
! 
!     // Subgroup: Images
!     $c->add('sg_images', NULL, 'subgroup', 5, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_imagelib', NULL, 'fieldset', 5, 22, NULL, 0, TRUE);
!     $c->add('image_lib','','select',5,22,10,1450,TRUE);
!     $c->add('path_to_mogrify','','text',5,22,NULL,1460,FALSE);
!     $c->add('path_to_netpbm','','text',5,22,NULL,1470,FALSE);
! 
!     $c->add('fs_upload', NULL, 'fieldset', 5, 23, NULL, 0, TRUE);
!     $c->add('keep_unscaled_image',0,'select',5,23,0,1480,TRUE);
!     $c->add('allow_user_scaling',1,'select',5,23,0,1490,TRUE);
!     $c->add('debug_image_upload',TRUE,'select',5,23,1,1500,TRUE);
! 
!     $c->add('fs_articleimg', NULL, 'fieldset', 5, 24, NULL, 0, TRUE);
!     $c->add('max_image_width',160,'text',5,24,NULL,1510,TRUE);
!     $c->add('max_image_height',160,'text',5,24,NULL,1520,TRUE);
!     $c->add('max_image_size',1048576,'text',5,24,NULL,1530,TRUE);
! 
!     $c->add('fs_topicicon', NULL, 'fieldset', 5, 25, NULL, 0, TRUE);
!     $c->add('max_topicicon_width',48,'text',5,25,NULL,1540,TRUE);
!     $c->add('max_topicicon_height',48,'text',5,25,NULL,1550,TRUE);
!     $c->add('max_topicicon_size',65536,'text',5,25,NULL,1560,TRUE);
! 
!     $c->add('fs_userphoto', NULL, 'fieldset', 5, 26, NULL, 0, TRUE);
!     $c->add('max_photo_width',128,'text',5,26,NULL,1570,TRUE);
!     $c->add('max_photo_height',128,'text',5,26,NULL,1580,TRUE);
!     $c->add('max_photo_size',65536,'text',5,26,NULL,1590,TRUE);
!     $c->add('force_photo_width',75,'text',5,26,NULL,1620,FALSE);
!     $c->add('default_photo','http://example.com/default.jpg','text',5,26,NULL,1630,FALSE);
! 
!     $c->add('fs_gravatar', NULL, 'fieldset', 5, 27, NULL, 0, TRUE);
!     $c->add('use_gravatar',FALSE,'select',5,27,1,1600,TRUE);
!     $c->add('gravatar_rating','R','text',5,27,NULL,1610,FALSE);
! 
!     // Subgroup: Languages and Locale
!     $c->add('sg_locale', NULL, 'subgroup', 6, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_language', NULL, 'fieldset', 6, 28, NULL, 0, TRUE);
!     $c->add('language','english','fn:languageList',6,28,NULL,350,TRUE);
!     $c->add('language_files',array('en'=>'english_utf-8', 'de'=>'german_formal_utf-8'),'*text',6,28,NULL,470,FALSE);
!     $c->add('languages',array('en'=>'English', 'de'=>'Deutsch'),'*text',6,28,NULL,480,FALSE);
! 
!     $c->add('fs_locale', NULL, 'fieldset', 6, 29, NULL, 0, TRUE);
!     $c->add('locale','en_GB','text',6,29,NULL,360,TRUE);
!     $c->add('date','%A, %B %d %Y @ %I:%M %p %Z','text',6,29,NULL,370,TRUE);
!     $c->add('daytime','%m/%d %I:%M%p','text',6,29,NULL,380,TRUE);
!     $c->add('shortdate','%x','text',6,29,NULL,390,TRUE);
!     $c->add('dateonly','%d-%b','text',6,29,NULL,400,TRUE);
!     $c->add('timeonly','%I:%M%p','text',6,29,NULL,410,TRUE);
!     $c->add('week_start','Sun','select',6,29,14,420,TRUE);
!     $c->add('hour_mode',12,'select',6,29,6,430,TRUE);
!     $c->add('thousand_separator',",",'text',6,29,NULL,440,TRUE);
!     $c->add('decimal_separator',".",'text',6,29,NULL,450,TRUE);
!     $c->add('decimal_count',"2",'text',6,29,NULL,460,TRUE);
!     $c->add('timezone','Etc/GMT-6','text',6,29,NULL,490,FALSE);
! 
!     // Subgroup: Miscellaneous
!     $c->add('sg_misc', NULL, 'subgroup', 7, 0, NULL, 0, TRUE);
! 
!     $c->add('fs_cookies', NULL, 'fieldset', 7, 30, NULL, 0, TRUE);
!     $c->add('cookie_session','gl_session','text',7,30,NULL,530,TRUE);
!     $c->add('cookie_name','geeklog','text',7,30,NULL,540,TRUE);
!     $c->add('cookie_password','password','text',7,30,NULL,550,TRUE);
!     $c->add('cookie_theme','theme','text',7,30,NULL,560,TRUE);
!     $c->add('cookie_language','language','text',7,30,NULL,570,TRUE);
!     $c->add('cookie_tzid','timezone','text',7,30,NULL,575,TRUE);
!     $c->add('cookie_ip',0,'select',7,30,0,580,TRUE);
!     $c->add('default_perm_cookie_timeout',28800,'text',7,30,NULL,590,TRUE);
!     $c->add('session_cookie_timeout',7200,'text',7,30,NULL,600,TRUE);
!     $c->add('cookie_path','/','text',7,30,NULL,610,TRUE);
!     $c->add('cookiedomain','','text',7,30,NULL,620,TRUE);
!     $c->add('cookiesecure',FALSE,'select',7,30,1,630,TRUE);
! 
!     $c->add('fs_misc', NULL, 'fieldset', 7, 31, NULL, 0, TRUE);
!     $c->add('pdf_enabled',0,'select',7,31,0,660,TRUE);
!     $c->add('notification',array(),'%text',7,31,NULL,800,TRUE);
!     $c->add('cron_schedule_interval',86400,'text',7,31,NULL,860,TRUE);
!     $c->add('disable_autolinks',0,'select',7,31,0,1750,TRUE);
! 
!     $c->add('fs_debug', NULL, 'fieldset', 7, 32, NULL, 0, TRUE);
!     $c->add('rootdebug',FALSE,'select',7,32,1,520,TRUE);
! 
!     $c->add('fs_daily_digest', NULL, 'fieldset', 7, 33, NULL, 0, TRUE);
!     $c->add('emailstories',0,'select',7,33,0,930,TRUE);
!     $c->add('emailstorieslength',1,'text',7,33,NULL,940,TRUE);
!     $c->add('emailstoriesperdefault',0,'select',7,33,0,950,TRUE);
! 
!     $c->add('fs_htmlfilter', NULL, 'fieldset', 7, 34, NULL, 0, TRUE);
!     $c->add('user_html',array ('p' => array(), 'b' => array(), 'strong' => array(),'i' => array(), 'a' => array('href' => 1, 'title' => 1, 'rel' => 1),'em'     => array(),'br'     => array(),'tt'     => array(),'hr'     => array(),        'li'     => array(), 'ol'     => array(), 'ul'     => array(), 'code' => array(), 'pre'    => array()),'**placeholder',7,34,NULL,1710,TRUE);
      $c->add('admin_html',array ('p' => array('class' => 1, 'id' => 1, 'align' => 1), 'div' => array('class' => 1, 'id' => 1), 'span' => array('class' => 1, 'id' => 1), 'table' => array('class' => 1, 'id' => 1, 'width' => 1, 'border' => 1, 'cellspacing' => 1, 'cellpadding' => 1), 'tr' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1), 'th' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1, 'colspan' => 1, 'rowspan' => 1), 'td' => array('class' => 1, 'id' => 1, 'align' => 1, 'valign' => 1, 'colspan' => 1, 'rowspan' => 1)),'**placeholder',7,34,NULL,1720,TRUE);
      $c->add('skip_html_filter_for_root',0,'select',7,34,0,1730,TRUE);
!     $c->add('allowed_protocols',array('http','ftp','https'),'%text',7,34,NULL,1740,TRUE);
! 
!     $c->add('fs_censoring', NULL, 'fieldset', 7, 35, NULL, 0, TRUE);
      $c->add('censormode',1,'select',7,35,0,1760,TRUE);
      $c->add('censorreplace','*censormode*','text',7,35,NULL,1770,TRUE);
      $c->add('censorlist', array('fuck','cunt','fucker','fucking','pussy','cock','c0ck',' cum ','twat','clit','bitch','fuk','fuking','motherfucker'),'%text',7,35,NULL,1780,TRUE);
+ 
+     $c->add('fs_iplookup', NULL, 'fieldset', 7, 36, NULL, 0, TRUE);
      $c->add('ip_lookup','/nettools/whois.php?domain=*','text',7,36,NULL,1790,FALSE);
! 
!     $c->add('fs_perm_story', NULL, 'fieldset', 7, 37, NULL, 0, TRUE);
      $c->add('default_permissions_story',array(3, 2, 2, 2),'@select',7,37,12,1820,TRUE);
! 
!     $c->add('fs_perm_topic', NULL, 'fieldset', 7, 38, NULL, 0, TRUE);
!     $c->add('default_permissions_topic',array(3, 2, 2, 2),'@select',7,38,12,1830,TRUE);
! 
!     $c->add('fs_perm_block', NULL, 'fieldset', 7, 39, NULL, 0, TRUE);
!     $c->add('default_permissions_block',array(3, 2, 2, 2),'@select',7,39,12,1810,TRUE);
! 
!     $c->add('fs_webservices', NULL, 'fieldset', 7, 40, NULL, 0, TRUE);
!     $c->add('disable_webservices',   0, 'select', 7, 40, 0, 1840, TRUE);
!     $c->add('restrict_webservices',  0, 'select', 7, 40, 0, 1850, TRUE);
!     $c->add('atom_max_stories',     10, 'text',   7, 40, 0, 1860, TRUE);
  }
  



From dhaun at qs1489.pair.com  Sun Feb 10 12:09:40 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 10 Feb 2008 17:09:40 +0000
Subject: [geeklog-cvs] Geeklog-1.x/language english.php, 1.326,
	1.327 english_utf-8.php, 1.111, 1.112
Message-ID: <20080210170940.5F89410FE1B@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/language
In directory qs1489.pair.com:/tmp/cvs-serv85353/language

Modified Files:
	english.php english_utf-8.php 
Log Message:
Decoupled config subgroup and fieldset order from the language files. Now we can reorder / regroup options simply by database updates.


Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english.php,v
retrieving revision 1.326
retrieving revision 1.327
diff -C2 -d -r1.326 -r1.327
*** english.php	2 Feb 2008 21:56:18 -0000	1.326
--- english.php	10 Feb 2008 17:09:38 -0000	1.327
***************
*** 1765,1818 ****
  
  $LANG_configsubgroups['Core'] = array(
!     0 => 'Site',
!     1 => 'Stories and Trackback',
!     2 => 'Theme',
!     3 => 'Blocks',
!     4 => 'Users and Submissions',
!     5 => 'Images',
!     6 => 'Languages and Locale',
!     7 => 'Miscellaneous'
  );
  
  $LANG_fs['Core'] = array(
!     0 => 'Site',
!     1 => 'Paths',
!     2 => 'Theme',
!     3 => 'Mail',
!     4 => 'Pear',
!     5 => 'MySQL',
!     6 => 'Users',
!     7 => 'Miscellaneous',
!     8 => 'Spam-X',
!     9 => 'Admin Block',
!     10 => 'Locale',
!     11 => 'Language',
!     12 => 'Debug',
!     13 => 'Cookies',
!     14 => 'Login Settings',
!     15 => 'Search',
!     16 => 'User Submission',
!     17 => 'Submission Settings',
!     18 => 'Topics Block',
!     19 => 'Who\'s Online Block',
!     20 => 'Daily Digest',
!     21 => 'What\'s New Block',
!     22 => 'Trackback',
!     23 => 'Pingback',
!     24 => 'Story',
!     25 => 'Advanced Settings',
!     26 => 'RSS',
!     27 => 'Image Library',
!     28 => 'Upload',
!     29 => 'Images in Articles',
!     30 => 'Topic Icons',
!     31 => 'Photos',
!     32 => 'Gravatar',
!     33 => 'Comments',
!     34 => 'HTML Filtering',
!     35 => 'Censoring',
!     36 => 'IP Lookup',
!     37 => 'Default Permission',
!     38 => 'Webservices'
  );
  
--- 1765,1820 ----
  
  $LANG_configsubgroups['Core'] = array(
!     'sg_site' => 'Site',
!     'sg_stories' => 'Stories and Trackback',
!     'sg_theme' => 'Theme',
!     'sg_blocks' => 'Blocks',
!     'sg_users' => 'Users and Submissions',
!     'sg_images' => 'Images',
!     'sg_locale' => 'Languages and Locale',
!     'sg_misc' => 'Miscellaneous'
  );
  
  $LANG_fs['Core'] = array(
!     'fs_site' => 'Site',
!     'fs_paths' => 'Paths',
!     'fs_theme' => 'Theme',
!     'fs_mail' => 'Mail',
!     'fs_pear' => 'Pear',
!     'fs_mysql' => 'MySQL',
!     'fs_users' => 'Users',
!     'fs_misc' => 'Miscellaneous',
!     'fs_spamx' => 'Spam-X',
!     'fs_admin_block' => 'Admin Block',
!     'fs_locale' => 'Locale',
!     'fs_language' => 'Language',
!     'fs_debug' => 'Debug',
!     'fs_cookies' => 'Cookies',
!     'fs_login' => 'Login Settings',
!     'fs_search' => 'Search',
!     'fs_user_submission' => 'User Submission',
!     'fs_submission' => 'Submission Settings',
!     'fs_topics_block' => 'Topics Block',
!     'fs_whosonline_block' => 'Who\'s Online Block',
!     'fs_daily_digest' => 'Daily Digest',
!     'fs_whatsnew_block' => 'What\'s New Block',
!     'fs_trackback' => 'Trackback',
!     'fs_pingback' => 'Pingback',
!     'fs_story' => 'Story',
!     'fs_theme_advanced' => 'Advanced Settings',
!     'fs_syndication' => 'RSS',
!     'fs_imagelib' => 'Image Library',
!     'fs_upload' => 'Upload',
!     'fs_articleimg' => 'Images in Articles',
!     'fs_topicicon' => 'Topic Icons',
!     'fs_userphoto' => 'Photos',
!     'fs_gravatar' => 'Gravatar',
!     'fs_comments' => 'Comments',
!     'fs_htmlfilter' => 'HTML Filtering',
!     'fs_censoring' => 'Censoring',
!     'fs_iplookup' => 'IP Lookup',
!     'fs_perm_story' => 'Story Default Permission',
!     'fs_perm_topic' => 'Topic Default Permission',
!     'fs_perm_block' => 'Block Default Permission',
!     'fs_webservices' => 'Webservices'
  );
  

Index: english_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english_utf-8.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** english_utf-8.php	2 Feb 2008 21:56:18 -0000	1.111
--- english_utf-8.php	10 Feb 2008 17:09:38 -0000	1.112
***************
*** 1765,1818 ****
  
  $LANG_configsubgroups['Core'] = array(
!     0 => 'Site',
!     1 => 'Stories and Trackback',
!     2 => 'Theme',
!     3 => 'Blocks',
!     4 => 'Users and Submissions',
!     5 => 'Images',
!     6 => 'Languages and Locale',
!     7 => 'Miscellaneous'
  );
  
  $LANG_fs['Core'] = array(
!     0 => 'Site',
!     1 => 'Paths',
!     2 => 'Theme',
!     3 => 'Mail',
!     4 => 'Pear',
!     5 => 'MySQL',
!     6 => 'Users',
!     7 => 'Miscellaneous',
!     8 => 'Spam-X',
!     9 => 'Admin Block',
!     10 => 'Locale',
!     11 => 'Language',
!     12 => 'Debug',
!     13 => 'Cookies',
!     14 => 'Login Settings',
!     15 => 'Search',
!     16 => 'User Submission',
!     17 => 'Submission Settings',
!     18 => 'Topics Block',
!     19 => 'Who\'s Online Block',
!     20 => 'Daily Digest',
!     21 => 'What\'s New Block',
!     22 => 'Trackback',
!     23 => 'Pingback',
!     24 => 'Story',
!     25 => 'Advanced Settings',
!     26 => 'RSS',
!     27 => 'Image Library',
!     28 => 'Upload',
!     29 => 'Images in Articles',
!     30 => 'Topic Icons',
!     31 => 'Photos',
!     32 => 'Gravatar',
!     33 => 'Comments',
!     34 => 'HTML Filtering',
!     35 => 'Censoring',
!     36 => 'IP Lookup',
!     37 => 'Default Permission',
!     38 => 'Webservices'
  );
  
--- 1765,1820 ----
  
  $LANG_configsubgroups['Core'] = array(
!     'sg_site' => 'Site',
!     'sg_stories' => 'Stories and Trackback',
!     'sg_theme' => 'Theme',
!     'sg_blocks' => 'Blocks',
!     'sg_users' => 'Users and Submissions',
!     'sg_images' => 'Images',
!     'sg_locale' => 'Languages and Locale',
!     'sg_misc' => 'Miscellaneous'
  );
  
  $LANG_fs['Core'] = array(
!     'fs_site' => 'Site',
!     'fs_paths' => 'Paths',
!     'fs_theme' => 'Theme',
!     'fs_mail' => 'Mail',
!     'fs_pear' => 'Pear',
!     'fs_mysql' => 'MySQL',
!     'fs_users' => 'Users',
!     'fs_misc' => 'Miscellaneous',
!     'fs_spamx' => 'Spam-X',
!     'fs_admin_block' => 'Admin Block',
!     'fs_locale' => 'Locale',
!     'fs_language' => 'Language',
!     'fs_debug' => 'Debug',
!     'fs_cookies' => 'Cookies',
!     'fs_login' => 'Login Settings',
!     'fs_search' => 'Search',
!     'fs_user_submission' => 'User Submission',
!     'fs_submission' => 'Submission Settings',
!     'fs_topics_block' => 'Topics Block',
!     'fs_whosonline_block' => 'Who\'s Online Block',
!     'fs_daily_digest' => 'Daily Digest',
!     'fs_whatsnew_block' => 'What\'s New Block',
!     'fs_trackback' => 'Trackback',
!     'fs_pingback' => 'Pingback',
!     'fs_story' => 'Story',
!     'fs_theme_advanced' => 'Advanced Settings',
!     'fs_syndication' => 'RSS',
!     'fs_imagelib' => 'Image Library',
!     'fs_upload' => 'Upload',
!     'fs_articleimg' => 'Images in Articles',
!     'fs_topicicon' => 'Topic Icons',
!     'fs_userphoto' => 'Photos',
!     'fs_gravatar' => 'Gravatar',
!     'fs_comments' => 'Comments',
!     'fs_htmlfilter' => 'HTML Filtering',
!     'fs_censoring' => 'Censoring',
!     'fs_iplookup' => 'IP Lookup',
!     'fs_perm_story' => 'Story Default Permission',
!     'fs_perm_topic' => 'Topic Default Permission',
!     'fs_perm_block' => 'Block Default Permission',
!     'fs_webservices' => 'Webservices'
  );
  



From dhaun at qs1489.pair.com  Mon Feb 11 03:37:44 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 11 Feb 2008 08:37:44 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin story.php, 1.248,
	1.248.2.1
Message-ID: <20080211083744.A3E2610FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv17484/public_html/admin

Modified Files:
      Tag: geeklog_1_4_1_1
	story.php 
Log Message:
Fixed multiple application of htmlspecialchars() in the story preview


Index: story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/story.php,v
retrieving revision 1.248
retrieving revision 1.248.2.1
diff -C2 -d -r1.248 -r1.248.2.1
*** story.php	10 Dec 2006 12:08:40 -0000	1.248
--- story.php	11 Feb 2008 08:37:42 -0000	1.248.2.1
***************
*** 778,784 ****
          $newintro = str_replace('</code></pre>','[/code]',$newintro);
          $newbody = str_replace('</code></pre>','[/code]',$newbody);
- 
-         $newintro = htmlspecialchars ($newintro);
-         $newbody = htmlspecialchars ($newbody);
      }
  
--- 778,781 ----



From dhaun at qs1489.pair.com  Mon Feb 11 03:37:44 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 11 Feb 2008 08:37:44 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history, 1.535.2.27,
	1.535.2.28
Message-ID: <20080211083744.BF6AF10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv17484/public_html/docs

Modified Files:
      Tag: geeklog_1_4_1_1
	history 
Log Message:
Fixed multiple application of htmlspecialchars() in the story preview


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.535.2.27
retrieving revision 1.535.2.28
diff -C2 -d -r1.535.2.27 -r1.535.2.28
*** history	21 Dec 2007 13:57:10 -0000	1.535.2.27
--- history	11 Feb 2008 08:37:42 -0000	1.535.2.28
***************
*** 4,7 ****
--- 4,8 ----
  ------------
  
+ - Fixed multiple application of htmlspecialchars() in the story preview [Dirk]
  - Set variable {max_url_length} for the default block editor (used in the
    template file but wasn't set). Patch provided by dengen. [Dirk]



From dhaun at qs1489.pair.com  Wed Feb 13 06:29:11 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Wed, 13 Feb 2008 11:29:11 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/calendar index.php, 1.23, 1.24
Message-ID: <20080213112911.98EFE10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/calendar
In directory qs1489.pair.com:/tmp/cvs-serv64679/public_html/calendar

Modified Files:
	index.php 
Log Message:
Typo in description: function returns 2 characters, not 3


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/calendar/index.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** index.php	21 Dec 2007 13:50:15 -0000	1.23
--- index.php	13 Feb 2008 11:29:09 -0000	1.24
***************
*** 141,145 ****
  *
  * @param    int     $day    1 = Sunday, 2 = Monday, ...
! * @return   string          abbreviated day's name (3 characters)
  *
  *
--- 141,145 ----
  *
  * @param    int     $day    1 = Sunday, 2 = Monday, ...
! * @return   string          abbreviated day's name (2 characters)
  *
  *



From mjervis at qs1489.pair.com  Fri Feb 15 14:10:30 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Fri, 15 Feb 2008 19:10:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/language english.php,1.327,1.328
Message-ID: <20080215191030.10FCB10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/language
In directory qs1489.pair.com:/tmp/cvs-serv60922/language

Modified Files:
	english.php 
Log Message:
Support for Podcasts in portal blocks improved.
Fixed error where REALLY long syndication feeds could blow portal blocks up.

Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english.php,v
retrieving revision 1.327
retrieving revision 1.328
diff -C2 -d -r1.327 -r1.328
*** english.php	10 Feb 2008 17:09:38 -0000	1.327
--- english.php	15 Feb 2008 19:10:27 -0000	1.328
***************
*** 699,703 ****
      65 => 'Order',
      66 => 'Autotags',
!     67 => 'Check to allow autotags'
  );
  
--- 699,704 ----
      65 => 'Order',
      66 => 'Autotags',
!     67 => 'Check to allow autotags',
!     68 => 'The feed for this portal block is too long to display. Please set a maximum number of articles to import for the block in the block setup screen, or a global maximum in Geeklog Configuration.'
  );
  



From mjervis at qs1489.pair.com  Fri Feb 15 14:10:30 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Fri, 15 Feb 2008 19:10:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php, 1.675,
	1.676 usersettings.php, 1.167, 1.168
Message-ID: <20080215191030.2CEA810FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv60922/public_html

Modified Files:
	lib-common.php usersettings.php 
Log Message:
Support for Podcasts in portal blocks improved.
Fixed error where REALLY long syndication feeds could blow portal blocks up.

Index: usersettings.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/usersettings.php,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** usersettings.php	9 Dec 2007 18:05:39 -0000	1.167
--- usersettings.php	15 Feb 2008 19:10:28 -0000	1.168
***************
*** 168,176 ****
      }
  
- // @@@@ 2007/09/16 changed by dengen ----->>
- //  $selection = '<select name="cooktime">' . LB;
- // @@@@ 2007/09/16 changed by dengen -----||
      $selection = '<select id="cooktime" name="cooktime">' . LB;
- // @@@@ 2007/09/16 changed by dengen -----<<
      $selection .= COM_optionList ($_TABLES['cookiecodes'], 'cc_value,cc_descr',
                                    $A['cookietimeout'], 0);
--- 168,172 ----

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.675
retrieving revision 1.676
diff -C2 -d -r1.675 -r1.676
*** lib-common.php	3 Feb 2008 20:21:23 -0000	1.675
--- lib-common.php	15 Feb 2008 19:10:28 -0000	1.676
***************
*** 3597,3601 ****
  * Syndication import function. Imports headline data to a portal block.
  *
! * Rewritten December 19th 2004 by Michael Jervis (mike at fuckingbrit.com). Now
  * utilises a Factory Pattern to open a URL and automaticaly retreive a feed
  * object populated with feed data. Then import it into the portal block.
--- 3597,3601 ----
  * Syndication import function. Imports headline data to a portal block.
  *
! * Rewritten December 19th 2004 by Michael Jervis (mike@*censored*ingbrit.com). Now
  * utilises a Factory Pattern to open a URL and automaticaly retreive a feed
  * object populated with feed data. Then import it into the portal block.
***************
*** 3676,3680 ****
                  $title = utf8_decode($feed->articles[$i]['title']);
              }
!             $content = COM_createLink($title, $feed->articles[$i]['link']);
              $articles[] = $content;
          }
--- 3676,3686 ----
                  $title = utf8_decode($feed->articles[$i]['title']);
              }
!             if ($feed->articles[$i]['link'] != '') {
!                 $content = COM_createLink($title, $feed->articles[$i]['link']);
!             } elseif ($feed->articles[$i]['enclosureurl'] != '') {
!                 $content = COM_createLink($title, $feed->articles[$i]['enclosureurl']);
!             } else {
!                 $content = $title;
!             }
              $articles[] = $content;
          }
***************
*** 3683,3686 ****
--- 3689,3696 ----
          $content = COM_makeList($articles, 'list-feed');
          $content = preg_replace("/(\015\012)|(\015)|(\012)/", '', $content);
+        
+         if (strlen($content) > 65000) {
+             $content = $LANG21[68];
+         }
  
          // Standard theme based function to put it in the block



From mjervis at qs1489.pair.com  Fri Feb 15 14:10:30 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Fri, 15 Feb 2008 19:10:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes/syndication
	rss.feed.class.php, 1.12, 1.13
Message-ID: <20080215191030.35A6810FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes/syndication
In directory qs1489.pair.com:/tmp/cvs-serv60922/system/classes/syndication

Modified Files:
	rss.feed.class.php 
Log Message:
Support for Podcasts in portal blocks improved.
Fixed error where REALLY long syndication feeds could blow portal blocks up.

Index: rss.feed.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/syndication/rss.feed.class.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rss.feed.class.php	9 Mar 2006 18:15:05 -0000	1.12
--- rss.feed.class.php	15 Feb 2008 19:10:28 -0000	1.13
***************
*** 434,437 ****
--- 434,440 ----
            $this->_permaLink = false;
          }
+       } else if( ($name == 'ENCLOSURE') && array_key_exists('URL', $attributes) ) {
+         /* If we have an enclosure with a URL, remember it because this is a podcast */
+         $this->_currentItem['enclosureurl'] = $attributes['URL'];
        } else {
          $this->_permaLink = false;



From mjervis at qs1489.pair.com  Fri Feb 15 14:15:50 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Fri, 15 Feb 2008 19:15:50 +0000
Subject: [geeklog-cvs] Geeklog-1.x/language english.php, 1.328,
	1.329 english_utf-8.php, 1.112, 1.113
Message-ID: <20080215191550.B14CB10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/language
In directory qs1489.pair.com:/tmp/cvs-serv61166/language

Modified Files:
	english.php english_utf-8.php 
Log Message:
Admin UI Language corrections for syndication.

Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english.php,v
retrieving revision 1.328
retrieving revision 1.329
diff -C2 -d -r1.328 -r1.329
*** english.php	15 Feb 2008 19:10:27 -0000	1.328
--- english.php	15 Feb 2008 19:15:48 -0000	1.329
***************
*** 646,651 ****
      12 => 'Normal Block',
      13 => 'Portal Block Options',
!     14 => 'RSS URL',
!     15 => 'Last RSS Update',
      16 => 'Normal Block Options',
      17 => 'Block Content',
--- 646,651 ----
      12 => 'Normal Block',
      13 => 'Portal Block Options',
!     14 => 'Feed URL',
!     15 => 'Last Feed Update',
      16 => 'Normal Block Options',
      17 => 'Block Content',
***************
*** 665,669 ****
      31 => 'Error in PHP Block.  Function, %s, does not exist.',
      32 => 'Error Missing Field(s)',
!     33 => 'You must enter the URL to the RSS file for portal blocks',
      34 => 'You must enter the title and the function for PHP blocks',
      35 => 'You must enter the title and the content for normal blocks',
--- 665,669 ----
      31 => 'Error in PHP Block.  Function, %s, does not exist.',
      32 => 'Error Missing Field(s)',
!     33 => 'You must enter the URL to the syndication feed file for portal blocks',
      34 => 'You must enter the title and the function for PHP blocks',
      35 => 'You must enter the title and the content for normal blocks',
***************
*** 752,756 ****
      44 => '',
      45 => '',
!     46 => '<b>NOTE:</b> if you modify this date to be in the future, this article will not be published until that date.  That also means the story will not be included in your RSS headline feed and it will be ignored by the search and statistics pages.',
      47 => 'Images',
      48 => 'image',
--- 752,756 ----
      44 => '',
      45 => '',
!     46 => '<b>NOTE:</b> if you modify this date to be in the future, this article will not be published until that date.  That also means the story will not be included in your feed headline feed and it will be ignored by the search and statistics pages.',
      47 => 'Images',
      48 => 'image',
***************
*** 1715,1723 ****
      'showfirstasfeatured' => "Show First Story as Featured?",
      'backend' => "Enable Feeds?",
!     'rdf_file' => "RSS File",
!     'rdf_limit' => "RSS Limit",
      'rdf_storytext' => "Length of Stories in Feed",
!     'rdf_language' => "RSS Language",
!     'syndication_max_headlines' => 'Max. Number of Headlines',
      'copyright' => "Copyright Year",
      'image_lib' => "Image Library",
--- 1715,1723 ----
      'showfirstasfeatured' => "Show First Story as Featured?",
      'backend' => "Enable Feeds?",
!     'rdf_file' => "Syndication Output Folder",
!     'rdf_limit' => "Feed Limit",
      'rdf_storytext' => "Length of Stories in Feed",
!     'rdf_language' => "Feed Language",
!     'syndication_max_headlines' => 'Max. Number of Headlines (portal blocks)',
      'copyright' => "Copyright Year",
      'image_lib' => "Image Library",
***************
*** 1803,1807 ****
      'fs_story' => 'Story',
      'fs_theme_advanced' => 'Advanced Settings',
!     'fs_syndication' => 'RSS',
      'fs_imagelib' => 'Image Library',
      'fs_upload' => 'Upload',
--- 1803,1807 ----
      'fs_story' => 'Story',
      'fs_theme_advanced' => 'Advanced Settings',
!     'fs_syndication' => 'Syndication',
      'fs_imagelib' => 'Image Library',
      'fs_upload' => 'Upload',

Index: english_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english_utf-8.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** english_utf-8.php	10 Feb 2008 17:09:38 -0000	1.112
--- english_utf-8.php	15 Feb 2008 19:15:48 -0000	1.113
***************
*** 646,651 ****
      12 => 'Normal Block',
      13 => 'Portal Block Options',
!     14 => 'RSS URL',
!     15 => 'Last RSS Update',
      16 => 'Normal Block Options',
      17 => 'Block Content',
--- 646,651 ----
      12 => 'Normal Block',
      13 => 'Portal Block Options',
!     14 => 'Feed URL',
!     15 => 'Last Feed Update',
      16 => 'Normal Block Options',
      17 => 'Block Content',
***************
*** 665,669 ****
      31 => 'Error in PHP Block.  Function, %s, does not exist.',
      32 => 'Error Missing Field(s)',
!     33 => 'You must enter the URL to the RSS file for portal blocks',
      34 => 'You must enter the title and the function for PHP blocks',
      35 => 'You must enter the title and the content for normal blocks',
--- 665,669 ----
      31 => 'Error in PHP Block.  Function, %s, does not exist.',
      32 => 'Error Missing Field(s)',
!     33 => 'You must enter the URL to the syndication feed file for portal blocks',
      34 => 'You must enter the title and the function for PHP blocks',
      35 => 'You must enter the title and the content for normal blocks',
***************
*** 699,703 ****
      65 => 'Order',
      66 => 'Autotags',
!     67 => 'Check to allow autotags'
  );
  
--- 699,704 ----
      65 => 'Order',
      66 => 'Autotags',
!     67 => 'Check to allow autotags',
!     68 => 'The feed for this portal block is too long to display. Please set a maximum number of articles to import for the block in the block setup screen, or a global maximum in Geeklog Configuration.'
  );
  
***************
*** 751,755 ****
      44 => '',
      45 => '',
!     46 => '<b>NOTE:</b> if you modify this date to be in the future, this article will not be published until that date.  That also means the story will not be included in your RSS headline feed and it will be ignored by the search and statistics pages.',
      47 => 'Images',
      48 => 'image',
--- 752,756 ----
      44 => '',
      45 => '',
!     46 => '<b>NOTE:</b> if you modify this date to be in the future, this article will not be published until that date.  That also means the story will not be included in your feed headline feed and it will be ignored by the search and statistics pages.',
      47 => 'Images',
      48 => 'image',
***************
*** 1714,1722 ****
      'showfirstasfeatured' => "Show First Story as Featured?",
      'backend' => "Enable Feeds?",
!     'rdf_file' => "RSS File",
!     'rdf_limit' => "RSS Limit",
      'rdf_storytext' => "Length of Stories in Feed",
!     'rdf_language' => "RSS Language",
!     'syndication_max_headlines' => 'Max. Number of Headlines',
      'copyright' => "Copyright Year",
      'image_lib' => "Image Library",
--- 1715,1723 ----
      'showfirstasfeatured' => "Show First Story as Featured?",
      'backend' => "Enable Feeds?",
!     'rdf_file' => "Syndication Output Folder",
!     'rdf_limit' => "Feed Limit",
      'rdf_storytext' => "Length of Stories in Feed",
!     'rdf_language' => "Feed Language",
!     'syndication_max_headlines' => 'Max. Number of Headlines (portal blocks)',
      'copyright' => "Copyright Year",
      'image_lib' => "Image Library",
***************
*** 1802,1806 ****
      'fs_story' => 'Story',
      'fs_theme_advanced' => 'Advanced Settings',
!     'fs_syndication' => 'RSS',
      'fs_imagelib' => 'Image Library',
      'fs_upload' => 'Upload',
--- 1803,1807 ----
      'fs_story' => 'Story',
      'fs_theme_advanced' => 'Advanced Settings',
!     'fs_syndication' => 'Syndication',
      'fs_imagelib' => 'Image Library',
      'fs_upload' => 'Upload',



From dhaun at qs1489.pair.com  Sat Feb 16 06:40:06 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 11:40:06 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html usersettings.php, 1.168, 1.169
Message-ID: <20080216114006.9765B10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv98599/public_html

Modified Files:
	usersettings.php 
Log Message:
Removed remaining "changed by dengen" comments that accidentally came in with the XHTML patch


Index: usersettings.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/usersettings.php,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** usersettings.php	15 Feb 2008 19:10:28 -0000	1.168
--- usersettings.php	16 Feb 2008 11:40:04 -0000	1.169
***************
*** 9,13 ****
  // | Geeklog user settings page.                                               |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Geeklog user settings page.                                               |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 479,487 ****
          }
  
- // @@@@ 2007/09/16 changed by dengen ----->>
- //      $selection = '<select name="language">' . LB;
- // @@@@ 2007/09/16 changed by dengen -----||
          $selection = '<select id="language" name="language">' . LB;
- // @@@@ 2007/09/16 changed by dengen -----<<
  
          foreach ($language as $langFile => $langName) {
--- 479,483 ----
***************
*** 505,513 ****
  
      if ($_CONF['allow_user_themes'] == 1) {
- // @@@@ 2007/09/16 changed by dengen ----->>
- //      $selection = '<select name="theme">' . LB;
- // @@@@ 2007/09/16 changed by dengen -----||
          $selection = '<select id="theme" name="theme">' . LB;
- // @@@@ 2007/09/16 changed by dengen -----<<
  
          if (empty ($_USER['theme'])) {
--- 501,505 ----
***************
*** 555,572 ****
          $timezone = $tz_obj->id;
      }
- // @@@@ 2007/09/16 changed by dengen ----->>
- //  $selection = '<select name="tzid">' . LB;
- // @@@@ 2007/09/16 changed by dengen -----||
      $selection = '<select id="tzid" name="tzid">' . LB;
- // @@@@ 2007/09/16 changed by dengen -----<<
  
      $T = $GLOBALS['_DATE_TIMEZONE_DATA'];
  
      while ($tDetails = current($T)) {
- // @@@@ 2007/09/16 changed by dengen ----->>
- //      $tzcode = key($T);
- // @@@@ 2007/09/16 changed by dengen -----||
          $tzcode = htmlspecialchars(key($T));
- // @@@@ 2007/09/16 changed by dengen -----<<
          $selection .= '<option value="' . $tzcode . '"';
          if ($timezone == $tzcode) {
--- 547,556 ----
***************
*** 599,607 ****
  
      $preferences->set_var ('maxstories_value', $A['maxstories']);
- // @@@@ 2007/09/16 changed by dengen
- //  $selection = '<select name="dfid">' . LB
- // @@@@ 2007/09/16 changed by dengen
      $selection = '<select id="dfid" name="dfid">' . LB
- // @@@@ 2007/09/16 changed by dengen
                 . COM_optionList ($_TABLES['dateformats'], 'dfid,description',
                                   $A['dfid']) . '</select>';
--- 583,587 ----
***************
*** 721,729 ****
      if (empty ($A['commentlimit'])) $A['commentlimit'] = 100;
  
- // @@@@ 2007/09/16 changed by dengen ----->>
- //  $selection = '<select name="commentmode">';
- // @@@@ 2007/09/16 changed by dengen -----||
      $selection = '<select id="commentmode" name="commentmode">';
- // @@@@ 2007/09/16 changed by dengen -----<<
      $selection .= COM_optionList ($_TABLES['commentmodes'], 'mode,name',
                                    $A['commentmode']);
--- 701,705 ----
***************
*** 731,739 ****
      $preferences->set_var ('displaymode_selector', $selection);
  
- // @@@@ 2007/09/16 changed by dengen ----->>
- //  $selection = '<select name="commentorder">';
- // @@@@ 2007/09/16 changed by dengen -----||
      $selection = '<select id="commentorder" name="commentorder">';
- // @@@@ 2007/09/16 changed by dengen -----<<
      $selection .= COM_optionList ($_TABLES['sortcodes'], 'code,name',
                                    $A['commentorder']);
--- 707,711 ----



From dhaun at qs1489.pair.com  Sat Feb 16 07:03:18 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 12:03:18 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin topic.php,1.76,1.77
Message-ID: <20080216120318.C790F10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv99391/public_html/admin

Modified Files:
	topic.php 
Log Message:
Removed "changed by dengen" comments. These changes actually fix a missing </tr> tag. Thanks!


Index: topic.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/topic.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** topic.php	25 Nov 2007 06:58:55 -0000	1.76
--- topic.php	16 Feb 2008 12:03:16 -0000	1.77
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | topic.php                                                                 |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | topic.php                                                                 |
***************
*** 9,13 ****
  // | Geeklog topic administration page.                                        |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Geeklog topic administration page.                                        |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 378,391 ****
                  $topic_templates->set_var('begin_row','<tr align="center" valign="bottom">');
              } else {
! 
! // @@@@ changed by dengen 2007/09/05 ---------->>
! //              $topic_templates->set_var('end_row','');
! // @@@@ changed by dengen 2007/09/05 ----------||
!                 if ( $i == $nrows - 1 ) {
                      $topic_templates->set_var('end_row','</tr>');
                  } else {
                      $topic_templates->set_var('end_row','');
                  }
- // @@@@ changed by dengen 2007/09/05 ----------<<
  
                  $topic_templates->parse('list_row','item',true);
--- 378,386 ----
                  $topic_templates->set_var('begin_row','<tr align="center" valign="bottom">');
              } else {
!                 if ($i == $nrows - 1) {
                      $topic_templates->set_var('end_row','</tr>');
                  } else {
                      $topic_templates->set_var('end_row','');
                  }
  
                  $topic_templates->parse('list_row','item',true);
***************
*** 395,401 ****
          }
      }
- // @@@@ uncommented by dengen 2007/09/05 ---------->>
- //  $topic_templates->set_var('end_row','</tr>');
- // @@@@ uncommented by dengen 2007/09/05 ----------<<
      $topic_templates->parse('output', 'list');
      $retval .= $topic_templates->finish($topic_templates->get_var('output'));
--- 390,393 ----



From dhaun at qs1489.pair.com  Sat Feb 16 11:45:05 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 16:45:05 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.603,1.604
Message-ID: <20080216164505.5897610FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv10288/public_html/docs

Modified Files:
	history 
Log Message:
Only use the multi-byte string functions with UTF-8 (problem reported by Rick78)


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.603
retrieving revision 1.604
diff -C2 -d -r1.603 -r1.604
*** history	2 Feb 2008 15:04:37 -0000	1.603
--- history	16 Feb 2008 16:45:03 -0000	1.604
***************
*** 3,6 ****
--- 3,8 ----
  ??? ??, 2008 (1.5.0)
  ------------
+ - Only use the multi-byte string functions when the current character set is
+   UTF-8 (reported by Rick78) [Dirk]
  - COM_hit() is now called from COM_siteFooter() instead of doing the UPDATE SQL
    directly (reported by Joe Mucchiello) [Dirk]



From dhaun at qs1489.pair.com  Sat Feb 16 11:45:05 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 16:45:05 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-mbyte.php,1.19,1.20
Message-ID: <20080216164505.442EB10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv10288/system

Modified Files:
	lib-mbyte.php 
Log Message:
Only use the multi-byte string functions with UTF-8 (problem reported by Rick78)


Index: lib-mbyte.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-mbyte.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** lib-mbyte.php	15 Jan 2007 07:13:43 -0000	1.19
--- lib-mbyte.php	16 Feb 2008 16:45:03 -0000	1.20
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-mbyte.php                                                             |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-mbyte.php                                                             |
***************
*** 9,13 ****
  // | function collection to handle mutli-byte related issues                   |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Oliver Spiesshofer - oliver AT spiesshofer DOT com               |
--- 9,13 ----
  // | function collection to handle mutli-byte related issues                   |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Oliver Spiesshofer - oliver AT spiesshofer DOT com               |
***************
*** 32,37 ****
  // $Id$
  
! if (strpos ($_SERVER['PHP_SELF'], 'lib-mbyte.php') !== false) {
!     die ('This file can not be used on its own!');
  }
  
--- 32,37 ----
  // $Id$
  
! if (strpos($_SERVER['PHP_SELF'], 'lib-mbyte.php') !== false) {
!     die('This file can not be used on its own!');
  }
  
***************
*** 85,101 ****
  
  // replacement functions for UTF-8 functions
! function MBYTE_checkEnabled() {
      static $mb_enabled;
!     if (function_exists( 'mb_eregi_replace' )) {
!         $mb_enabled = mb_internal_encoding("UTF-8");
!     } else {
          $mb_enabled = false;
      }
      return $mb_enabled;
  }
  
  
! function MBYTE_strlen($str) {
      static $mb_enabled;
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
--- 85,111 ----
  
  // replacement functions for UTF-8 functions
! function MBYTE_checkEnabled()
! {
!     global $LANG_CHARSET;
! 
      static $mb_enabled;
! 
!     if (!isset($mb_enabled)) {
          $mb_enabled = false;
+         if (strcasecmp($LANG_CHARSET, 'utf-8') == 0) {
+             if (function_exists('mb_eregi_replace')) {
+                 $mb_enabled = mb_internal_encoding('UTF-8');
+             }
+         }
      }
+ 
      return $mb_enabled;
  }
  
  
! function MBYTE_strlen($str)
! {
      static $mb_enabled;
+ 
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
***************
*** 106,114 ****
          $result = strlen($str);
      }
      return $result;
  }
  
! function MBYTE_substr($str, $start, $length = NULL) {
      static $mb_enabled;
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
--- 116,127 ----
          $result = strlen($str);
      }
+ 
      return $result;
  }
  
! function MBYTE_substr($str, $start, $length = NULL)
! {
      static $mb_enabled;
+ 
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
***************
*** 129,137 ****
          }
      }
      return $result;
  }
  
! function MBYTE_strpos($hay, $needle, $offset = NULL) {
      static $mb_enabled;
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
--- 142,153 ----
          }
      }
+ 
      return $result;
  }
  
! function MBYTE_strpos($hay, $needle, $offset = NULL)
! {
      static $mb_enabled;
+ 
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
***************
*** 142,150 ****
          $result = strpos($hay, $needle, $offset);
      }
      return $result;
  }
  
! function MBYTE_strtolower($str) {
      static $mb_enabled;
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
--- 158,169 ----
          $result = strpos($hay, $needle, $offset);
      }
+ 
      return $result;
  }
  
! function MBYTE_strtolower($str)
! {
      static $mb_enabled;
+ 
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
***************
*** 155,163 ****
          $result = strtolower($str);
      }
      return $result;
  }
  
! function MBYTE_eregi($pattern, $str, $regs = NULL) {
      static $mb_enabled;
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
--- 174,185 ----
          $result = strtolower($str);
      }
+ 
      return $result;
  }
  
! function MBYTE_eregi($pattern, $str, $regs = NULL)
! {
      static $mb_enabled;
+ 
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
***************
*** 168,176 ****
          $result = eregi($pattern, $str, $regs);
      }
      return $result;
  }
  
! function MBYTE_eregi_replace($pattern, $replace, $str) {
      static $mb_enabled;
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
--- 190,201 ----
          $result = eregi($pattern, $str, $regs);
      }
+ 
      return $result;
  }
  
! function MBYTE_eregi_replace($pattern, $replace, $str)
! {
      static $mb_enabled;
+ 
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
***************
*** 181,190 ****
          $result = eregi_replace($pattern, $replace, $str);
      }
      return $result;
  }
  
  /** those are currently not needed in GL, left here if needed later
! function MBYTE_substr_count($hay, $needle) {
      static $mb_enabled;
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
--- 206,219 ----
          $result = eregi_replace($pattern, $replace, $str);
      }
+ 
      return $result;
  }
  
  /** those are currently not needed in GL, left here if needed later
! 
! function MBYTE_substr_count($hay, $needle)
! {
      static $mb_enabled;
+ 
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
***************
*** 195,203 ****
          $result = substr_count($hay, $needle);
      }
      return $result;
  }
  
! function MBYTE_strtoupper($str) {
      static $mb_enabled;
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
--- 224,235 ----
          $result = substr_count($hay, $needle);
      }
+ 
      return $result;
  }
  
! function MBYTE_strtoupper($str)
! {
      static $mb_enabled;
+ 
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
***************
*** 208,216 ****
          $result = strtoupper($str);
      }
      return $result;
  }
  
! function MBYTE_strrpos($hay, $needle, $offset='') {
      static $mb_enabled;
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
--- 240,251 ----
          $result = strtoupper($str);
      }
+ 
      return $result;
  }
  
! function MBYTE_strrpos($hay, $needle, $offset='')
! {
      static $mb_enabled;
+ 
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
***************
*** 221,229 ****
          $result = strrpos($hay, $needle, $offset);
      }
      return $result;
  }
  
! function MBYTE_mail($to, $subj, $mess, $header = NULL, $param = NULL) {
      static $mb_enabled;
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
--- 256,267 ----
          $result = strrpos($hay, $needle, $offset);
      }
+ 
      return $result;
  }
  
! function MBYTE_mail($to, $subj, $mess, $header = NULL, $param = NULL)
! {
      static $mb_enabled;
+ 
      if (!isset($mb_enabled)) {
          $mb_enabled = MBYTE_checkEnabled();
***************
*** 266,271 ****
  mb_substr_count -- Count the number of substring occurrences
  */
- 
- 
  
  ?>
--- 304,307 ----



From dhaun at qs1489.pair.com  Sat Feb 16 11:57:54 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 16:57:54 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin moderation.php, 1.115,
	1.116
Message-ID: <20080216165754.0FEA510FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv10786/public_html/admin

Modified Files:
	moderation.php 
Log Message:
When the link to the version check is hidden from the Admin's Block, also hide it from the Admin Home (aka Command and Control)


Index: moderation.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/moderation.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** moderation.php	25 Nov 2007 15:09:08 -0000	1.115
--- moderation.php	16 Feb 2008 16:57:51 -0000	1.116
***************
*** 9,13 ****
  // | Geeklog main administration page.                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Geeklog main administration page.                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 155,159 ****
              'url' => $_CONF['site_url'] . '/docs/',
              'lang' => $LANG01[113], 'image' => '/images/icons/docs.'),
!         array('condition' => (SEC_inGroup ('Root')),
              'url' => 'http://www.geeklog.net/versionchecker.php?version=' . VERSION,
              'lang' => $LANG01[107], 'image' => '/images/icons/versioncheck.'),
--- 155,160 ----
              'url' => $_CONF['site_url'] . '/docs/',
              'lang' => $LANG01[113], 'image' => '/images/icons/docs.'),
!         array('condition' => (SEC_inGroup ('Root') &&
!                               ($_CONF['link_versionchecker'] == 1)),
              'url' => 'http://www.geeklog.net/versionchecker.php?version=' . VERSION,
              'lang' => $LANG01[107], 'image' => '/images/icons/versioncheck.'),



From dhaun at qs1489.pair.com  Sat Feb 16 16:22:28 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 21:22:28 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional/trackback
	trackbackcomment.thtml, 1.1, 1.2
Message-ID: <20080216212228.D266610FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/trackback
In directory qs1489.pair.com:/tmp/cvs-serv20132

Modified Files:
	trackbackcomment.thtml 
Log Message:
Fixed HTML error (nested <p> tags)


Index: trackbackcomment.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/trackback/trackbackcomment.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** trackbackcomment.thtml	16 Jan 2005 19:14:29 -0000	1.1
--- trackbackcomment.thtml	16 Feb 2008 21:22:26 -0000	1.2
***************
*** 1,3 ****
! <p>
    {formatted_comment}
! </p>
--- 1,3 ----
! <div>
    {formatted_comment}
! </div>



From dhaun at qs1489.pair.com  Sat Feb 16 16:24:30 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 21:24:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html users.php,1.161,1.162
Message-ID: <20080216212430.BFB7510FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv20255/public_html

Modified Files:
	users.php 
Log Message:
Threw in a few htmlspecialchars() calls


Index: users.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/users.php,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** users.php	20 Jan 2008 10:20:23 -0000	1.161
--- users.php	16 Feb 2008 21:24:28 -0000	1.162
***************
*** 103,107 ****
      }
  
!     $display_name = COM_getDisplayName ($user, $A['username'], $A['fullname']);
  
      $retval .= COM_siteHeader ('menu', $LANG04[1] . ' ' . $display_name);
--- 103,108 ----
      }
  
!     $display_name = htmlspecialchars(COM_getDisplayName($user, $A['username'],
!                                                         $A['fullname']));
  
      $retval .= COM_siteHeader ('menu', $LANG04[1] . ' ' . $display_name);
***************
*** 118,122 ****
                                        'row'     => 'commentrow.thtml',
                                        'strow'   => 'storyrow.thtml'));
!     $user_templates->set_var ( 'xhtml', XHTML );
      $user_templates->set_var ('site_url', $_CONF['site_url']);
      $user_templates->set_var ('start_block_userprofile',
--- 119,123 ----
                                        'row'     => 'commentrow.thtml',
                                        'strow'   => 'storyrow.thtml'));
!     $user_templates->set_var ('xhtml', XHTML);
      $user_templates->set_var ('site_url', $_CONF['site_url']);
      $user_templates->set_var ('start_block_userprofile',
***************
*** 137,140 ****
--- 138,143 ----
          $fullname = $A['fullname'];
      }
+     $username = htmlspecialchars($username);
+     $fullname = htmlspecialchars($fullname);
  
      if ($A['status'] == USER_ACCOUNT_DISABLED) {



From dhaun at qs1489.pair.com  Sat Feb 16 16:24:30 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 21:24:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes search.class.php, 1.63,
	1.64
Message-ID: <20080216212430.CFDB210FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv20255/system/classes

Modified Files:
	search.class.php 
Log Message:
Threw in a few htmlspecialchars() calls


Index: search.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/search.class.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** search.class.php	25 Nov 2007 06:59:56 -0000	1.63
--- search.class.php	16 Feb 2008 21:24:28 -0000	1.64
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | search.php                                                                |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | search.php                                                                |
***************
*** 9,13 ****
  // | Geeklog search class.                                                     |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony AT geeklog DOT net                       |
--- 9,13 ----
  // | Geeklog search class.                                                     |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony AT geeklog DOT net                       |
***************
*** 311,315 ****
                          . $A['sid'] . '&amp;query=' . urlencode($this->_query);
                  }
!                 $author = $this->_displayName ($A['username'], $A['fullname']);
                  if ($A['uid'] == 1) {
                      $profile = $author;
--- 311,316 ----
                          . $A['sid'] . '&amp;query=' . urlencode($this->_query);
                  }
!                 $author = htmlspecialchars($this->_displayName($A['username'],
!                                                                $A['fullname']));
                  if ($A['uid'] == 1) {
                      $profile = $author;
***************
*** 463,467 ****
                      $names[$A['uid']] = COM_getDisplayName ($A['uid']);
                  }
!                 $author = $names[$A['uid']];
                  if ($A['uid'] == 1) {
                      $profile = $author;
--- 464,468 ----
                      $names[$A['uid']] = COM_getDisplayName ($A['uid']);
                  }
!                 $author = htmlspecialchars($names[$A['uid']]);
                  if ($A['uid'] == 1) {
                      $profile = $author;
***************
*** 506,518 ****
          $searchmain->set_var ('num_matches', '');
  
          if ($this->_keyType == 'any') {
!             $searchQuery = str_replace(' ', "</b>' " . $LANG09[57] . " '<b>",$this->_query);
              $searchQuery = "<b>'$searchQuery'</b>";
          } else {
              if ($this->_keyType == 'all') {
!                 $searchQuery = str_replace(' ', "</b>' " . $LANG09[56] . " '<b>",$this->_query);
                  $searchQuery = "<b>'$searchQuery'</b>";
              } else {
!                 $searchQuery = $LANG09[55] . " '<b>$this->_query</b>'";
              }
          }
--- 507,520 ----
          $searchmain->set_var ('num_matches', '');
  
+         $escquery = htmlspecialchars($this->_query);
          if ($this->_keyType == 'any') {
!             $searchQuery = str_replace(' ', "</b>' " . $LANG09[57] . " '<b>", $escquery);
              $searchQuery = "<b>'$searchQuery'</b>";
          } else {
              if ($this->_keyType == 'all') {
!                 $searchQuery = str_replace(' ', "</b>' " . $LANG09[56] . " '<b>", $escquery);
                  $searchQuery = "<b>'$searchQuery'</b>";
              } else {
!                 $searchQuery = $LANG09[55] . " '<b>$escquery</b>'";
              }
          }
***************
*** 940,945 ****
                          $useroptions .= ' selected="selected"';
                      }
!                     $useroptions .= '>' . $this->_displayName ($A['username'],
!                                             $A['fullname']) . '</option>';
                  }
                  $searchform->set_var('author_option_list', $useroptions);
--- 942,946 ----
                          $useroptions .= ' selected="selected"';
                      }
!                     $useroptions .= '>' . htmlspecialchars($this->_displayName($A['username'], $A['fullname'])) . '</option>';
                  }
                  $searchform->set_var('author_option_list', $useroptions);



From dhaun at qs1489.pair.com  Sat Feb 16 17:18:16 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 22:18:16 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-story.php,1.121,1.122
Message-ID: <20080216221816.6768B10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv22147/system

Modified Files:
	lib-story.php 
Log Message:
Minor improvement for my own convenience: When displaying an article with a highlighted search query, make the story title a link again (to the same article without the query)


Index: lib-story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** lib-story.php	5 Jan 2008 16:00:59 -0000	1.121
--- lib-story.php	16 Feb 2008 22:18:14 -0000	1.122
***************
*** 200,204 ****
      $articleUrl = COM_buildUrl($_CONF['site_url'] . '/article.php?story='
                                  . $story->getSid());
-     $article->set_var('story_title_link', $story->DisplayElements('title'));
      $article->set_var('story_title', $story->DisplayElements('title'));
      $article->set_var('lang_permalink', $LANG01[127]);
--- 200,203 ----
***************
*** 207,210 ****
--- 206,223 ----
  
      // n = 'Compact display' for list of stories. p = 'Preview' mode.
+ 
+     if ((($index != 'n') && ($index != 'p')) || !empty($query)) {
+         $article->set_var( 'start_storylink_anchortag', '<a href="'
+                 . $articleUrl . '" class="non-ul">' );
+         $article->set_var( 'end_storylink_anchortag', '</a>' );
+         $article->set_var( 'story_title_link',
+             COM_createLink(
+                     $story->DisplayElements('title'),
+                     $articleUrl,
+                     array('class'=>'non-ul')
+             )
+         );
+     }
+ 
      if(( $index == 'n' ) || ( $index == 'p' ))
      {
***************
*** 310,324 ****
              $article->set_var('read_more_class', 'class="story-read-more-link"');
          }
- 
-         $article->set_var( 'start_storylink_anchortag', '<a href="'
-                 . $articleUrl . '" class="non-ul">' );
-         $article->set_var( 'end_storylink_anchortag', '</a>' );
-         $article->set_var( 'story_title_link',
-             COM_createLink(
-                     $story->DisplayElements('title'),
-                     $articleUrl,
-                     array('class'=>'non-ul')
-             )
-         );
  
          if(( $story->DisplayElements('commentcode') >= 0 ) and ( $show_comments ))
--- 323,326 ----



From dhaun at qs1489.pair.com  Sat Feb 16 17:58:30 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 22:58:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin trackback.php, 1.50,
	1.51
Message-ID: <20080216225830.26FD110FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv23591/public_html/admin

Modified Files:
	trackback.php 
Log Message:
{max_url_length} wasn't set for pingbackform.thtml


Index: trackback.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/trackback.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** trackback.php	29 Dec 2007 23:05:07 -0000	1.50
--- trackback.php	16 Feb 2008 22:58:28 -0000	1.51
***************
*** 9,13 ****
  // | Admin functions handle Trackback, Pingback, and Ping                      |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2005-2007 by the following authors:                         |
  // |                                                                           |
  // | Author: Dirk Haun - dirk AT haun-online DOT de                            |
--- 9,13 ----
  // | Admin functions handle Trackback, Pingback, and Ping                      |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2005-2008 by the following authors:                         |
  // |                                                                           |
  // | Author: Dirk Haun - dirk AT haun-online DOT de                            |
***************
*** 293,297 ****
      $template = new Template ($_CONF['path_layout'] . 'admin/trackback');
      $template->set_file (array ('list' => 'pingbackform.thtml'));
!     $template->set_var ( 'xhtml', XHTML );
      $template->set_var ('site_url', $_CONF['site_url']);
      $template->set_var ('site_admin_url', $_CONF['site_admin_url']);
--- 293,297 ----
      $template = new Template ($_CONF['path_layout'] . 'admin/trackback');
      $template->set_file (array ('list' => 'pingbackform.thtml'));
!     $template->set_var ('xhtml', XHTML);
      $template->set_var ('site_url', $_CONF['site_url']);
      $template->set_var ('site_admin_url', $_CONF['site_admin_url']);
***************
*** 302,305 ****
--- 302,306 ----
      $template->set_var ('lang_site_url', $LANG_TRB['site_url']);
      $template->set_var ('lang_send', $LANG_TRB['button_send']);
+     $template->set_var ('max_url_length', 255);
  
      $template->set_var ('target_url', $targetUrl);



From dhaun at qs1489.pair.com  Sat Feb 16 18:00:37 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 23:00:37 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin block.php,1.116,1.117
Message-ID: <20080216230037.5C75710FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv23716/public_html/admin

Modified Files:
	block.php 
Log Message:
Removed another dengen comment ...


Index: block.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/block.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** block.php	25 Nov 2007 06:58:55 -0000	1.116
--- block.php	16 Feb 2008 23:00:35 -0000	1.117
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | block.php                                                                 |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | block.php                                                                 |
***************
*** 9,13 ****
  // | Geeklog block administration.                                             |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Geeklog block administration.                                             |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 164,168 ****
      $block_templates->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
      $block_templates->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
!     $block_templates->set_var('max_url_length', 255); // @@@@ added by dengen 2007/09/08
      $block_templates->parse('output','editor');
      $retval .= $block_templates->finish($block_templates->get_var('output'));
--- 164,168 ----
      $block_templates->set_var('permissions_editor', SEC_getPermissionsHTML($A['perm_owner'],$A['perm_group'],$A['perm_members'],$A['perm_anon']));
      $block_templates->set_var('permissions_msg', $LANG_ACCESS['permmsg']);
!     $block_templates->set_var('max_url_length', 255);
      $block_templates->parse('output','editor');
      $retval .= $block_templates->finish($block_templates->get_var('output'));



From dhaun at qs1489.pair.com  Sat Feb 16 18:07:27 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 23:07:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin trackback.php, 1.43.2.1,
	1.43.2.2
Message-ID: <20080216230727.1888F10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv23886/public_html/admin

Modified Files:
      Tag: geeklog_1_4_1_1
	trackback.php 
Log Message:
{max_url_length} wasn't set for pingbackform.thtml


Index: trackback.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/trackback.php,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -C2 -d -r1.43.2.1 -r1.43.2.2
*** trackback.php	11 Feb 2007 09:36:03 -0000	1.43.2.1
--- trackback.php	16 Feb 2008 23:07:24 -0000	1.43.2.2
***************
*** 298,301 ****
--- 298,302 ----
      $template->set_var ('lang_site_url', $LANG_TRB['site_url']);
      $template->set_var ('lang_send', $LANG_TRB['button_send']);
+     $template->set_var ('max_url_length', 255);
  
      $template->set_var ('target_url', $targetUrl);



From dhaun at qs1489.pair.com  Sat Feb 16 18:07:27 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 16 Feb 2008 23:07:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history, 1.535.2.28,
	1.535.2.29
Message-ID: <20080216230727.2DF3C10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv23886/public_html/docs

Modified Files:
      Tag: geeklog_1_4_1_1
	history 
Log Message:
{max_url_length} wasn't set for pingbackform.thtml


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.535.2.28
retrieving revision 1.535.2.29
diff -C2 -d -r1.535.2.28 -r1.535.2.29
*** history	11 Feb 2008 08:37:42 -0000	1.535.2.28
--- history	16 Feb 2008 23:07:25 -0000	1.535.2.29
***************
*** 4,7 ****
--- 4,8 ----
  ------------
  
+ - Set variable {max_url_length} in pingbackform.thtml [Dirk]
  - Fixed multiple application of htmlspecialchars() in the story preview [Dirk]
  - Set variable {max_url_length} for the default block editor (used in the



From dhaun at qs1489.pair.com  Sun Feb 17 03:31:38 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 08:31:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.24,
	1.25
Message-ID: <20080217083138.7395810FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv43693/system/classes

Modified Files:
	config.class.php 
Log Message:
Provide the standard set of template variables


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** config.class.php	10 Feb 2008 17:09:37 -0000	1.24
--- config.class.php	17 Feb 2008 08:31:36 -0000	1.25
***************
*** 401,405 ****
          }
          $t = new Template($_CONF['path_layout'] . 'admin/config');
!         $t->set_file(array('main' => 'configuration.thtml','menugroup' => 'menu_element.thtml'));
  
          $t->set_var('lang_save_changes', $LANG_CONFIG['save_changes']);
--- 401,411 ----
          }
          $t = new Template($_CONF['path_layout'] . 'admin/config');
!         $t->set_file(array('main' => 'configuration.thtml',
!                            'menugroup' => 'menu_element.thtml'));
! 
!         $t->set_var('site_url', $_CONF['site_url']);
!         $t->set_var('site_admin_url', $_CONF['site_admin_url']);
!         $t->set_var('layout_url', $_CONF['layout_url']);
!         $t->set_var('xhtml', XHTML);
  
          $t->set_var('lang_save_changes', $LANG_CONFIG['save_changes']);
***************
*** 407,412 ****
          $t->set_var('lang_changes_made', $LANG_CONFIG['changes_made']);
  
-         $t->set_var('xhtml', XHTML);
-         $t->set_var('site_url', $_CONF['site_url']);
          $t->set_var('open_group', $grp);
  
--- 413,416 ----
***************
*** 547,554 ****
          }
  
          $t->set_var('lang_restore', $LANG_CONFIG['restore']);
          $t->set_var('lang_add_element', $LANG_CONFIG['add_element']);
  
-         $t->set_var('xhtml', XHTML);
          $t->set_var('name', $name);
          $t->set_var('display_name', $display_name);
--- 551,562 ----
          }
  
+         $t->set_var('site_url', $_CONF['site_url']);
+         $t->set_var('site_admin_url', $_CONF['site_admin_url']);
+         $t->set_var('layout_url', $_CONF['layout_url']);
+         $t->set_var('xhtml', XHTML);
+ 
          $t->set_var('lang_restore', $LANG_CONFIG['restore']);
          $t->set_var('lang_add_element', $LANG_CONFIG['add_element']);
  
          $t->set_var('name', $name);
          $t->set_var('display_name', $display_name);



From dhaun at qs1489.pair.com  Sun Feb 17 03:40:33 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 08:40:33 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional
	blockfooter-config.thtml, NONE, 1.1 blockheader-config.thtml,
	NONE, 1.1 functions.php, 1.11, 1.12 blockfooter-notitle.thtml,
	1.2, NONE blockheader-notitle.thtml, 1.1, NONE
Message-ID: <20080217084033.1BEAD10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional
In directory qs1489.pair.com:/tmp/cvs-serv44254

Modified Files:
	functions.php 
Added Files:
	blockfooter-config.thtml blockheader-config.thtml 
Removed Files:
	blockfooter-notitle.thtml blockheader-notitle.thtml 
Log Message:
Let's have block titles in the Configuration again


Index: functions.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/functions.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** functions.php	9 Feb 2008 12:00:59 -0000	1.11
--- functions.php	17 Feb 2008 08:40:31 -0000	1.12
***************
*** 24,29 ****
  
  $_BLOCK_TEMPLATE['_msg_block'] = 'blockheader-message.thtml,blockfooter-message.thtml';
! $_BLOCK_TEMPLATE['configmanager_block'] = 'blockheader-notitle.thtml,blockfooter-notitle.thtml';
! $_BLOCK_TEMPLATE['configmanager_subblock'] = 'blockheader-notitle.thtml,blockfooter-notitle.thtml';
  $_BLOCK_TEMPLATE['whats_related_block'] = 'blockheader-related.thtml,blockfooter-related.thtml';
  $_BLOCK_TEMPLATE['story_options_block'] = 'blockheader-related.thtml,blockfooter-related.thtml';
--- 24,29 ----
  
  $_BLOCK_TEMPLATE['_msg_block'] = 'blockheader-message.thtml,blockfooter-message.thtml';
! $_BLOCK_TEMPLATE['configmanager_block'] = 'blockheader-config.thtml,blockfooter-config.thtml';
! $_BLOCK_TEMPLATE['configmanager_subblock'] = 'blockheader-config.thtml,blockfooter-config.thtml';
  $_BLOCK_TEMPLATE['whats_related_block'] = 'blockheader-related.thtml,blockfooter-related.thtml';
  $_BLOCK_TEMPLATE['story_options_block'] = 'blockheader-related.thtml,blockfooter-related.thtml';

--- NEW FILE: blockfooter-config.thtml ---
</div>
<div class="aligncenter">
    <div class="block-divider"></div>
</div>
<div class="block-bg-spreader"></div>

--- blockheader-notitle.thtml DELETED ---

--- blockfooter-notitle.thtml DELETED ---

--- NEW FILE: blockheader-config.thtml ---
<div class="block-box" id="{blockid}">
    <span class="block-helpicon">
        {block_help}
    </span>
    <h2>{block_title}</h2>


From dhaun at qs1489.pair.com  Sun Feb 17 03:50:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 08:50:19 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/images/droplinemenu
	menu_active.png, 1.1, NONE menu_normal.png, 1.1,
	NONE menu_over.png, 1.1, NONE sublevel_divider.png, 1.1, NONE
Message-ID: <20080217085019.557FC10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/images/droplinemenu
In directory qs1489.pair.com:/tmp/cvs-serv44645/public_html/layout/professional/images/droplinemenu

Removed Files:
	menu_active.png menu_normal.png menu_over.png 
	sublevel_divider.png 
Log Message:
Removed dropline menu CSS and images


--- sublevel_divider.png DELETED ---

--- menu_over.png DELETED ---

--- menu_active.png DELETED ---

--- menu_normal.png DELETED ---



From dhaun at qs1489.pair.com  Sun Feb 17 03:50:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 08:50:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional
	droplinemenu.css, 1.2, NONE
Message-ID: <20080217085019.4404710FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional
In directory qs1489.pair.com:/tmp/cvs-serv44645/public_html/layout/professional

Removed Files:
	droplinemenu.css 
Log Message:
Removed dropline menu CSS and images


--- droplinemenu.css DELETED ---



From dhaun at qs1489.pair.com  Sun Feb 17 03:50:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 08:50:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.25,
	1.26
Message-ID: <20080217085019.62D0210FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv44645/system/classes

Modified Files:
	config.class.php 
Log Message:
Removed dropline menu CSS and images


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** config.class.php	17 Feb 2008 08:31:36 -0000	1.25
--- config.class.php	17 Feb 2008 08:50:17 -0000	1.26
***************
*** 475,481 ****
          }
  
!         // Output the result and add the required CSS for the dropline menu
!         $cssfile = '<link rel="stylesheet" type="text/css" href="'.$_CONF['layout_url'] .'/droplinemenu.css" ' . XHTML .'>' . LB;
!         $display  = COM_siteHeader('none','Configuration Manager',$cssfile);
          $t->set_var('config_menu',$this->_UI_configmanager_menu($grp,$sg));
          if ($change_result != null AND $change_result !== array()) {
--- 475,479 ----
          }
  
!         $display  = COM_siteHeader('none', 'Configuration Manager');
          $t->set_var('config_menu',$this->_UI_configmanager_menu($grp,$sg));
          if ($change_result != null AND $change_result !== array()) {



From dhaun at qs1489.pair.com  Sun Feb 17 03:50:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 08:50:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional
	droplinemenu.css, 1.2, NONE
Message-ID: <20080217085019.4404710FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional
In directory qs1489.pair.com:/tmp/cvs-serv44645/public_html/layout/professional

Removed Files:
	droplinemenu.css 
Log Message:
Removed dropline menu CSS and images


--- droplinemenu.css DELETED ---



From dhaun at qs1489.pair.com  Sun Feb 17 03:52:42 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 08:52:42 +0000
Subject: [geeklog-cvs] Geeklog-1.x/language english.php, 1.329,
	1.330 english_utf-8.php, 1.113, 1.114
Message-ID: <20080217085242.A37CA10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/language
In directory qs1489.pair.com:/tmp/cvs-serv44723/language

Modified Files:
	english.php english_utf-8.php 
Log Message:
Moved hard-coded page title to the language file


Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english.php,v
retrieving revision 1.329
retrieving revision 1.330
diff -C2 -d -r1.329 -r1.330
*** english.php	15 Feb 2008 19:15:48 -0000	1.329
--- english.php	17 Feb 2008 08:52:40 -0000	1.330
***************
*** 1569,1573 ****
      'save_changes'  => 'Save Changes',
      'reset_form'    => 'Reset Form',
!     'changes_made'  => 'Changes were successfully made to'
  );
  
--- 1569,1574 ----
      'save_changes'  => 'Save Changes',
      'reset_form'    => 'Reset Form',
!     'changes_made'  => 'Changes were successfully made to',
!     'title'         => 'Configuration Manager'
  );
  

Index: english_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english_utf-8.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** english_utf-8.php	15 Feb 2008 19:15:48 -0000	1.113
--- english_utf-8.php	17 Feb 2008 08:52:40 -0000	1.114
***************
*** 1569,1573 ****
      'save_changes'  => 'Save Changes',
      'reset_form'    => 'Reset Form',
!     'changes_made'  => 'Changes were successfully made to'
  );
  
--- 1569,1574 ----
      'save_changes'  => 'Save Changes',
      'reset_form'    => 'Reset Form',
!     'changes_made'  => 'Changes were successfully made to',
!     'title'         => 'Configuration Manager'
  );
  



From dhaun at qs1489.pair.com  Sun Feb 17 03:52:42 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 08:52:42 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.26,
	1.27
Message-ID: <20080217085242.B107E10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv44723/system/classes

Modified Files:
	config.class.php 
Log Message:
Moved hard-coded page title to the language file


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** config.class.php	17 Feb 2008 08:50:17 -0000	1.26
--- config.class.php	17 Feb 2008 08:52:40 -0000	1.27
***************
*** 475,479 ****
          }
  
!         $display  = COM_siteHeader('none', 'Configuration Manager');
          $t->set_var('config_menu',$this->_UI_configmanager_menu($grp,$sg));
          if ($change_result != null AND $change_result !== array()) {
--- 475,479 ----
          }
  
!         $display  = COM_siteHeader('none', $LANG_CONF['title']);
          $t->set_var('config_menu',$this->_UI_configmanager_menu($grp,$sg));
          if ($change_result != null AND $change_result !== array()) {



From dhaun at qs1489.pair.com  Sun Feb 17 03:52:42 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 08:52:42 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.26,
	1.27
Message-ID: <20080217085242.B107E10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv44723/system/classes

Modified Files:
	config.class.php 
Log Message:
Moved hard-coded page title to the language file


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** config.class.php	17 Feb 2008 08:50:17 -0000	1.26
--- config.class.php	17 Feb 2008 08:52:40 -0000	1.27
***************
*** 475,479 ****
          }
  
!         $display  = COM_siteHeader('none', 'Configuration Manager');
          $t->set_var('config_menu',$this->_UI_configmanager_menu($grp,$sg));
          if ($change_result != null AND $change_result !== array()) {
--- 475,479 ----
          }
  
!         $display  = COM_siteHeader('none', $LANG_CONF['title']);
          $t->set_var('config_menu',$this->_UI_configmanager_menu($grp,$sg));
          if ($change_result != null AND $change_result !== array()) {



From dhaun at qs1489.pair.com  Sun Feb 17 03:54:35 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 08:54:35 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.27,
	1.28
Message-ID: <20080217085435.8EA2810FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv44847/system/classes

Modified Files:
	config.class.php 
Log Message:
Typo: $LANG_CONF -> $LANG_CONFIG


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** config.class.php	17 Feb 2008 08:52:40 -0000	1.27
--- config.class.php	17 Feb 2008 08:54:33 -0000	1.28
***************
*** 475,479 ****
          }
  
!         $display  = COM_siteHeader('none', $LANG_CONF['title']);
          $t->set_var('config_menu',$this->_UI_configmanager_menu($grp,$sg));
          if ($change_result != null AND $change_result !== array()) {
--- 475,479 ----
          }
  
!         $display  = COM_siteHeader('none', $LANG_CONFIG['title']);
          $t->set_var('config_menu',$this->_UI_configmanager_menu($grp,$sg));
          if ($change_result != null AND $change_result !== array()) {



From dhaun at qs1489.pair.com  Sun Feb 17 05:29:38 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 10:29:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin moderation.php, 1.116,
	1.117
Message-ID: <20080217102938.86E1A10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv48196/public_html/admin

Modified Files:
	moderation.php 
Log Message:
Quick'n'dirty workaround: Limit submission queue listings to 50 entries at a time to prevent timeouts (in case of submission queues full of spam). For a proper solution, we would need to use ADMIN_list instead of ADMIN_simpleList.


Index: moderation.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/moderation.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** moderation.php	16 Feb 2008 16:57:51 -0000	1.116
--- moderation.php	17 Feb 2008 10:29:36 -0000	1.117
***************
*** 269,272 ****
--- 269,273 ----
      // run SQL but this time ignore any errors
      if (!empty ($sql)) {
+         $sql .= ' LIMIT 50'; // quick'n'dirty workaround to prevent timeouts
          $result = DB_query($sql, 1);
      }



From dhaun at qs1489.pair.com  Sun Feb 17 10:02:38 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 15:02:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-syndication.php,1.39,1.40
Message-ID: <20080217150238.1B9BA10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv57500/system

Modified Files:
	lib-syndication.php 
Log Message:
Added an Atom self-link to RSS feeds (patch by Mike)


Index: lib-syndication.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-syndication.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** lib-syndication.php	2 Sep 2007 07:50:56 -0000	1.39
--- lib-syndication.php	17 Feb 2008 15:02:36 -0000	1.40
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-syndication.php                                                       |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-syndication.php                                                       |
***************
*** 9,13 ****
  // | Geeklog syndication library.                                              |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2003-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Dirk Haun        - dirk AT haun-online DOT de                    |
--- 9,13 ----
  // | Geeklog syndication library.                                              |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2003-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Dirk Haun        - dirk AT haun-online DOT de                    |
***************
*** 436,440 ****
          $format = explode( '-', $A['format'] );
          $feed = $factory->writer( $format[0], $format[1] );
! 
          if( $feed )
          {
--- 436,440 ----
          $format = explode( '-', $A['format'] );
          $feed = $factory->writer( $format[0], $format[1] );
!         
          if( $feed )
          {
***************
*** 519,524 ****
                  }
              }
!             $feed->extensions = PLG_getFeedExtensionTags($A['type'], $format[0], $format[1], $A['topic'], $fid);
!             $feed->articles = $content;
  
              if( !empty( $A['filename'] ))
--- 519,531 ----
                  }
              }
! 
!             /* Inject the namespace for Atom into RSS feeds. Illogical?
!              * Well apparantly not:
!              * http://feedvalidator.org/docs/warning/MissingAtomSelfLink.html
!              */
!             if( $format[0] == 'RSS' )
!             {
!                 $feed->namespaces[] = 'xmlns:atom="http://www.w3.org/2005/Atom"';
!             }
  
              if( !empty( $A['filename'] ))
***************
*** 532,535 ****
--- 539,555 ----
              }
              $feed->url = SYND_getFeedUrl( $filename );
+             
+             $feed->extensions = PLG_getFeedExtensionTags($A['type'], $format[0], $format[1], $A['topic'], $fid, $feed);
+ 
+             /* Inject the self reference for Atom into RSS feeds. Illogical?
+              * Well apparantly not:
+              * http://feedvalidator.org/docs/warning/MissingAtomSelfLink.html
+              */
+             if( $format[0] == 'RSS' )
+             {
+                 $feed->extensions[] = '<atom:link href="' . $feed->url .'" rel="self" type="application/rss+xml" />';
+             }
+             $feed->articles = $content;
+ 
              $feed->createFeed( SYND_getFeedPath( $filename ));
          }



From dhaun at qs1489.pair.com  Sun Feb 17 10:02:38 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 15:02:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.604,1.605
Message-ID: <20080217150238.0C6EC10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv57500/public_html/docs

Modified Files:
	history 
Log Message:
Added an Atom self-link to RSS feeds (patch by Mike)


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.604
retrieving revision 1.605
diff -C2 -d -r1.604 -r1.605
*** history	16 Feb 2008 16:45:03 -0000	1.604
--- history	17 Feb 2008 15:02:35 -0000	1.605
***************
*** 3,6 ****
--- 3,10 ----
  ??? ??, 2008 (1.5.0)
  ------------
+ - Added an Atom self-link to RSS feeds. Sounds odd, but it is recommended by
+   <http://feedvalidator.org/docs/warning/MissingAtomSelfLink.html> [Mike]
+ - Improved support for podcasts in portal blocks and fixed an error where REALLY
+   long syndication feeds could blow portal blocks up. [Mike]
  - Only use the multi-byte string functions when the current character set is
    UTF-8 (reported by Rick78) [Dirk]



From dhaun at qs1489.pair.com  Sun Feb 17 10:02:38 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 15:02:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.604,1.605
Message-ID: <20080217150238.0C6EC10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv57500/public_html/docs

Modified Files:
	history 
Log Message:
Added an Atom self-link to RSS feeds (patch by Mike)


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.604
retrieving revision 1.605
diff -C2 -d -r1.604 -r1.605
*** history	16 Feb 2008 16:45:03 -0000	1.604
--- history	17 Feb 2008 15:02:35 -0000	1.605
***************
*** 3,6 ****
--- 3,10 ----
  ??? ??, 2008 (1.5.0)
  ------------
+ - Added an Atom self-link to RSS feeds. Sounds odd, but it is recommended by
+   <http://feedvalidator.org/docs/warning/MissingAtomSelfLink.html> [Mike]
+ - Improved support for podcasts in portal blocks and fixed an error where REALLY
+   long syndication feeds could blow portal blocks up. [Mike]
  - Only use the multi-byte string functions when the current character set is
    UTF-8 (reported by Rick78) [Dirk]



From dhaun at qs1489.pair.com  Sun Feb 17 13:31:59 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 18:31:59 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-security.php,1.60,1.61
Message-ID: <20080217183159.13CA110FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv64895/system

Modified Files:
	lib-security.php 
Log Message:
SEC_authenticate should always return - caller will have to handle errors etc.


Index: lib-security.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** lib-security.php	9 Dec 2007 18:05:39 -0000	1.60
--- lib-security.php	17 Feb 2008 18:31:56 -0000	1.61
***************
*** 9,13 ****
  // | Geeklog security library.                                                 |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
--- 9,13 ----
  // | Geeklog security library.                                                 |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
***************
*** 689,723 ****
  function SEC_authenticate($username, $password, &$uid)
  {
!     global $_TABLES, $LANG01, $_CONF;
  
!     $result = DB_query( "SELECT status, passwd, email, uid FROM {$_TABLES['users']} WHERE username='$username' AND ((remoteservice is null) or (remoteservice = ''))" );
      $tmp = DB_error();
!     $nrows = DB_numRows( $result );
  
!     if(( $tmp == 0 ) && ( $nrows == 1 ))
!     {
!         $U = DB_fetchArray( $result );
          $uid = $U['uid'];
!         if ($U['status'] == USER_ACCOUNT_DISABLED)
!         {
!             return USER_ACCOUNT_DISABLED; // banned, jump to here to save an md5 calc.
!         } elseif ($U['passwd'] != SEC_encryptPassword( $password )) {
              return -1; // failed login
          } elseif ($U['status'] == USER_ACCOUNT_AWAITING_APPROVAL) {
!             //awaiting approval, jump to msg.
!             echo COM_refresh($_CONF['site_url'] . '/users.php?msg=70');
!             exit;
          } elseif ($U['status'] == USER_ACCOUNT_AWAITING_ACTIVATION) {
              // Awaiting user activation, activate:
!             DB_change($_TABLES['users'],'status',USER_ACCOUNT_ACTIVE,'username',$username);
              return USER_ACCOUNT_ACTIVE;
          } else {
              return $U['status']; // just return their status
          }
!     }
!     else
!     {
          $tmp = $LANG01[32] . ": '" . $username . "'";
!         COM_errorLog( $tmp, 1 );
          return -1;
      }
--- 689,719 ----
  function SEC_authenticate($username, $password, &$uid)
  {
!     global $_CONF, $_TABLES, $LANG01;
  
!     $result = DB_query("SELECT status, passwd, email, uid FROM {$_TABLES['users']} WHERE username='$username' AND ((remoteservice is null) or (remoteservice = ''))");
      $tmp = DB_error();
!     $nrows = DB_numRows($result);
  
!     if (($tmp == 0) && ($nrows == 1)) {
!         $U = DB_fetchArray($result);
          $uid = $U['uid'];
!         if ($U['status'] == USER_ACCOUNT_DISABLED) {
!             // banned, jump to here to save an md5 calc.
!             return USER_ACCOUNT_DISABLED;
!         } elseif ($U['passwd'] != SEC_encryptPassword($password)) {
              return -1; // failed login
          } elseif ($U['status'] == USER_ACCOUNT_AWAITING_APPROVAL) {
!             return USER_ACCOUNT_AWAITING_APPROVAL;
          } elseif ($U['status'] == USER_ACCOUNT_AWAITING_ACTIVATION) {
              // Awaiting user activation, activate:
!             DB_change($_TABLES['users'], 'status', USER_ACCOUNT_ACTIVE,
!                       'username', $username);
              return USER_ACCOUNT_ACTIVE;
          } else {
              return $U['status']; // just return their status
          }
!     } else {
          $tmp = $LANG01[32] . ": '" . $username . "'";
!         COM_errorLog($tmp, 1);
          return -1;
      }



From dhaun at qs1489.pair.com  Sun Feb 17 13:32:37 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 17 Feb 2008 18:32:37 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin auth.inc.php, 1.35, 1.36
Message-ID: <20080217183237.8EF4C10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv64965/public_html/admin

Modified Files:
	auth.inc.php 
Log Message:
Use USER_ACCOUNT_ACTIVE constant


Index: auth.inc.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/auth.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** auth.inc.php	25 Nov 2007 06:58:55 -0000	1.35
--- auth.inc.php	17 Feb 2008 18:32:35 -0000	1.36
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | auth.inc.php                                                              |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | auth.inc.php                                                              |
***************
*** 9,13 ****
  // | Geeklog admin authentication module                                       |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Geeklog admin authentication module                                       |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 50,54 ****
  $display = '';
  
! if ($status == 3) {
      DB_change($_TABLES['users'],'pwrequestid',"NULL",'uid',$uid);
      $_USER = SESS_getUserDataFromId ($uid);
--- 50,54 ----
  $display = '';
  
! if ($status == USER_ACCOUNT_ACTIVE) {
      DB_change($_TABLES['users'],'pwrequestid',"NULL",'uid',$uid);
      $_USER = SESS_getUserDataFromId ($uid);



From mjervis at qs1489.pair.com  Mon Feb 18 14:42:14 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Mon, 18 Feb 2008 19:42:14 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.605,1.606
Message-ID: <20080218194215.01A8A10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv21576/public_html/docs

Modified Files:
	history 
Log Message:
Support for [raw][/raw] in HTML stories for painless HTML managing.

Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.605
retrieving revision 1.606
diff -C2 -d -r1.605 -r1.606
*** history	17 Feb 2008 15:02:35 -0000	1.605
--- history	18 Feb 2008 19:42:12 -0000	1.606
***************
*** 3,6 ****
--- 3,8 ----
  ??? ??, 2008 (1.5.0)
  ------------
+ - Support for [raw][/raw] tag in HTML post mode. All the benefits of code and
+   pre, with none of the ugly styling. [Mike]
  - Added an Atom self-link to RSS feeds. Sounds odd, but it is recommended by
    <http://feedvalidator.org/docs/warning/MissingAtomSelfLink.html> [Mike]



From mjervis at qs1489.pair.com  Mon Feb 18 14:42:15 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Mon, 18 Feb 2008 19:42:15 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.676,1.677
Message-ID: <20080218194215.2B25310FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv21576/public_html

Modified Files:
	lib-common.php 
Log Message:
Support for [raw][/raw] in HTML stories for painless HTML managing.

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.676
retrieving revision 1.677
diff -C2 -d -r1.676 -r1.677
*** lib-common.php	15 Feb 2008 19:10:28 -0000	1.676
--- lib-common.php	18 Feb 2008 19:42:12 -0000	1.677
***************
*** 2944,2948 ****
      }
      while( $start_pos !== false );
! 
  
      if( isset( $_CONF['skip_html_filter_for_root'] ) &&
--- 2944,2980 ----
      }
      while( $start_pos !== false );
!     
!     // handle [raw] ... [/raw]
!     do
!     {
!         $start_pos = MBYTE_strpos( MBYTE_strtolower( $str ), '[raw]' );
!         if( $start_pos !== false )
!         {
!             $end_pos = MBYTE_strpos( MBYTE_strtolower( $str ), '[/raw]' );
!             if( $end_pos !== false )
!             {
!                 $encoded = COM_handleCode( MBYTE_substr( $str, $start_pos + 6,
!                         $end_pos - ( $start_pos + 6 )));
!                 // [raw2] to avoid infinite loop. Not HTML comment as we strip
!                 // them later.
!                 $encoded = '[raw2]' . $encoded . '[/raw2]';
!                 $str = MBYTE_substr( $str, 0, $start_pos ) . $encoded
!                      . MBYTE_substr( $str, $end_pos + 7 );
!             }
!             else // missing [/raw]
!             {
!                 // Treat the rest of the text as raw (so as not to lose any
!                 // special characters). However, the calling entity should
!                 // better be checking for missing [/raw] before calling this
!                 // function ...
!                 $encoded = COM_handleCode( MBYTE_substr( $str, $start_pos + 6 ));
!                 // [raw2] to avoid infinite loop. Not HTML comment as we strip
!                 // them later.
!                 $encoded = '[raw2]' . $encoded . '[/raw2]';
!                 $str = MBYTE_substr( $str, 0, $start_pos ) . $encoded;
!             }
!         }
!     }
!     while( $start_pos !== false );
  
      if( isset( $_CONF['skip_html_filter_for_root'] ) &&
***************
*** 2981,2985 ****
          $filter->AddHTML( $tag, $attr );
      }
!     return $filter->Parse( $str );
  }
  
--- 3013,3023 ----
          $filter->AddHTML( $tag, $attr );
      }
!     /* Replace [raw][/raw] with <!--raw--><!--/raw-->, note done "late" because
!      * of the above noted // strip_tags() gets confused by HTML comments ...
!      */
!     $str = $filter->Parse( $str );
!     $str = str_replace('[raw2]','<!--raw--><span class="raw">', $str);
!     $str = str_replace('[/raw2]','</span><!--/raw-->', $str);
!     return $str;
  }
  
***************
*** 3689,3693 ****
          $content = COM_makeList($articles, 'list-feed');
          $content = preg_replace("/(\015\012)|(\015)|(\012)/", '', $content);
!        
          if (strlen($content) > 65000) {
              $content = $LANG21[68];
--- 3727,3731 ----
          $content = COM_makeList($articles, 'list-feed');
          $content = preg_replace("/(\015\012)|(\015)|(\012)/", '', $content);
! 
          if (strlen($content) > 65000) {
              $content = $LANG21[68];



From mjervis at qs1489.pair.com  Mon Feb 18 14:42:15 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Mon, 18 Feb 2008 19:42:15 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.20, 1.21
Message-ID: <20080218194215.3F79710FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv21576/system/classes

Modified Files:
	story.class.php 
Log Message:
Support for [raw][/raw] in HTML stories for painless HTML managing.

Index: story.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** story.class.php	3 Jan 2008 18:55:45 -0000	1.20
--- story.class.php	18 Feb 2008 19:42:13 -0000	1.21
***************
*** 1519,1522 ****
--- 1519,1524 ----
              $out = str_replace('<pre><code>', '[code]', $out);
              $out = str_replace('</code></pre>', '[/code]', $out);
+             $out = str_replace('<!--raw--><span class="raw">', '[raw]', $out);
+             $out = str_replace('</span><!--/raw-->', '[/raw]', $out);
              $out = $this->_editUnescape($out);
              $out = $this->_displayEscape(htmlspecialchars($out));



From mjervis at qs1489.pair.com  Tue Feb 19 01:49:04 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Tue, 19 Feb 2008 06:49:04 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes/syndication
	atom.feed.class.php, 1.12, 1.13 feedparserbase.class.php, 1.6,
	1.7 rdf.feed.class.php, 1.7, 1.8 rss.feed.class.php, 1.13, 1.14
Message-ID: <20080219064904.DD40110FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes/syndication
In directory qs1489.pair.com:/tmp/cvs-serv45377/system/classes/syndication

Modified Files:
	atom.feed.class.php feedparserbase.class.php 
	rdf.feed.class.php rss.feed.class.php 
Log Message:
Ensure that namespaces and tags injected into feeds remain unique. Ensure implementation of tag injection is consistent over all feed classes.

Index: rss.feed.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/syndication/rss.feed.class.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** rss.feed.class.php	15 Feb 2008 19:10:28 -0000	1.13
--- rss.feed.class.php	19 Feb 2008 06:49:02 -0000	1.14
***************
*** 125,132 ****
          $xml .= "</image>\n";
        }
!       foreach( $this->extensions as $extendingTag )
!       {
!         $xml .= $extendingTag."\n";
!       }
        return $xml;
      }
--- 125,129 ----
          $xml .= "</image>\n";
        }
!       $xml .= $this->_injectExtendingTags();
        return $xml;
      }
***************
*** 392,399 ****
          $xml .= "</image>\n";
        }
!       foreach( $this->extensions as $extendingTag )
!       {
!         $xml .= $extendingTag."\n";
!       }
        return $xml;
      }
--- 389,393 ----
          $xml .= "</image>\n";
        }
!       $xml .= $this->_injectExtendingTags();
        return $xml;
      }

Index: atom.feed.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/syndication/atom.feed.class.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** atom.feed.class.php	13 Jun 2007 06:22:48 -0000	1.12
--- atom.feed.class.php	19 Feb 2008 06:49:02 -0000	1.13
***************
*** 133,143 ****
             . "<author>\n<name>" . $this->_safeXML( $this->title ) . '</name>' . LB
             . '<email>' . $this->_safeXML( $this->sitecontact ) . "</email>\n</author>\n";
!       if( is_array( $this->extensions ) )
!       {
!         foreach( $this->extensions as $extendingTag )
!         {
!             $xml .= "$extendingTag\n";
!         }
!       }
        return $xml;
      }
--- 133,137 ----
             . "<author>\n<name>" . $this->_safeXML( $this->title ) . '</name>' . LB
             . '<email>' . $this->_safeXML( $this->sitecontact ) . "</email>\n</author>\n";
!       $xml .= $this->_injectExtendingTags();
        return $xml;
      }
***************
*** 353,363 ****
             . "<author>\n<name>" . $this->_safeXML( $this->title ) . '</name>' . LB
             . '<email>' . $this->_safeXML( $this->sitecontact ) . "</email>\n</author>\n";
!       if( is_array( $this->extensions ) )
!       {
!         foreach( $this->extensions as $extendingTag )
!         {
!             $xml .= "$extendingTag\n";
!         }
!       }
        return $xml;
      }
--- 347,351 ----
             . "<author>\n<name>" . $this->_safeXML( $this->title ) . '</name>' . LB
             . '<email>' . $this->_safeXML( $this->sitecontact ) . "</email>\n</author>\n";
!       $xml .= $this->_injectExtendingTags();
        return $xml;
      }

Index: feedparserbase.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/syndication/feedparserbase.class.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** feedparserbase.class.php	19 Nov 2005 03:59:17 -0000	1.6
--- feedparserbase.class.php	19 Feb 2008 06:49:02 -0000	1.7
***************
*** 238,244 ****
  
        $xml .= "<title>{$this->title}</title>\n";
!       foreach( $this->extensions as $extendingTag )
        {
!         $xml .= $extendingTag."\n";
        }
        return $xml;
--- 238,255 ----
  
        $xml .= "<title>{$this->title}</title>\n";
!       $xml .= $this->_injectExtendingTags();
!       return $xml;
!     }
!     
!     /**
!       * Inject extending tags into the feed header, if needed.
!       */
!     function _injectExtendingTags()
!     {
!         $xml = '';
!         if( is_array( $this->extensions ) )
        {
!         $this->extensions = array_unique($this->extensions);
!             $xml .= implode("\n", $this->extensions);
        }
        return $xml;
***************
*** 246,251 ****
  
      /**
!       * Inject XMLNS items into the feed master element,
!       * if needed.
        */
      function _injectNamespaces()
--- 257,261 ----
  
      /**
!       * Inject XMLNS items into the feed master element, if needed.
        */
      function _injectNamespaces()
***************
*** 254,257 ****
--- 264,268 ----
          if( is_array($this->namespaces) )
          {
+             $this->namespaces = array_unique($this->namespaces);
              $xml .= implode(' ', $this->namespaces);
          }

Index: rdf.feed.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/syndication/rdf.feed.class.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rdf.feed.class.php	7 Jun 2007 15:08:34 -0000	1.7
--- rdf.feed.class.php	19 Feb 2008 06:49:02 -0000	1.8
***************
*** 136,146 ****
          $xml .= "</image>\n";
        }
!       if( is_array( $this->extensions ) )
!       {
!         foreach( $this->extensions as $extendingTag )
!         {
!             $xml .= "$extendingTag\n";
!         }
!       }
        $xml .= "</channel>\n";
  
--- 136,140 ----
          $xml .= "</image>\n";
        }
!       $xml .= $this->_injectExtendingTags();
        $xml .= "</channel>\n";
  



From mjervis at qs1489.pair.com  Tue Feb 19 02:23:26 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Tue, 19 Feb 2008 07:23:26 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.677,1.678
Message-ID: <20080219072326.E7FFB10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv46668/public_html

Modified Files:
	lib-common.php 
Log Message:
Stop [raw] and [/raw] eating the following character (mike can't count).

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.677
retrieving revision 1.678
diff -C2 -d -r1.677 -r1.678
*** lib-common.php	18 Feb 2008 19:42:12 -0000	1.677
--- lib-common.php	19 Feb 2008 07:23:24 -0000	1.678
***************
*** 2954,2964 ****
              if( $end_pos !== false )
              {
!                 $encoded = COM_handleCode( MBYTE_substr( $str, $start_pos + 6,
!                         $end_pos - ( $start_pos + 6 )));
                  // [raw2] to avoid infinite loop. Not HTML comment as we strip
                  // them later.
                  $encoded = '[raw2]' . $encoded . '[/raw2]';
                  $str = MBYTE_substr( $str, 0, $start_pos ) . $encoded
!                      . MBYTE_substr( $str, $end_pos + 7 );
              }
              else // missing [/raw]
--- 2954,2964 ----
              if( $end_pos !== false )
              {
!                 $encoded = COM_handleCode( MBYTE_substr( $str, $start_pos + 5,
!                         $end_pos - ( $start_pos + 5 )));
                  // [raw2] to avoid infinite loop. Not HTML comment as we strip
                  // them later.
                  $encoded = '[raw2]' . $encoded . '[/raw2]';
                  $str = MBYTE_substr( $str, 0, $start_pos ) . $encoded
!                      . MBYTE_substr( $str, $end_pos + 6 );
              }
              else // missing [/raw]
***************
*** 2968,2972 ****
                  // better be checking for missing [/raw] before calling this
                  // function ...
!                 $encoded = COM_handleCode( MBYTE_substr( $str, $start_pos + 6 ));
                  // [raw2] to avoid infinite loop. Not HTML comment as we strip
                  // them later.
--- 2968,2972 ----
                  // better be checking for missing [/raw] before calling this
                  // function ...
!                 $encoded = COM_handleCode( MBYTE_substr( $str, $start_pos + 5 ));
                  // [raw2] to avoid infinite loop. Not HTML comment as we strip
                  // them later.



From mjervis at qs1489.pair.com  Tue Feb 19 12:46:09 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Tue, 19 Feb 2008 17:46:09 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.678,1.679
Message-ID: <20080219174609.5959010FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv69104/public_html

Modified Files:
	lib-common.php 
Log Message:
Add [raw] to allowed HTML list (and there was me trying to find it hiding in the database config stuf...)

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.678
retrieving revision 1.679
diff -C2 -d -r1.678 -r1.679
*** lib-common.php	19 Feb 2008 07:23:24 -0000	1.678
--- lib-common.php	19 Feb 2008 17:46:07 -0000	1.679
***************
*** 3812,3816 ****
      }
  
!     $retval .= '[code]';
  
      if( $allow_page_break )
--- 3812,3816 ----
      }
  
!     $retval .= '[code], [raw]';
  
      if( $allow_page_break )



From mjervis at qs1489.pair.com  Tue Feb 19 12:47:32 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Tue, 19 Feb 2008 17:47:32 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.21, 1.22
Message-ID: <20080219174732.9327310FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv69148/system/classes

Modified Files:
	story.class.php 
Log Message:
Correctly handle escaping in HTML postmode of non-[raw] and non-[code] blocks.

Index: story.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** story.class.php	18 Feb 2008 19:42:13 -0000	1.21
--- story.class.php	19 Feb 2008 17:47:30 -0000	1.22
***************
*** 1484,1494 ****
      {
          if (($this->_postmode == 'html') || ($this->_postmode == 'wikitext')) {
!             // Standard named items, plus the three we do in _displayEscape and
!             // others I know off-hand.
!             //$replacefrom = array('&lt;', '&gt;', '&amp;', '&#36;', '&#123;', '&#125', '&#92;');
!             //$replaceto = array('<', '>', '&', '$', '{', '}', '\\');
!             //$return = str_replace($replacefrom, $replaceto, $in);
!             //return $return;
!             return html_entity_decode($in);
          } else {
              // advanced editor or plaintext can handle themselves...
--- 1484,1560 ----
      {
          if (($this->_postmode == 'html') || ($this->_postmode == 'wikitext')) {
!             /* Raw and code blocks need entity decoding. Other areas do not.
!              * otherwise, annoyingly, &lt; will end up as < on preview 1, on
!              * preview 2 it'll be stripped by KSES. Can't beleive I missed that
!              * in rewrite phase 1.
!              *
!              * First, raw
!              */
!             $inlower = MBYTE_strtolower($in);
!             $buffer = $in;
!             $start_pos = MBYTE_strpos($inlower, '[raw]');
!             if( $start_pos !== false ) {
!                 $out = '';
!                 while( $start_pos !== false ) {
!                     /* Copy in to start to out */
!                     $out .= MBYTE_substr($in, 0, $start_pos);
!                     /* Find end */
!                     $end_pos = MBYTE_strpos($inlower, '[raw]');
!                     if( $end_pos !== false ) {
!                         /* Encode body and append to out */
!                         $encoded = html_entity_decode(MBYTE_substr($buffer, $start_pos, $end_pos - $start_pos));
!                         $out .= $encoded;
!                         /* Nibble in */
!                         $inlower = MBYTE_substr($inlower, $end_pos);
!                         $buffer = MBYTE_substr($buffer, $end_pos);
!                     } else { // missing [/raw]
!                         // Treat the remainder as code, but this should have been
!                         // checked prior to calling:
!                         $out .= html_entity_decode(MBYTE_substr($buffer, $start_pos + 5));
!                         $inlower = '';
!                     }
!                     $start_pos = MBYTE_strpos($linlower, '[raw]');
!                 }
!                 // Append remainder:
!                 if( $buffer != '' ) {
!                     $out .= $buffer;
!                 }
!                 $in = $out;
!             }
!             /*
!              * Then, code
!              */
!             $inlower = MBYTE_strtolower($in);
!             $buffer = $in;
!             $start_pos = MBYTE_strpos($inlower, '[code]');
!             if( $start_pos !== false ) {
!                 $out = '';
!                 while( $start_pos !== false ) {
!                     /* Copy in to start to out */
!                     $out .= MBYTE_substr($in, 0, $start_pos);
!                     /* Find end */
!                     $end_pos = MBYTE_strpos($inlower, '[code]');
!                     if( $end_pos !== false ) {
!                         /* Encode body and append to out */
!                         $encoded = html_entity_decode(MBYTE_substr($buffer, $start_pos, $end_pos - $start_pos));
!                         $out .= $encoded;
!                         /* Nibble in */
!                         $inlower = MBYTE_substr($inlower, $end_pos);
!                         $buffer = MBYTE_substr($buffer, $end_pos);
!                     } else { // missing [/code]
!                         // Treat the remainder as code, but this should have been
!                         // checked prior to calling:
!                         $out .= html_entity_decode(MBYTE_substr($buffer, $start_pos + 6));
!                         $inlower = '';
!                     }
!                     $start_pos = MBYTE_strpos($linlower, '[code]');
!                 }
!                 // Append remainder:
!                 if( $buffer != '' ) {
!                     $out .= $buffer;
!                 }
!                 $in = $out;
!             }
!             return $in;
          } else {
              // advanced editor or plaintext can handle themselves...



From mjervis at qs1489.pair.com  Wed Feb 20 12:47:27 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 17:47:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.22, 1.23
Message-ID: <20080220174727.4EEBB10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv20688/system/classes

Modified Files:
	story.class.php 
Log Message:
Final fixes for HTML story processing.

Index: story.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** story.class.php	19 Feb 2008 17:47:30 -0000	1.22
--- story.class.php	20 Feb 2008 17:47:25 -0000	1.23
***************
*** 1500,1511 ****
                      $out .= MBYTE_substr($in, 0, $start_pos);
                      /* Find end */
!                     $end_pos = MBYTE_strpos($inlower, '[raw]');
                      if( $end_pos !== false ) {
                          /* Encode body and append to out */
                          $encoded = html_entity_decode(MBYTE_substr($buffer, $start_pos, $end_pos - $start_pos));
!                         $out .= $encoded;
                          /* Nibble in */
!                         $inlower = MBYTE_substr($inlower, $end_pos);
!                         $buffer = MBYTE_substr($buffer, $end_pos);
                      } else { // missing [/raw]
                          // Treat the remainder as code, but this should have been
--- 1500,1511 ----
                      $out .= MBYTE_substr($in, 0, $start_pos);
                      /* Find end */
!                     $end_pos = MBYTE_strpos($inlower, '[/raw]');
                      if( $end_pos !== false ) {
                          /* Encode body and append to out */
                          $encoded = html_entity_decode(MBYTE_substr($buffer, $start_pos, $end_pos - $start_pos));
!                         $out .= $encoded . '[/raw]';
                          /* Nibble in */
!                         $inlower = MBYTE_substr($inlower, $end_pos + 6);
!                         $buffer = MBYTE_substr($buffer, $end_pos + 6);
                      } else { // missing [/raw]
                          // Treat the remainder as code, but this should have been
***************
*** 1514,1518 ****
                          $inlower = '';
                      }
!                     $start_pos = MBYTE_strpos($linlower, '[raw]');
                  }
                  // Append remainder:
--- 1514,1518 ----
                          $inlower = '';
                      }
!                     $start_pos = MBYTE_strpos($inlower, '[raw]');
                  }
                  // Append remainder:
***************
*** 1534,1545 ****
                      $out .= MBYTE_substr($in, 0, $start_pos);
                      /* Find end */
!                     $end_pos = MBYTE_strpos($inlower, '[code]');
                      if( $end_pos !== false ) {
                          /* Encode body and append to out */
                          $encoded = html_entity_decode(MBYTE_substr($buffer, $start_pos, $end_pos - $start_pos));
!                         $out .= $encoded;
                          /* Nibble in */
!                         $inlower = MBYTE_substr($inlower, $end_pos);
!                         $buffer = MBYTE_substr($buffer, $end_pos);
                      } else { // missing [/code]
                          // Treat the remainder as code, but this should have been
--- 1534,1545 ----
                      $out .= MBYTE_substr($in, 0, $start_pos);
                      /* Find end */
!                     $end_pos = MBYTE_strpos($inlower, '[/code]');
                      if( $end_pos !== false ) {
                          /* Encode body and append to out */
                          $encoded = html_entity_decode(MBYTE_substr($buffer, $start_pos, $end_pos - $start_pos));
!                         $out .= $encoded . '[/code]';
                          /* Nibble in */
!                         $inlower = MBYTE_substr($inlower, $end_pos + 7);
!                         $buffer = MBYTE_substr($buffer, $end_pos + 7);
                      } else { // missing [/code]
                          // Treat the remainder as code, but this should have been
***************
*** 1548,1552 ****
                          $inlower = '';
                      }
!                     $start_pos = MBYTE_strpos($linlower, '[code]');
                  }
                  // Append remainder:
--- 1548,1552 ----
                          $inlower = '';
                      }
!                     $start_pos = MBYTE_strpos($inlower, '[code]');
                  }
                  // Append remainder:



From mjervis at qs1489.pair.com  Wed Feb 20 15:08:00 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 20:08:00 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.115,
	1.116
Message-ID: <20080220200800.CE8E510FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv25857/plugins/staticpages

Modified Files:
	functions.inc 
Log Message:
Ensure every template class has site_url, site_admin_url, layout_url and xhtml variables set. My eyes, they bleed...

Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** functions.inc	3 Feb 2008 19:23:24 -0000	1.115
--- functions.inc	20 Feb 2008 20:07:58 -0000	1.116
***************
*** 292,295 ****
--- 292,299 ----
  
      $spage = new Template( $_CONF['path'] . 'plugins/staticpages/templates/' );
+     $spage->set_var('xhtml', XHTML);
+     $spage->set_var('site_url', $_CONF['site_url']);
+     $spage->set_var('layout_url', $_CONF['layout_url']);
+     $spage->set_var('site_admin_url', $_CONF['site_admin_url']);
      $spage -> set_file( array('page'=>'staticpage.thtml',
          'comments' => 'spcomments.thtml'));
***************
*** 870,873 ****
--- 874,881 ----
              $spage = new Template( $_CONF['path'] . 'plugins/staticpages/templates/' );
              $spage->set_file( array('page'=>'centerblock.thtml'));
+             $spage->set_var('xhtml', XHTML);
+             $spage->set_var('site_url', $_CONF['site_url']);
+             $spage->set_var('layout_url', $_CONF['layout_url']);
+             $spage->set_var('site_admin_url', $_CONF['site_admin_url']);
  
              $icons = '';



From mjervis at qs1489.pair.com  Wed Feb 20 15:08:00 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 20:08:00 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/calendar functions.inc, 1.77, 1.78
Message-ID: <20080220200800.CCA4D10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/calendar
In directory qs1489.pair.com:/tmp/cvs-serv25857/plugins/calendar

Modified Files:
	functions.inc 
Log Message:
Ensure every template class has site_url, site_admin_url, layout_url and xhtml variables set. My eyes, they bleed...

Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** functions.inc	27 Jan 2008 15:23:32 -0000	1.77
--- functions.inc	20 Feb 2008 20:07:58 -0000	1.78
***************
*** 808,811 ****
--- 808,814 ----
      $cal_templates->set_file (array ('form' => 'batchdelete.thtml'));
      $cal_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
+     $cal_templates->set_var ('site_url', $_CONF['site_url']);
+     $cal_templates->set_var('layout_url', $_CONF['layout_url']);
+     $cal_templates->set_var('xhtml', XHTML);
      $cal_templates->set_var ('usr_time', $usr_time);
      $cal_templates->set_var ('lang_text_start', $LANG_CAL_ADMIN[28]);
***************
*** 814,818 ****
      $cal_templates->set_var ('lang_delete_sel', $LANG_ADMIN['delete_sel']);
      $cal_templates->set_var ('lang_delconfirm', $LANG_CAL_ADMIN[31]);
-     $cal_templates->set_var('xhtml', XHTML);
      $cal_templates->parse('form', 'form');
      $desc = $cal_templates->finish($cal_templates->get_var('form'));
--- 817,820 ----



From mjervis at qs1489.pair.com  Wed Feb 20 15:08:00 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 20:08:00 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls functions.inc,1.82,1.83
Message-ID: <20080220200800.CD9CF10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/polls
In directory qs1489.pair.com:/tmp/cvs-serv25857/plugins/polls

Modified Files:
	functions.inc 
Log Message:
Ensure every template class has site_url, site_admin_url, layout_url and xhtml variables set. My eyes, they bleed...

Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/functions.inc,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** functions.inc	19 Jan 2008 14:53:12 -0000	1.82
--- functions.inc	20 Feb 2008 20:07:58 -0000	1.83
***************
*** 479,482 ****
--- 479,483 ----
                  $poll->set_var('site_url', $_CONF['site_url']);
                  $poll->set_var('layout_url', $_CONF['layout_url']);
+                 $poll->set_var('site_admin_url', $_CONF['site_admin_url']);
                  $poll->set_var('poll_id', $pid );
                  $poll->set_var('poll_topic', $P['topic'] );
***************
*** 776,779 ****
--- 777,781 ----
              $poll->set_var('xhtml', XHTML);
              $poll->set_var('site_url', $_CONF['site_url']);
+             $poll->set_var('site_admin_url', $_CONF['site_admin_url']);
              $poll->set_var('layout_url', $_CONF['layout_url']);
              $poll->set_var('poll_topic', $P['topic']);



From mjervis at qs1489.pair.com  Wed Feb 20 15:08:01 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 20:08:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes navbar.class.php, 1.4,
	1.5 search.class.php, 1.64, 1.65
Message-ID: <20080220200801.3295710FE17@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv25857/system/classes

Modified Files:
	navbar.class.php search.class.php 
Log Message:
Ensure every template class has site_url, site_admin_url, layout_url and xhtml variables set. My eyes, they bleed...

Index: search.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/search.class.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** search.class.php	16 Feb 2008 21:24:28 -0000	1.64
--- search.class.php	20 Feb 2008 20:07:59 -0000	1.65
***************
*** 530,534 ****
          $cur_plugin = new Plugin();
          $searchresults = new Template($_CONF['path_layout'] . 'search');
!         $searchresults->set_var( 'xhtml', XHTML );
  
          $maxdisplayed = 0;
--- 530,537 ----
          $cur_plugin = new Plugin();
          $searchresults = new Template($_CONF['path_layout'] . 'search');
!         $searchresults->set_var('xhtml', XHTML);
!         $searchresults->set_var('site_url', $_CONF['site_url']);
!         $searchresults->set_var('site_admin_url', $_CONF['site_admin_url']);
!         $searchresults->set_var('layout_url', $_CONF['layout_url']);
  
          $maxdisplayed = 0;
***************
*** 742,745 ****
--- 745,750 ----
          $login->set_var ('login_message', $LANG_LOGIN[2]);
          $login->set_var ('site_url', $_CONF['site_url']);
+         $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+         $login->set_var ('layout_url', $_CONF['layout_url']);
          $login->set_var ('lang_login', $LANG_LOGIN[3]);
          $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
***************
*** 839,842 ****
--- 844,849 ----
          $searchform->set_var('search_intro', $LANG09[19]);
          $searchform->set_var('site_url', $_CONF['site_url']);
+         $searchform->set_var('site_admin_url', $_CONF['site_admin_url']);
+         $searchform->set_var('layout_url', $_CONF['layout_url']);
          $searchform->set_var('lang_keywords', $LANG09[2]);
          $searchform->set_var('lang_date', $LANG09[20]);

Index: navbar.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/navbar.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** navbar.class.php	25 Nov 2007 06:59:56 -0000	1.4
--- navbar.class.php	20 Feb 2008 20:07:59 -0000	1.5
***************
*** 152,155 ****
--- 152,158 ----
  
          $navtemplate->set_var( 'xhtml', XHTML );
+         $navtemplate->set_var( 'site_url', $_CONF['site_url'] );
+         $navtemplate->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
+         $navtemplate->set_var( 'layout_url', $_CONF['layout_url'] );
          if ($this->_parms != '') {
              $navtemplate->set_var( 'parms',  $this->_parms);
***************
*** 190,193 ****
--- 193,199 ----
              'link'          => 'breadcrumb_link.thtml'));
          $this->_bctemplate->set_var( 'xhtml', XHTML );
+         $this->_bctemplate->set_var( 'site_url', $_CONF['site_url'] );
+         $this->_bctemplate->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
+         $this->_bctemplate->set_var( 'layout_url', $_CONF['layout_url'] );
      }
      



From mjervis at qs1489.pair.com  Wed Feb 20 15:08:01 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 20:08:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html article.php, 1.94,
	1.95 index.php, 1.97, 1.98 lib-common.php, 1.679,
	1.680 pdfgenerator.php, 1.12, 1.13 profiles.php, 1.53,
	1.54 stats.php, 1.52, 1.53 submit.php, 1.120, 1.121 users.php,
	1.162, 1.163 usersettings.php, 1.169, 1.170
Message-ID: <20080220200801.3346A10FE18@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv25857/public_html

Modified Files:
	article.php index.php lib-common.php pdfgenerator.php 
	profiles.php stats.php submit.php users.php usersettings.php 
Log Message:
Ensure every template class has site_url, site_admin_url, layout_url and xhtml variables set. My eyes, they bleed...

Index: submit.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/submit.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** submit.php	29 Dec 2007 15:47:42 -0000	1.120
--- submit.php	20 Feb 2008 20:07:58 -0000	1.121
***************
*** 81,87 ****
              $loginreq->set_file('loginreq', 'submitloginrequired.thtml');
              $loginreq->set_var( 'xhtml', XHTML );
-             $loginreq->set_var('login_message', $LANG_LOGIN[2]);
              $loginreq->set_var('site_url', $_CONF['site_url']);
              $loginreq->set_var('layout_url', $_CONF['layout_url']);
              $loginreq->set_var('lang_login', $LANG_LOGIN[3]);
              $loginreq->set_var('lang_newuser', $LANG_LOGIN[4]);
--- 81,88 ----
              $loginreq->set_file('loginreq', 'submitloginrequired.thtml');
              $loginreq->set_var( 'xhtml', XHTML );
              $loginreq->set_var('site_url', $_CONF['site_url']);
+             $loginreq->set_var('site_admin_url', $_CONF['site_admin_url']);
              $loginreq->set_var('layout_url', $_CONF['layout_url']);
+             $loginreq->set_var('login_message', $LANG_LOGIN[2]);
              $loginreq->set_var('lang_login', $LANG_LOGIN[3]);
              $loginreq->set_var('lang_newuser', $LANG_LOGIN[4]);
***************
*** 163,166 ****
--- 164,168 ----
      $storyform->set_var ( 'xhtml', XHTML );
      $storyform->set_var ('site_url', $_CONF['site_url']);
+     $storyform->set_var ('site_admin_url', $_CONF['site_admin_url']);
      $storyform->set_var ('layout_url', $_CONF['layout_url']);
      $storyform->set_var ('lang_username', $LANG12[27]);

Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/index.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** index.php	25 Nov 2007 08:11:08 -0000	1.97
--- index.php	20 Feb 2008 20:07:58 -0000	1.98
***************
*** 163,166 ****
--- 163,169 ----
              $topspan->set_file (array ('topspan'=>'topcenterblock-span.thtml'));
              $topspan->set_var( 'xhtml', XHTML );
+             $topspan->set_var( 'site_url', $_CONF['site_url'] );
+             $topspan->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
+             $topspan->set_var( 'layout_url', $_CONF['layout_url'] );
              $topspan->parse ('output', 'topspan');
              $display .= $topspan->finish ($topspan->get_var('output'));

Index: pdfgenerator.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/pdfgenerator.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pdfgenerator.php	25 Nov 2007 06:55:07 -0000	1.12
--- pdfgenerator.php	20 Feb 2008 20:07:58 -0000	1.13
***************
*** 202,205 ****
--- 202,206 ----
              $pdf->set_var('layout_url', $_CONF['layout_url']);
              $pdf->set_var('site_url', $_CONF['site_url']);
+             $pdf->set_var('site_admin_url', $_CONF['site_admin_url']);
              $pdf->set_var('lang_loading_document', $LANG_PDF[5]);
              $pdf->set_var('lang_please_wait', $LANG_PDF[6]);
***************
*** 228,231 ****
--- 229,233 ----
              $pdf->set_var('layout_url', $_CONF['layout_url']);
              $pdf->set_var('site_url', $_CONF['site_url']);
+             $pdf->set_var('site_admin_url', $_CONF['site_admin_url']);
              $pdf->set_var('lang_error_msg', $LANG_PDF[4]);
              $pdf->set_var('lang_pdf_generator', $LANG_PDF[9]);

Index: users.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/users.php,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** users.php	16 Feb 2008 21:24:28 -0000	1.162
--- users.php	20 Feb 2008 20:07:59 -0000	1.163
***************
*** 82,85 ****
--- 82,87 ----
          $login->set_var ('login_message', $LANG_LOGIN[2]);
          $login->set_var ('site_url', $_CONF['site_url']);
+         $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+         $login->set_var ('layout_url', $_CONF['layout_url']);
          $login->set_var ('lang_login', $LANG_LOGIN[3]);
          $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
***************
*** 691,694 ****
--- 693,698 ----
      $user_templates->set_var( 'xhtml', XHTML );
      $user_templates->set_var('site_url', $_CONF['site_url']);
+     $user_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
+     $user_templates->set_var('layout_url', $_CONF['layout_url']);
      $user_templates->set_var('start_block', COM_startBlock($LANG04[22]));
      $user_templates->set_var('lang_instructions', $LANG04[23]);
***************
*** 742,745 ****
--- 746,751 ----
      $user_templates->set_var( 'xhtml', XHTML );
      $user_templates->set_var('site_url', $_CONF['site_url']);
+     $user_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
+     $user_templates->set_var('layout_url', $_CONF['layout_url']);
      $user_templates->set_var('start_block_forgetpassword', COM_startBlock($LANG04[25]));
      $user_templates->set_var('lang_instructions', $LANG04[26]);

Index: profiles.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/profiles.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** profiles.php	25 Nov 2007 06:55:07 -0000	1.53
--- profiles.php	20 Feb 2008 20:07:58 -0000	1.54
***************
*** 168,173 ****
          $login->set_file (array ('login'=>'submitloginrequired.thtml'));
          $login->set_var ( 'xhtml', XHTML );
-         $login->set_var ('login_message', $LANG_LOGIN[2]);
          $login->set_var ('site_url', $_CONF['site_url']);
          $login->set_var ('lang_login', $LANG_LOGIN[3]);
          $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
--- 168,175 ----
          $login->set_file (array ('login'=>'submitloginrequired.thtml'));
          $login->set_var ( 'xhtml', XHTML );
          $login->set_var ('site_url', $_CONF['site_url']);
+         $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+         $login->set_var ('layout_url', $_CONF['layout_url']);
+         $login->set_var ('login_message', $LANG_LOGIN[2]);
          $login->set_var ('lang_login', $LANG_LOGIN[3]);
          $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
***************
*** 361,366 ****
          $login->set_file (array ('login'=>'submitloginrequired.thtml'));
          $login->set_var ( 'xhtml', XHTML );
-         $login->set_var ('login_message', $LANG_LOGIN[2]);
          $login->set_var ('site_url', $_CONF['site_url']);
          $login->set_var ('lang_login', $LANG_LOGIN[3]);
          $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
--- 363,370 ----
          $login->set_file (array ('login'=>'submitloginrequired.thtml'));
          $login->set_var ( 'xhtml', XHTML );
          $login->set_var ('site_url', $_CONF['site_url']);
+         $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+         $login->set_var ('layout_url', $_CONF['layout_url']);
+         $login->set_var ('login_message', $LANG_LOGIN[2]);
          $login->set_var ('lang_login', $LANG_LOGIN[3]);
          $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
***************
*** 389,392 ****
--- 393,398 ----
      $mail_template->set_var( 'xhtml', XHTML );
      $mail_template->set_var('site_url', $_CONF['site_url']);
+     $mail_template->set_var('site_admin_url', $_CONF['site_admin_url']);
+     $mail_template->set_var('layout_url', $_CONF['layout_url']);
      $mail_template->set_var('start_block_mailstory2friend', COM_startBlock($LANG08[17]));
      $mail_template->set_var('lang_fromname', $LANG08[20]);

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.679
retrieving revision 1.680
diff -C2 -d -r1.679 -r1.680
*** lib-common.php	19 Feb 2008 17:46:07 -0000	1.679
--- lib-common.php	20 Feb 2008 20:07:58 -0000	1.680
***************
*** 1028,1031 ****
--- 1028,1032 ----
                                            . '/images/bg.' . $_IMAGE_TYPE );
      $header->set_var( 'site_url', $_CONF['site_url'] );
+     $header->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $header->set_var( 'layout_url', $_CONF['layout_url'] );
      $header->set_var( 'site_mail', "mailto:{$_CONF['site_mail']}" );
***************
*** 1300,1303 ****
--- 1301,1305 ----
      $footer->set_var( 'xhtml', XHTML );
      $footer->set_var( 'site_url', $_CONF['site_url']);
+     $footer->set_var( 'site_admin_url', $_CONF['site_admin_url']);
      $footer->set_var( 'layout_url',$_CONF['layout_url']);
      $footer->set_var( 'site_mail', "mailto:{$_CONF['site_mail']}" );
***************
*** 1478,1481 ****
--- 1480,1484 ----
      $block->set_var( 'xhtml', XHTML );
      $block->set_var( 'site_url', $_CONF['site_url'] );
+     $block->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $block->set_var( 'layout_url', $_CONF['layout_url'] );
      $block->set_var( 'block_title', stripslashes( $title ));
***************
*** 1540,1543 ****
--- 1543,1547 ----
      $block->set_var( 'xhtml', XHTML );
      $block->set_var( 'site_url', $_CONF['site_url'] );
+     $block->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $block->set_var( 'layout_url', $_CONF['layout_url'] );
      $block->parse( 'endHTML', 'block' );
***************
*** 2106,2109 ****
--- 2110,2114 ----
      $sections->set_var( 'xhtml', XHTML );
      $sections->set_var( 'site_url', $_CONF['site_url'] );
+     $sections->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $sections->set_var( 'layout_url', $_CONF['layout_url'] );
      $sections->set_var( 'block_name', str_replace( '_', '-', 'section_block' ));
***************
*** 2256,2259 ****
--- 2261,2265 ----
          $usermenu->set_var( 'xhtml', XHTML );
          $usermenu->set_var( 'site_url', $_CONF['site_url'] );
+         $usermenu->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
          $usermenu->set_var( 'layout_url', $_CONF['layout_url'] );
          $usermenu->set_var( 'block_name', str_replace( '_', '-', 'user_block' ));
***************
*** 2334,2337 ****
--- 2340,2344 ----
          $login->set_var( 'xhtml', XHTML );
          $login->set_var( 'site_url', $_CONF['site_url'] );
+         $login->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
          $login->set_var( 'layout_url', $_CONF['layout_url'] );
          $login->set_var( 'lang_username', $LANG01[21] );
***************
*** 2446,2449 ****
--- 2453,2457 ----
          $adminmenu->set_var( 'xhtml', XHTML );
          $adminmenu->set_var( 'site_url', $_CONF['site_url'] );
+         $adminmenu->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
          $adminmenu->set_var( 'layout_url', $_CONF['layout_url'] );
          $adminmenu->set_var( 'block_name', str_replace( '_', '-', 'admin_block' ));
***************
*** 5028,5031 ****
--- 5036,5040 ----
      $list->set_var( 'xhtml', XHTML );
      $list->set_var('site_url', $_CONF['site_url']);
+     $list->set_var('site_admin_url', $_CONF['site_admin_url']);
      $list->set_var('layout_url', $_CONF['layout_url']);
  

Index: usersettings.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/usersettings.php,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** usersettings.php	16 Feb 2008 11:40:04 -0000	1.169
--- usersettings.php	20 Feb 2008 20:07:59 -0000	1.170
***************
*** 1088,1091 ****
--- 1088,1093 ----
          $login->set_var ('login_message', $LANG_LOGIN[2]);
          $login->set_var ('site_url', $_CONF['site_url']);
+         $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+         $login->set_var ('layout_url', $_CONF['layout_url']);
          $login->set_var ('lang_login', $LANG_LOGIN[3]);
          $login->set_var ('lang_newuser', $LANG_LOGIN[4]);

Index: stats.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/stats.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** stats.php	25 Nov 2007 06:55:07 -0000	1.52
--- stats.php	20 Feb 2008 20:07:58 -0000	1.53
***************
*** 48,53 ****
      $login->set_file (array ('login'=>'submitloginrequired.thtml'));
      $login->set_var ( 'xhtml', XHTML );
-     $login->set_var ('login_message', $LANG_LOGIN[2]);
      $login->set_var ('site_url', $_CONF['site_url']);
      $login->set_var ('lang_login', $LANG_LOGIN[3]);
      $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
--- 48,55 ----
      $login->set_file (array ('login'=>'submitloginrequired.thtml'));
      $login->set_var ( 'xhtml', XHTML );
      $login->set_var ('site_url', $_CONF['site_url']);
+     $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+     $login->set_var ('layout_url', $_CONF['layout_url']);
+     $login->set_var ('login_message', $LANG_LOGIN[2]);
      $login->set_var ('lang_login', $LANG_LOGIN[3]);
      $login->set_var ('lang_newuser', $LANG_LOGIN[4]);

Index: article.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/article.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** article.php	25 Nov 2007 06:55:07 -0000	1.94
--- article.php	20 Feb 2008 20:07:58 -0000	1.95
***************
*** 265,268 ****
--- 265,269 ----
          $story_template->set_var( 'xhtml', XHTML );
          $story_template->set_var('site_url', $_CONF['site_url']);
+         $story_template->set_var('site_admin_url', $_CONF['site_admin_url']);
          $story_template->set_var('layout_url', $_CONF['layout_url']);
          $story_template->set_var('story_id', $story->getSid());



From mjervis at qs1489.pair.com  Wed Feb 20 15:08:00 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 20:08:00 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin block.php, 1.117,
	1.118 moderation.php, 1.117, 1.118 user.php, 1.199, 1.200
Message-ID: <20080220200800.E1DB310FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv25857/public_html/admin

Modified Files:
	block.php moderation.php user.php 
Log Message:
Ensure every template class has site_url, site_admin_url, layout_url and xhtml variables set. My eyes, they bleed...

Index: block.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/block.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** block.php	16 Feb 2008 23:00:35 -0000	1.117
--- block.php	20 Feb 2008 20:07:58 -0000	1.118
***************
*** 101,104 ****
--- 101,105 ----
      $block_templates = new Template($_CONF['path_layout'] . 'admin/block');
      $block_templates->set_file('editor','defaultblockeditor.thtml');
+     $block_templates->set_var('xhtml', XHTML);
      $block_templates->set_var('site_url', $_CONF['site_url']);
      $block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
***************
*** 241,244 ****
--- 242,246 ----
      $block_templates->set_file('editor','blockeditor.thtml');
      $block_templates->set_var('site_url', $_CONF['site_url']);
+     $block_templates->set_var('xhtml', XHTML);
      $block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
      $block_templates->set_var('layout_url', $_CONF['layout_url']);

Index: moderation.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/moderation.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** moderation.php	17 Feb 2008 10:29:36 -0000	1.117
--- moderation.php	20 Feb 2008 20:07:58 -0000	1.118
***************
*** 89,93 ****
                                         'ccrow'  => 'ccrow.thtml',
                                         'ccitem' => 'ccitem.thtml'));
!     $admin_templates->set_var( 'xhtml', XHTML );
  
      $retval .= COM_startBlock ('Geeklog ' . VERSION . ' -- ' . $LANG29[34], '',
--- 89,96 ----
                                         'ccrow'  => 'ccrow.thtml',
                                         'ccitem' => 'ccitem.thtml'));
!     $admin_templates->set_var('xhtml', XHTML);
!     $admin_templates->set_var('layout_url', $_CONF['layout_url']);
!     $admin_templates->set_var('site_url', $_CONF['site_url']);
!     $admin_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
  
      $retval .= COM_startBlock ('Geeklog ' . VERSION . ' -- ' . $LANG29[34], '',

Index: user.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** user.php	9 Dec 2007 18:05:39 -0000	1.199
--- user.php	20 Feb 2008 20:07:58 -0000	1.200
***************
*** 701,705 ****
--- 701,707 ----
                                        'reminder' => 'reminder.thtml'));
      $user_templates->set_var ( 'xhtml', XHTML );
+     $user_templates->set_var ('site_url', $_CONF['site_url']);
      $user_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
+     $user_templates->set_var ('layout_url', $_CONF['layout_url']);
      $user_templates->set_var ('usr_type', $usr_type);
      $user_templates->set_var ('usr_time', $usr_time);



From mjervis at qs1489.pair.com  Wed Feb 20 15:08:01 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 20:08:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-admin.php, 1.126,
	1.127 lib-comment.php, 1.62, 1.63 lib-security.php, 1.61,
	1.62 lib-story.php, 1.122, 1.123
Message-ID: <20080220200801.46B0610FE19@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv25857/system

Modified Files:
	lib-admin.php lib-comment.php lib-security.php lib-story.php 
Log Message:
Ensure every template class has site_url, site_admin_url, layout_url and xhtml variables set. My eyes, they bleed...

Index: lib-comment.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-comment.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** lib-comment.php	2 Jan 2008 13:00:46 -0000	1.62
--- lib-comment.php	20 Feb 2008 20:07:59 -0000	1.63
***************
*** 75,78 ****
--- 75,79 ----
      $commentbar->set_var( 'xhtml', XHTML );
      $commentbar->set_var( 'site_url', $_CONF['site_url'] );
+     $commentbar->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $commentbar->set_var( 'layout_url', $_CONF['layout_url'] );
  
***************
*** 225,228 ****
--- 226,230 ----
      $template->set_var( 'xhtml', XHTML );
      $template->set_var( 'site_url', $_CONF['site_url'] );
+     $template->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $template->set_var( 'layout_url', $_CONF['layout_url'] );
      $template->set_var( 'lang_authoredby', $LANG01[42] );
***************
*** 507,510 ****
--- 509,513 ----
      $template->set_var( 'xhtml', XHTML );
      $template->set_var( 'site_url', $_CONF['site_url'] );
+     $template->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $template->set_var( 'layout_url', $_CONF['layout_url'] );
      $template->set_var( 'commentbar',
***************
*** 648,651 ****
--- 651,655 ----
          $loginreq->set_var('login_message', $LANG_LOGIN[2]);
          $loginreq->set_var('site_url', $_CONF['site_url']);
+         $loginreq->set_var('site_admin_url', $_CONF['site_admin_url']);
          $loginreq->set_var('lang_login', $LANG_LOGIN[3]);
          $loginreq->set_var('lang_newuser', $LANG_LOGIN[4]);
***************
*** 723,726 ****
--- 727,731 ----
                  $start->set_var( 'xhtml', XHTML );
                  $start->set_var( 'site_url', $_CONF['site_url'] );
+                 $start->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
                  $start->set_var( 'layout_url', $_CONF['layout_url'] );
                  $start->set_var( 'hide_if_preview', 'style="display:none"' );
***************
*** 766,769 ****
--- 771,776 ----
              $comment_template->set_var( 'xhtml', XHTML );
              $comment_template->set_var('site_url', $_CONF['site_url']);
+             $comment_template->set_var('site_admin_url', $_CONF['site_admin_url']);
+             $comment_template->set_var('layout_url', $_CONF['layout_url']);
              $comment_template->set_var('start_block_postacomment', COM_startBlock($LANG03[1]));
              $comment_template->set_var('lang_username', $LANG03[5]);

Index: lib-story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** lib-story.php	16 Feb 2008 22:18:14 -0000	1.122
--- lib-story.php	20 Feb 2008 20:07:59 -0000	1.123
***************
*** 100,103 ****
--- 100,104 ----
      $article->set_var( 'layout_url', $_CONF['layout_url'] );
      $article->set_var( 'site_url', $_CONF['site_url'] );
+     $article->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
      $article->set_var( 'site_name', $_CONF['site_name'] );
      $article->set_var( 'story_date', $story->DisplayElements('date') );

Index: lib-admin.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-admin.php,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** lib-admin.php	2 Jan 2008 12:35:58 -0000	1.126
--- lib-admin.php	20 Feb 2008 20:07:59 -0000	1.127
***************
*** 84,87 ****
--- 84,88 ----
      $admin_templates->set_var( 'xhtml', XHTML );
      $admin_templates->set_var('site_url', $_CONF['site_url']);
+     $admin_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
      $admin_templates->set_var('layout_url', $_CONF['layout_url']);
      $admin_templates->set_var('form_url', $form_url);
***************
*** 273,276 ****
--- 274,278 ----
      $admin_templates->set_var( 'xhtml', XHTML );
      $admin_templates->set_var('site_url', $_CONF['site_url']);
+     $admin_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
      $admin_templates->set_var('layout_url', $_CONF['layout_url']);
      $admin_templates->set_var('form_url', $form_url);
***************
*** 578,582 ****
      $admin_templates->set_var('menu_fields', $menu_fields);
      $admin_templates->set_var('lang_instructions', $text);
!     $admin_templates->set_var( 'xhtml', XHTML );
      $admin_templates->parse('top_menu', 'top_menu');
      $retval = $admin_templates->finish($admin_templates->get_var('top_menu'));
--- 580,587 ----
      $admin_templates->set_var('menu_fields', $menu_fields);
      $admin_templates->set_var('lang_instructions', $text);
!     $admin_templates->set_var('xhtml', XHTML);
!     $admin_templates->set_var('site_url', $_CONF['site_url']);
!     $admin_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
!     $admin_templates->set_var('layout_url', $_CONF['layout_url']);
      $admin_templates->parse('top_menu', 'top_menu');
      $retval = $admin_templates->finish($admin_templates->get_var('top_menu'));

Index: lib-security.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** lib-security.php	17 Feb 2008 18:31:56 -0000	1.61
--- lib-security.php	20 Feb 2008 20:07:59 -0000	1.62
***************
*** 430,433 ****
--- 430,436 ----
  
      $perm_templates->set_var ( 'xhtml', XHTML );
+     $perm_templates->set_var ('site_url', $_CONF['site_url']);
+     $perm_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
+     $perm_templates->set_var ('layout_url', $_CONF['layout_url']);
      $perm_templates->set_var ('owner', $LANG_ACCESS['owner']);
      $perm_templates->set_var ('group', $LANG_ACCESS['group']);



From dhaun at qs1489.pair.com  Wed Feb 20 15:23:02 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Wed, 20 Feb 2008 20:23:02 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-story.php,1.123,1.124
Message-ID: <20080220202302.BD18010FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv26795/system

Modified Files:
	lib-story.php 
Log Message:
Whoops, I broke {story_title_link} ...


Index: lib-story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** lib-story.php	20 Feb 2008 20:07:59 -0000	1.123
--- lib-story.php	20 Feb 2008 20:23:00 -0000	1.124
***************
*** 219,222 ****
--- 219,224 ----
              )
          );
+     } else {
+         $article->set_var('story_title_link', $story->DisplayElements('title'));
      }
  



From mjervis at qs1489.pair.com  Wed Feb 20 15:27:27 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 20:27:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html profiles.php,1.54,1.55
Message-ID: <20080220202727.62C5810FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv26991/public_html

Modified Files:
	profiles.php 
Log Message:
Email user option: Form handles " incorrectly on re-display
(incomplete form submission)

Index: profiles.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/profiles.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** profiles.php	20 Feb 2008 20:07:58 -0000	1.54
--- profiles.php	20 Feb 2008 20:27:25 -0000	1.55
***************
*** 131,134 ****
--- 131,137 ----
              $retval .= COM_refresh($_CONF['site_url'] . '/index.php?msg=27');
          } else {
+             $subject = strip_tags ($subject);
+             $subject = substr ($subject, 0, strcspn ($subject, "\r\n"));
+             $subject = htmlspecialchars (trim ($subject), ENT_QUOTES);
              $retval .= COM_siteHeader ('menu', $LANG04[81])
                      . COM_errorLog ($LANG08[3], 2)
***************
*** 137,140 ****
--- 140,146 ----
          }
      } else {
+         $subject = strip_tags ($subject);
+         $subject = substr ($subject, 0, strcspn ($subject, "\r\n"));
+         $subject = htmlspecialchars (trim ($subject), ENT_QUOTES);
          $retval .= COM_siteHeader ('menu', $LANG04[81])
                  . COM_errorLog ($LANG08[4], 2)



From mjervis at qs1489.pair.com  Wed Feb 20 15:27:27 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 20:27:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.606,1.607
Message-ID: <20080220202727.5842F10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv26991/public_html/docs

Modified Files:
	history 
Log Message:
Email user option: Form handles " incorrectly on re-display
(incomplete form submission)

Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.606
retrieving revision 1.607
diff -C2 -d -r1.606 -r1.607
*** history	18 Feb 2008 19:42:12 -0000	1.606
--- history	20 Feb 2008 20:27:25 -0000	1.607
***************
*** 3,6 ****
--- 3,10 ----
  ??? ??, 2008 (1.5.0)
  ------------
+ - Bug: Email user form doesn't display correctly with " in subject when sending
+   is failed due to incomplete fields. [Mike]
+ - Bugs: Ensure that site_url, site_admin_url, layout_url and xhtml available to all
+   templates. [Mike]
  - Support for [raw][/raw] tag in HTML post mode. All the benefits of code and
    pre, with none of the ugly styling. [Mike]



From mjervis at qs1489.pair.com  Wed Feb 20 15:32:39 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Wed, 20 Feb 2008 20:32:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html profiles.php,1.55,1.56
Message-ID: <20080220203239.ED2CB10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv27176/public_html

Modified Files:
	profiles.php 
Log Message:
 Mail story to a friend: User message text is run through COM_applyFilter but shouldn't be because that will cut the message off at the first special character. The message doesn't go out as HTML, and isn't logged, so, we don't introduce a security hole by doing so (I checked carefully!)

Index: profiles.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/profiles.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** profiles.php	20 Feb 2008 20:27:25 -0000	1.55
--- profiles.php	20 Feb 2008 20:32:37 -0000	1.56
***************
*** 472,476 ****
                           . mailstoryform ($sid, COM_applyFilter($_POST['to']), COM_applyFilter($_POST['toemail']),
                                            COM_applyFilter($_POST['from']), COM_applyFilter($_POST['fromemail']),
!                                           COM_applyFilter($_POST['shortmsg']), 52)
                           . COM_siteFooter ();
              } else if (empty ($_POST['to']) || empty ($_POST['from']) ||
--- 472,476 ----
                           . mailstoryform ($sid, COM_applyFilter($_POST['to']), COM_applyFilter($_POST['toemail']),
                                            COM_applyFilter($_POST['from']), COM_applyFilter($_POST['fromemail']),
!                                           $_POST['shortmsg'], 52)
                           . COM_siteFooter ();
              } else if (empty ($_POST['to']) || empty ($_POST['from']) ||
***************
*** 479,483 ****
                           . mailstoryform ($sid, COM_applyFilter($_POST['to']), COM_applyFilter($_POST['toemail']),
                                            COM_applyFilter($_POST['from']), COM_applyFilter($_POST['fromemail']),
!                                           COM_applyFilter($_POST['shortmsg']))
                           . COM_siteFooter ();
              } else {
--- 479,483 ----
                           . mailstoryform ($sid, COM_applyFilter($_POST['to']), COM_applyFilter($_POST['toemail']),
                                            COM_applyFilter($_POST['from']), COM_applyFilter($_POST['fromemail']),
!                                           $_POST['shortmsg'])
                           . COM_siteFooter ();
              } else {
***************
*** 488,492 ****
                               . mailstoryform ($sid, COM_applyFilter($_POST['to']), COM_applyFilter($_POST['toemail']),
                                                COM_applyFilter($_POST['from']), COM_applyFilter($_POST['fromemail']),
!                                               COM_applyFilter($_POST['shortmsg']))
                               . COM_siteFooter ();
                  } else {
--- 488,492 ----
                               . mailstoryform ($sid, COM_applyFilter($_POST['to']), COM_applyFilter($_POST['toemail']),
                                                COM_applyFilter($_POST['from']), COM_applyFilter($_POST['fromemail']),
!                                               $_POST['shortmsg'])
                               . COM_siteFooter ();
                  } else {



From dhaun at qs1489.pair.com  Wed Feb 20 15:38:02 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Wed, 20 Feb 2008 20:38:02 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-webservices.php,1.32,1.33
Message-ID: <20080220203802.D128D10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv27366/system

Modified Files:
	lib-webservices.php 
Log Message:
Use the somewhat sanitized site_name for the realm


Index: lib-webservices.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** lib-webservices.php	6 Jan 2008 20:44:10 -0000	1.32
--- lib-webservices.php	20 Feb 2008 20:38:00 -0000	1.33
***************
*** 59,63 ****
  function WS_error($error_code, $error_desc = '')
  {
!     global $WS_VERBOSE;
  
      header('Content-type: text/plain');
--- 59,63 ----
  function WS_error($error_code, $error_desc = '')
  {
!     global $_CONF, $WS_VERBOSE;
  
      header('Content-type: text/plain');
***************
*** 76,81 ****
          break;
      case PLG_RET_AUTH_FAILED:
          header($_SERVER['SERVER_PROTOCOL'] . ' 401 Unauthorized');
!         header('WWW-Authenticate: Basic realm="www.geeklog.net"');
          if (empty($error_desc)) {
              $error_desc = 'Unauthorized';
--- 76,82 ----
          break;
      case PLG_RET_AUTH_FAILED:
+         $realm = preg_replace('/[^a-zA-Z0-9\-_\. ]/', '', $_CONF['site_name']);
          header($_SERVER['SERVER_PROTOCOL'] . ' 401 Unauthorized');
!         header('WWW-Authenticate: Basic realm="' . $realm . '"');
          if (empty($error_desc)) {
              $error_desc = 'Unauthorized';



From mjervis at qs1489.pair.com  Thu Feb 21 14:52:54 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 21 Feb 2008 19:52:54 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin block.php,1.118,1.119
Message-ID: <20080221195254.F3C3A10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv78690/public_html/admin

Modified Files:
	block.php 
Log Message:
Security changes.

Index: block.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/block.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** block.php	20 Feb 2008 20:07:58 -0000	1.118
--- block.php	21 Feb 2008 19:52:52 -0000	1.119
***************
*** 38,41 ****
--- 38,42 ----
  require_once '../lib-common.php';
  require_once 'auth.inc.php';
+ require_once $_CONF['path_system'] . 'lib-security.php';
  
  // Uncomment the line below if you need to debug the HTTP variables being passed
***************
*** 367,370 ****
--- 368,372 ----
  
      require_once( $_CONF['path_system'] . 'lib-admin.php' );
+     $token = SEC_createToken();
  
      // writing the menu on top
***************
*** 416,420 ****
      $retval .= ADMIN_list (
          "blocks", "ADMIN_getListField_blocks", $header_arr, $text_arr,
!         $query_arr, $defsort_arr, '', '', '', $form_arr
      );
  
--- 418,422 ----
      $retval .= ADMIN_list (
          "blocks", "ADMIN_getListField_blocks", $header_arr, $text_arr,
!         $query_arr, $defsort_arr, '', $token, '', $form_ar
      );
  
***************
*** 438,442 ****
      $retval .= ADMIN_list (
          'blocks', 'ADMIN_getListField_blocks', $header_arr, $text_arr,
!         $query_arr, $defsort_arr, '', '', '', $form_arr
      );
  
--- 440,444 ----
      $retval .= ADMIN_list (
          'blocks', 'ADMIN_getListField_blocks', $header_arr, $text_arr,
!         $query_arr, $defsort_arr, '', $token, '', $form_arr
      );
  
***************
*** 822,826 ****
--- 824,830 ----
  } else if ($mode == 'move') {
      $display .= COM_siteHeader('menu', $LANG21[19]);
+     if(SEC_checkToken()) {
      $display .= moveBlock();
+     }
      $display .= listblocks();
      $display .= COM_siteFooter();



From mjervis at qs1489.pair.com  Thu Feb 21 14:52:55 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 21 Feb 2008 19:52:55 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql mssql_tableanddata.php, 1.33,
	1.34 mysql_tableanddata.php, 1.200, 1.201
Message-ID: <20080221195255.2855D10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql
In directory qs1489.pair.com:/tmp/cvs-serv78690/sql

Modified Files:
	mssql_tableanddata.php mysql_tableanddata.php 
Log Message:
Security changes.

Index: mssql_tableanddata.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mssql_tableanddata.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** mssql_tableanddata.php	27 Jan 2008 15:23:32 -0000	1.33
--- mssql_tableanddata.php	21 Feb 2008 19:52:52 -0000	1.34
***************
*** 517,520 ****
--- 517,530 ----
  ";
  
+ $_SQL[] = "
+ CREATE TABLE {$_TABLES['tokens']} (
+     [token] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+     [created] [datetime] NOT NULL,
+     [owner_id] [numeric] (8,0) NOT NULL,
+     [urlfor] [varchar] (2000) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+     [ttl] numeric(8,0) NOT NULL DEFAULT 1
+ ) ON [PRIMARY]
+ ";
+ 
  
  $_SQL[] = "
***************
*** 910,913 ****
--- 920,930 ----
      (
          [fid]
+     )  ON [PRIMARY]
+ ";
+ 
+ $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['tokens']}] ADD
+     CONSTRAINT [PK_gl_tokens] PRIMARY KEY  CLUSTERED
+     (
+         [toekn]
      )  ON [PRIMARY]
  ";

Index: mysql_tableanddata.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mysql_tableanddata.php,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -d -r1.200 -r1.201
*** mysql_tableanddata.php	3 Feb 2008 19:11:50 -0000	1.200
--- mysql_tableanddata.php	21 Feb 2008 19:52:53 -0000	1.201
***************
*** 724,727 ****
--- 724,738 ----
  ";
  
+ $_SQL[47] = "
+ CREATE TABLE {$_TABLES['tokens']} (
+     token varchar(32) NOT NULL,
+     created datetime NOT NULL,
+     owner_id mediumint(8) unsigned NOT NULL,
+     urlfor varchar(2000) NOT NULL,
+     ttl mediumint(8) unsigned NOT NULL default '1',
+     PRIMARY KEY (token)
+ ) TYPE=MyISAM
+ ";
+ 
  $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (1,3) ";
  $_DATA[] = "INSERT INTO {$_TABLES['access']} (acc_ft_id, acc_grp_id) VALUES (2,3) ";



From mjervis at qs1489.pair.com  Thu Feb 21 14:52:55 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 21 Feb 2008 19:52:55 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mssql_1.4.1_to_1.5.0.php, 1.11,
	1.12 mysql_1.4.1_to_1.5.0.php, 1.64, 1.65
Message-ID: <20080221195255.3A6ED10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv78690/sql/updates

Modified Files:
	mssql_1.4.1_to_1.5.0.php mysql_1.4.1_to_1.5.0.php 
Log Message:
Security changes.

Index: mssql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mssql_1.4.1_to_1.5.0.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mssql_1.4.1_to_1.5.0.php	27 Jan 2008 10:53:03 -0000	1.11
--- mssql_1.4.1_to_1.5.0.php	21 Feb 2008 19:52:53 -0000	1.12
***************
*** 30,33 ****
--- 30,50 ----
  
   */
+  
+  $_SQL[] = "
+ CREATE TABLE {$_TABLES['tokens']} (
+     [token] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+     [created] [datetime] NOT NULL,
+     [owner_id] [numeric] (8,0) NOT NULL,
+     [urlfor] [varchar] (2000) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+     [ttl] numeric(8,0) NOT NULL DEFAULT 1
+ ) ON [PRIMARY]
+ ";
+  
+ $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['tokens']}] ADD
+     CONSTRAINT [PK_gl_tokens] PRIMARY KEY  CLUSTERED
+     (
+         [toekn]
+     )  ON [PRIMARY]
+ ";
  
  

Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** mysql_1.4.1_to_1.5.0.php	10 Feb 2008 17:09:38 -0000	1.64
--- mysql_1.4.1_to_1.5.0.php	21 Feb 2008 19:52:53 -0000	1.65
***************
*** 27,30 ****
--- 27,42 ----
  $_SQL[] = "INSERT INTO {$_TABLES['groups']} (grp_name, grp_descr, grp_gl_core) VALUES ('Webservices Users', 'Can use the Webservices API (if restricted)', 0)";
  
+ // add the security tokens table:
+ $_SQL[] = "
+ CREATE TABLE {$_TABLES['tokens']} (
+     token varchar(32) NOT NULL,
+     created datetime NOT NULL,
+     owner_id mediumint(8) unsigned NOT NULL,
+     urlfor varchar(2000) NOT NULL,
+     ttl mediumint(8) unsigned NOT NULL default '1',
+     PRIMARY KEY (token)
+ ) TYPE=MyISAM
+ ";
+ 
  
  function create_ConfValues()



From mjervis at qs1489.pair.com  Thu Feb 21 14:52:55 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 21 Feb 2008 19:52:55 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-admin.php, 1.127,
	1.128 lib-security.php, 1.62, 1.63
Message-ID: <20080221195255.4B82F10FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv78690/system

Modified Files:
	lib-admin.php lib-security.php 
Log Message:
Security changes.

Index: lib-security.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** lib-security.php	20 Feb 2008 20:07:59 -0000	1.62
--- lib-security.php	21 Feb 2008 19:52:53 -0000	1.63
***************
*** 1037,1039 ****
--- 1037,1144 ----
  }
  
+ /**
+   * Generate a security token.
+   *
+   * This generates and stores a one time security token. Security tokens are
+   * added to forms and urls in the admin section as a non-cookie double-check
+   * that the admin user really wanted to do that...
+   *
+   * @return string  Generated token, it'll be an MD5 hash (32chars)
+   */
+ function SEC_createToken()
+ {
+     global $_USER, $_TABLES;
+     
+     /* Figure out the full url to the current page */
+     $pageURL = 'http';
+     if ($_SERVER["HTTPS"] == "on") {
+         $pageURL .= "s";
+     }
+     $pageURL .= "://";
+     if ($_SERVER["SERVER_PORT"] != "80") {
+         $pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
+     } else {
+         $pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+     }
+     
+     /* Generate the token */
+     $token = md5($_USER['uid'].$pageURL.uniqid (rand (), 1));
+     $pageURL = addslashes($pageURL);
+     
+     /* Destroy exired tokens: */
+     /* Note: TTL not yet implemented! So commented out */
+ //    $sql = "DELETE FROM {$_TABLES['tokens']} WHERE (DATE_ADD(created, INTERVAL ttl SECOND) < NOW())"
+ //           . " AND (ttl > 0)";
+ //    DB_Query($sql);
+     
+     /* Destroy tokens for this user/url combination */
+     $sql = "DELETE FROM {$_TABLES['tokens']} WHERE owner_id={$_USER['uid']} AND urlfor='$pageURL'";
+     DB_Query($sql);
+     
+     /* Create a token for this user/url combination */
+     /* NOTE: TTL mapping for PageURL not yet implemented */
+     $sql = "INSERT INTO {$_TABLES['tokens']} (token, created, owner_id, urlfor, ttl) "
+            . "VALUES ('$token', NOW(), {$_USER['uid']}, '$pageURL', 0)";
+     DB_Query($sql);
+            
+     /* And return the token to the user */
+     return $token;
+ }
+ 
+ /**
+   * Check a security token.
+   *
+   * Checks the POST and GET data for a security token, if one exists, validates that it's for this
+   * user and URL.
+   *
+   * @return bool    true iff the token is valid and for this user.
+   */
+ function SEC_checkToken()
+ {
+     global $_USER, $_TABLES;
+     
+     $token = ''; // Default to no token.
+     $return = false; // Default to fail.
+     
+     if(array_key_exists('token', $_GET)) {
+         $token = COM_applyFilter($_GET['token']);
+     } else if(array_key_exists('token', $_POST)) {
+         $token = COM_applyFilter($_POST['token']);
+     }
+     
+     if(trim($token) != '') {
+         $sql = "SELECT ((DATE_ADD(created, INTERVAL ttl SECOND) < NOW()) AND ttl > 0) as expired, owner_id, urlfor FROM "
+                . "{$_TABLES['tokens']} WHERE token='$token'";
+         $tokens = DB_Query($sql);
+         $numberOfTokens = DB_numRows($tokens);
+         if($numberOfTokens != 1) {
+             $return = false; // none, or multiple tokens. Both are invalid. (token is unique key...)
+         } else {
+             $tokendata = DB_fetchArray($tokens);
+             /* Check that:
+              *  token's user is the current user.
+              *  token is not expired.
+              *  the http referer is the url for which the token was created.
+              */
+             if( $_USER['uid'] != $tokendata['owner_id'] ) {
+                 $return = false;
+             } else if($tokendata['urlfor'] != $_SERVER['HTTP_REFERER']) {
+                 $return = false;
+             } else if($tokendata['expired']) {
+                 $return = false;
+             } else {
+                 $return = true; // Everything is AOK in only one condition...
+             }
+            
+             // It's a one time token. So eat it.
+             $sql = "DELETE FROM {$_TABLES['tokens']} WHERE token='$token'";
+             DB_Query($sql);
+         }
+     } else {
+         $return = false; // no token.
+     }
+     
+     return $return;
+ }
+ 
  ?>

Index: lib-admin.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-admin.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** lib-admin.php	20 Feb 2008 20:07:59 -0000	1.127
--- lib-admin.php	21 Feb 2008 19:52:53 -0000	1.128
***************
*** 590,594 ****
  
  
! function ADMIN_getListField_blocks($fieldname, $fieldvalue, $A, $icon_arr)
  {
      global $_CONF, $LANG_ADMIN, $LANG21, $_IMAGE_TYPE;
--- 590,594 ----
  
  
! function ADMIN_getListField_blocks($fieldname, $fieldvalue, $A, $icon_arr, $token)
  {
      global $_CONF, $LANG_ADMIN, $LANG21, $_IMAGE_TYPE;
***************
*** 639,645 ****
                      $retval.="<img src=\"{$_CONF['layout_url']}/images/admin/$blockcontrol_image\" width=\"45\" height=\"20\" usemap=\"#arrow{$A['bid']}\" alt=\"\"" . XHTML . ">"
                              ."<map id=\"arrow{$A['bid']}\" name=\"arrow{$A['bid']}\">"
!                             ."<area coords=\"0,0,12,20\"  title=\"{$LANG21[58]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=up\" alt=\"{$LANG21[58]}\"" . XHTML . ">"
!                             ."<area coords=\"13,0,29,20\" title=\"$moveTitleMsg\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=$switchside\" alt=\"$moveTitleMsg\"" . XHTML . ">"
!                             ."<area coords=\"30,0,43,20\" title=\"{$LANG21[57]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=dn\" alt=\"{$LANG21[57]}\"" . XHTML . ">"
                              ."</map>";
                  }
--- 639,645 ----
                      $retval.="<img src=\"{$_CONF['layout_url']}/images/admin/$blockcontrol_image\" width=\"45\" height=\"20\" usemap=\"#arrow{$A['bid']}\" alt=\"\"" . XHTML . ">"
                              ."<map id=\"arrow{$A['bid']}\" name=\"arrow{$A['bid']}\">"
!                             ."<area coords=\"0,0,12,20\"  title=\"{$LANG21[58]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=up&amp;token={$token}\" alt=\"{$LANG21[58]}\"" . XHTML . ">"
!                             ."<area coords=\"13,0,29,20\" title=\"$moveTitleMsg\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=$switchside&amp;token={$token}\" alt=\"$moveTitleMsg\"" . XHTML . ">"
!                             ."<area coords=\"30,0,43,20\" title=\"{$LANG21[57]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=dn&amp;token={$token}\" alt=\"{$LANG21[57]}\"" . XHTML . ">"
                              ."</map>";
                  }



From mjervis at qs1489.pair.com  Fri Feb 22 03:04:35 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Fri, 22 Feb 2008 08:04:35 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-database.php,1.50,1.51
Message-ID: <20080222080435.BBA1C10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv5383/system

Modified Files:
	lib-database.php 
Log Message:
Security changes.

Index: lib-database.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-database.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** lib-database.php	3 Feb 2008 09:22:05 -0000	1.50
--- lib-database.php	22 Feb 2008 08:04:33 -0000	1.51
***************
*** 75,78 ****
--- 75,79 ----
  $_TABLES['storysubmission']     = $_DB_table_prefix . 'storysubmission';
  $_TABLES['syndication']         = $_DB_table_prefix . 'syndication';
+ $_TABLES['tokens']              = $_DB_table_prefix . 'tokens';
  $_TABLES['topics']              = $_DB_table_prefix . 'topics';
  $_TABLES['trackback']           = $_DB_table_prefix . 'trackback';



From mjervis at qs1489.pair.com  Fri Feb 22 03:22:44 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Fri, 22 Feb 2008 08:22:44 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-security.php,1.63,1.64
Message-ID: <20080222082244.9418A10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv6028/system

Modified Files:
	lib-security.php 
Log Message:
COM_getCurrentURL not my own rubbish...

Index: lib-security.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** lib-security.php	21 Feb 2008 19:52:53 -0000	1.63
--- lib-security.php	22 Feb 2008 08:22:42 -0000	1.64
***************
*** 1051,1064 ****
      
      /* Figure out the full url to the current page */
!     $pageURL = 'http';
!     if ($_SERVER["HTTPS"] == "on") {
!         $pageURL .= "s";
!     }
!     $pageURL .= "://";
!     if ($_SERVER["SERVER_PORT"] != "80") {
!         $pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
!     } else {
!         $pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
!     }
      
      /* Generate the token */
--- 1051,1055 ----
      
      /* Figure out the full url to the current page */
!     $pageURL = COM_getCurrentURL();
      
      /* Generate the token */



From dhaun at qs1489.pair.com  Sun Feb 24 03:54:54 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 08:54:54 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.680,1.681
Message-ID: <20080224085454.37D9210FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv19113/public_html

Modified Files:
	lib-common.php 
Log Message:
Cleanup: handle undefined $what; removed commented-out <ul>...</ul>


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.680
retrieving revision 1.681
diff -C2 -d -r1.680 -r1.681
*** lib-common.php	20 Feb 2008 20:07:58 -0000	1.680
--- lib-common.php	24 Feb 2008 08:54:51 -0000	1.681
***************
*** 1397,1401 ****
           * This can be used to take control over what blocks are then displayed
           */
!         if( is_array( $what ))
          {
              $function = $what[0];
--- 1397,1401 ----
           * This can be used to take control over what blocks are then displayed
           */
!         if( isset( $what) && is_array( $what ))
          {
              $function = $what[0];
***************
*** 1409,1413 ****
              }
          }
!         else if( $what <> 'none' )
          {
              // Now show any blocks -- need to get the topic if not on home page
--- 1409,1413 ----
              }
          }
!         else if( !isset( $what ) || ( $what <> 'none' ))
          {
              // Now show any blocks -- need to get the topic if not on home page
***************
*** 2335,2339 ****
          $retval .= COM_startBlock( $LANG01[47], $help,
                             COM_getBlockTemplate( 'user_block', 'header' ));
- //      $retval .= '<ul>';
          $login = new Template( $_CONF['path_layout'] );
          $login->set_file( 'form', 'loginform.thtml' );
--- 2335,2338 ----
***************
*** 2400,2404 ****
  
          $retval .= $login->parse( 'output', 'form' );
- //      $retval .= '</ul>';
          $retval .= COM_endBlock( COM_getBlockTemplate( 'user_block', 'footer' ));
      }
--- 2399,2402 ----



From dhaun at qs1489.pair.com  Sun Feb 24 05:55:51 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 10:55:51 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php, 1.681,
	1.682 users.php, 1.163, 1.164
Message-ID: <20080224105551.792D710FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv23903/public_html

Modified Files:
	lib-common.php users.php 
Log Message:
Allow disabling the standard login and forcing users to use remote authentication instead (loosely based on a patch by Jessica Blank)


Index: users.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/users.php,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** users.php	20 Feb 2008 20:07:59 -0000	1.163
--- users.php	24 Feb 2008 10:55:49 -0000	1.164
***************
*** 626,631 ****
      if ($_CONF['user_login_method']['3rdparty'] && !$_CONF['usersubmission']) {
          /* Build select */
!         $select = '<select name="service"><option value="">' .
!                         $_CONF['site_name'] . '</option>';
          if (is_dir($_CONF['path_system'].'classes/authentication/')) {
  
--- 626,633 ----
      if ($_CONF['user_login_method']['3rdparty'] && !$_CONF['usersubmission']) {
          /* Build select */
!         $select = '<select name="service">';
!         if ($_CONF['user_login_method']['standard']) {
!             $select .= '<option value="">' .  $_CONF['site_name'] . '</option>';
!         }
          if (is_dir($_CONF['path_system'].'classes/authentication/')) {
  
***************
*** 1041,1045 ****
      $uid = '';
      if (!empty($loginname) && !empty($passwd) && empty($service)) {
!         $status = SEC_authenticate($loginname, $passwd, $uid);
  
      } elseif (( $_CONF['usersubmission'] == 0) && $_CONF['user_login_method']['3rdparty'] && ($service != '')) {
--- 1043,1051 ----
      $uid = '';
      if (!empty($loginname) && !empty($passwd) && empty($service)) {
!         if (empty($service) && $_CONF['user_login_method']['standard']) {
!             $status = SEC_authenticate($loginname, $passwd, $uid);
!         } else {
!             $status = -1;
!         }
  
      } elseif (( $_CONF['usersubmission'] == 0) && $_CONF['user_login_method']['3rdparty'] && ($service != '')) {

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.681
retrieving revision 1.682
diff -C2 -d -r1.681 -r1.682
*** lib-common.php	24 Feb 2008 08:54:51 -0000	1.681
--- lib-common.php	24 Feb 2008 10:55:49 -0000	1.682
***************
*** 2358,2363 ****
          {
              // Build select
!             $select = '<select name="service" id="service"><option value="">' .
!                             $_CONF['site_name'] . '</option>';
              if( is_dir( $_CONF['path_system'] . 'classes/authentication/' ))
              {
--- 2358,2366 ----
          {
              // Build select
!             $select = '<select name="service" id="service">';
!             if ($_CONF['user_login_method']['standard']) {
!                 $select .= '<option value="">' . $_CONF['site_name']
!                         . '</option>';
!             }
              if( is_dir( $_CONF['path_system'] . 'classes/authentication/' ))
              {



From dhaun at qs1489.pair.com  Sun Feb 24 10:41:53 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 15:41:53 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/links
	install.php, 1.22, 1.23
Message-ID: <20080224154153.63F5E10FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links
In directory qs1489.pair.com:/tmp/cvs-serv37015/public_html/admin/plugins/links

Modified Files:
	install.php 
Log Message:
Don't add the Links plugin's topic_links / topic_categories block by default (and fixed their uninstall)


Index: install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/install.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** install.php	3 Feb 2008 19:11:50 -0000	1.22
--- install.php	24 Feb 2008 15:41:51 -0000	1.23
***************
*** 140,147 ****
      $L_SQL[] = "INSERT INTO {$_TABLES['links']} (lid, cid, url, description, title, hits, date, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('geeklog.net', 'geeklog-sites', 'http://www.geeklog.net/', 'Visit the Geeklog homepage for support, FAQs, updates, add-ons, and a great community.', 'Geeklog Project Homepage', 123, NOW(), 1, #group#, 3, 3, 2, 2);";
  
-     $L_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_links', 'phpblock', 'Topic Links', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_links', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
- 
-     $L_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_categories', 'phpblock', 'Topic Categories', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_categories', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
- 
      foreach ($L_SQL as $sql) {
          $sql = str_replace('#group#', $admin_group_id, $sql);
--- 140,143 ----



From dhaun at qs1489.pair.com  Sun Feb 24 10:41:53 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 15:41:53 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.65,
	1.66
Message-ID: <20080224154153.7154D10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv37015/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Don't add the Links plugin's topic_links / topic_categories block by default (and fixed their uninstall)


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** mysql_1.4.1_to_1.5.0.php	21 Feb 2008 19:52:53 -0000	1.65
--- mysql_1.4.1_to_1.5.0.php	24 Feb 2008 15:41:51 -0000	1.66
***************
*** 575,580 ****
      $P_SQL[] = "ALTER TABLE {$_TABLES['links']} CHANGE category cid varchar(32) NOT NULL";
      $P_SQL[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('{$root}', 'root', 'Root', 'Website root', NULL, NOW(), NOW(), 5, 2, 3, 3, 2, 2)";
-     $P_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_links', 'phpblock', 'Topic Links', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_links', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
-     $P_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_categories', 'phpblock', 'Topic Categories', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_categories', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
      $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.0', pi_gl_version='1.5.0' WHERE pi_name='links'";
  
--- 575,578 ----



From dhaun at qs1489.pair.com  Sun Feb 24 10:41:53 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 15:41:53 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.65,
	1.66
Message-ID: <20080224154153.7154D10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv37015/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Don't add the Links plugin's topic_links / topic_categories block by default (and fixed their uninstall)


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** mysql_1.4.1_to_1.5.0.php	21 Feb 2008 19:52:53 -0000	1.65
--- mysql_1.4.1_to_1.5.0.php	24 Feb 2008 15:41:51 -0000	1.66
***************
*** 575,580 ****
      $P_SQL[] = "ALTER TABLE {$_TABLES['links']} CHANGE category cid varchar(32) NOT NULL";
      $P_SQL[] = "INSERT INTO {$_TABLES['linkcategories']} (cid, pid, category, description, tid, created, modified, group_id, owner_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('{$root}', 'root', 'Root', 'Website root', NULL, NOW(), NOW(), 5, 2, 3, 3, 2, 2)";
-     $P_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_links', 'phpblock', 'Topic Links', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_links', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
-     $P_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, allow_autotags, rdfurl, rdfupdated, rdflimit, onleft, phpblockfn, help, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES (1, 'links_topic_categories', 'phpblock', 'Topic Categories', 'all', 0, '', 0, '', '0000-00-00 00:00:00', 0, 0, 'phpblock_topic_categories', '', 2, {$blockadmin_id}, 3, 3, 2, 2)";
      $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.0', pi_gl_version='1.5.0' WHERE pi_name='links'";
  
--- 575,578 ----



From dhaun at qs1489.pair.com  Sun Feb 24 10:41:53 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 15:41:53 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links functions.inc,1.104,1.105
Message-ID: <20080224154153.54F7B10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/links
In directory qs1489.pair.com:/tmp/cvs-serv37015/plugins/links

Modified Files:
	functions.inc 
Log Message:
Don't add the Links plugin's topic_links / topic_categories block by default (and fixed their uninstall)


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/functions.inc,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** functions.inc	3 Feb 2008 19:11:50 -0000	1.104
--- functions.inc	24 Feb 2008 15:41:51 -0000	1.105
***************
*** 1353,1357 ****
          'features' => array('links.edit', 'links.moderate', 'links.submit'),
          /* give the full name of the block, including 'phpblock_', etc */
!         'php_blocks' => array('links_topic_categories', 'links_topic_links'),
          /* give all vars with their name */
          'vars'=> array()
--- 1353,1357 ----
          'features' => array('links.edit', 'links.moderate', 'links.submit'),
          /* give the full name of the block, including 'phpblock_', etc */
!         'php_blocks' => array('phpblock_topic_categories', 'phpblock_topic_links'),
          /* give all vars with their name */
          'vars'=> array()



From dhaun at qs1489.pair.com  Sun Feb 24 11:49:53 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 16:49:53 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install
	config-install.php, 1.26, 1.27
Message-ID: <20080224164953.DA68610FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv39288/public_html/admin/install

Modified Files:
	config-install.php 
Log Message:
Fixed variable name: 'copyright' -> 'copyrightyear'


Index: config-install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/config-install.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** config-install.php	10 Feb 2008 17:09:37 -0000	1.26
--- config-install.php	24 Feb 2008 16:49:51 -0000	1.27
***************
*** 52,56 ****
      $c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
      $c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','text',0,0,NULL,510,TRUE);
!     $c->add('copyright','2007','text',0,0,NULL,1440,FALSE);
      $c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
  
--- 52,56 ----
      $c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
      $c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','text',0,0,NULL,510,TRUE);
!     $c->add('copyrightyear','2008','text',0,0,NULL,1440,FALSE);
      $c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
  



From dhaun at qs1489.pair.com  Sun Feb 24 11:49:53 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 16:49:53 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install
	config-install.php, 1.26, 1.27
Message-ID: <20080224164953.DA68610FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv39288/public_html/admin/install

Modified Files:
	config-install.php 
Log Message:
Fixed variable name: 'copyright' -> 'copyrightyear'


Index: config-install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/config-install.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** config-install.php	10 Feb 2008 17:09:37 -0000	1.26
--- config-install.php	24 Feb 2008 16:49:51 -0000	1.27
***************
*** 52,56 ****
      $c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
      $c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','text',0,0,NULL,510,TRUE);
!     $c->add('copyright','2007','text',0,0,NULL,1440,FALSE);
      $c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
  
--- 52,56 ----
      $c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
      $c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','text',0,0,NULL,510,TRUE);
!     $c->add('copyrightyear','2008','text',0,0,NULL,1440,FALSE);
      $c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
  



From dhaun at qs1489.pair.com  Sun Feb 24 11:49:53 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 16:49:53 +0000
Subject: [geeklog-cvs] Geeklog-1.x/language english.php, 1.330,
	1.331 english_utf-8.php, 1.114, 1.115 german.php, 1.184,
	1.185 german_formal.php, 1.89, 1.90 german_formal_utf-8.php,
	1.42, 1.43 german_utf-8.php, 1.73, 1.74 japanese.php, 1.39,
	1.40 japanese_utf-8.php, 1.23, 1.24
Message-ID: <20080224164953.D7E0A10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/language
In directory qs1489.pair.com:/tmp/cvs-serv39288/language

Modified Files:
	english.php english_utf-8.php german.php german_formal.php 
	german_formal_utf-8.php german_utf-8.php japanese.php 
	japanese_utf-8.php 
Log Message:
Fixed variable name: 'copyright' -> 'copyrightyear'


Index: german.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german.php,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -d -r1.184 -r1.185
*** german.php	27 Jan 2008 10:53:03 -0000	1.184
--- german.php	24 Feb 2008 16:49:51 -0000	1.185
***************
*** 1695,1699 ****
      'rdf_language' => "RDF Language",
      'syndication_max_headlines' => "Maximum Headlines",
!     'copyright' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",
--- 1695,1699 ----
      'rdf_language' => "RDF Language",
      'syndication_max_headlines' => "Maximum Headlines",
!     'copyrightyear' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",

Index: japanese.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/japanese.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** japanese.php	27 Jan 2008 10:53:03 -0000	1.39
--- japanese.php	24 Feb 2008 16:49:51 -0000	1.40
***************
*** 1711,1715 ****
        'rdf_language' => "RSS????",
        'syndication_max_headlines' => "????????????????",
!       'copyright' => "????????????????",
        'image_lib' => "??????????????",
        'path_to_mogrify' => "Mogrify????",
--- 1711,1715 ----
        'rdf_language' => "RSS????",
        'syndication_max_headlines' => "????????????????",
!       'copyrightyear' => "????????????????",
        'image_lib' => "??????????????",
        'path_to_mogrify' => "Mogrify????",

Index: japanese_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/japanese_utf-8.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** japanese_utf-8.php	27 Jan 2008 10:53:03 -0000	1.23
--- japanese_utf-8.php	24 Feb 2008 16:49:51 -0000	1.24
***************
*** 1711,1715 ****
        'rdf_language' => "RSS??????",
        'syndication_max_headlines' => "????????????????????????",
!       'copyright' => "????????????????????????",
        'image_lib' => "?????????????????????",
        'path_to_mogrify' => "Mogrify??????",
--- 1711,1715 ----
        'rdf_language' => "RSS??????",
        'syndication_max_headlines' => "????????????????????????",
!       'copyrightyear' => "????????????????????????",
        'image_lib' => "?????????????????????",
        'path_to_mogrify' => "Mogrify??????",

Index: german_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german_utf-8.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** german_utf-8.php	27 Jan 2008 10:53:03 -0000	1.73
--- german_utf-8.php	24 Feb 2008 16:49:51 -0000	1.74
***************
*** 1695,1699 ****
      'rdf_language' => "RDF Language",
      'syndication_max_headlines' => "Maximum Headlines",
!     'copyright' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",
--- 1695,1699 ----
      'rdf_language' => "RDF Language",
      'syndication_max_headlines' => "Maximum Headlines",
!     'copyrightyear' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",

Index: german_formal.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german_formal.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** german_formal.php	27 Jan 2008 10:53:03 -0000	1.89
--- german_formal.php	24 Feb 2008 16:49:51 -0000	1.90
***************
*** 1701,1705 ****
      'rdf_language' => "RDF Language",
      'syndication_max_headlines' => "Maximum Headlines",
!     'copyright' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",
--- 1701,1705 ----
      'rdf_language' => "RDF Language",
      'syndication_max_headlines' => "Maximum Headlines",
!     'copyrightyear' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",

Index: english_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english_utf-8.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** english_utf-8.php	17 Feb 2008 08:52:40 -0000	1.114
--- english_utf-8.php	24 Feb 2008 16:49:51 -0000	1.115
***************
*** 1721,1725 ****
      'rdf_language' => "Feed Language",
      'syndication_max_headlines' => 'Max. Number of Headlines (portal blocks)',
!     'copyright' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",
--- 1721,1725 ----
      'rdf_language' => "Feed Language",
      'syndication_max_headlines' => 'Max. Number of Headlines (portal blocks)',
!     'copyrightyear' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",

Index: german_formal_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/german_formal_utf-8.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** german_formal_utf-8.php	27 Jan 2008 10:53:03 -0000	1.42
--- german_formal_utf-8.php	24 Feb 2008 16:49:51 -0000	1.43
***************
*** 1700,1704 ****
      'rdf_language' => "RDF Language",
      'syndication_max_headlines' => "Maximum Headlines",
!     'copyright' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",
--- 1700,1704 ----
      'rdf_language' => "RDF Language",
      'syndication_max_headlines' => "Maximum Headlines",
!     'copyrightyear' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",

Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english.php,v
retrieving revision 1.330
retrieving revision 1.331
diff -C2 -d -r1.330 -r1.331
*** english.php	17 Feb 2008 08:52:40 -0000	1.330
--- english.php	24 Feb 2008 16:49:51 -0000	1.331
***************
*** 1721,1725 ****
      'rdf_language' => "Feed Language",
      'syndication_max_headlines' => 'Max. Number of Headlines (portal blocks)',
!     'copyright' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",
--- 1721,1725 ----
      'rdf_language' => "Feed Language",
      'syndication_max_headlines' => 'Max. Number of Headlines (portal blocks)',
!     'copyrightyear' => "Copyright Year",
      'image_lib' => "Image Library",
      'path_to_mogrify' => "Path to Mogrify",



From dhaun at qs1489.pair.com  Sun Feb 24 11:49:53 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 16:49:53 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mssql_1.4.1_to_1.5.0.php, 1.12,
	1.13 mysql_1.4.1_to_1.5.0.php, 1.66, 1.67
Message-ID: <20080224164953.E6F9D10FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv39288/sql/updates

Modified Files:
	mssql_1.4.1_to_1.5.0.php mysql_1.4.1_to_1.5.0.php 
Log Message:
Fixed variable name: 'copyright' -> 'copyrightyear'


Index: mssql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mssql_1.4.1_to_1.5.0.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mssql_1.4.1_to_1.5.0.php	21 Feb 2008 19:52:53 -0000	1.12
--- mssql_1.4.1_to_1.5.0.php	24 Feb 2008 16:49:51 -0000	1.13
***************
*** 211,215 ****
      $c->add('rdf_language','en-gb','text',0,26,NULL,1420,TRUE);
      $c->add('syndication_max_headlines',0,'text',0,26,NULL,1430,TRUE);
!     $c->add('copyright','2007','text',0,0,NULL,1440,FALSE);
      $c->add('image_lib','','select',5,27,10,1450,TRUE);
      $c->add('path_to_mogrify','','text',5,27,NULL,1460,FALSE);
--- 211,215 ----
      $c->add('rdf_language','en-gb','text',0,26,NULL,1420,TRUE);
      $c->add('syndication_max_headlines',0,'text',0,26,NULL,1430,TRUE);
!     $c->add('copyrightyear','2008','text',0,0,NULL,1440,FALSE);
      $c->add('image_lib','','select',5,27,10,1450,TRUE);
      $c->add('path_to_mogrify','','text',5,27,NULL,1460,FALSE);

Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** mysql_1.4.1_to_1.5.0.php	24 Feb 2008 15:41:51 -0000	1.66
--- mysql_1.4.1_to_1.5.0.php	24 Feb 2008 16:49:51 -0000	1.67
***************
*** 71,75 ****
      $c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
      $c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','text',0,0,NULL,510,TRUE);
!     $c->add('copyright','2007','text',0,0,NULL,1440,FALSE);
      $c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
  
--- 71,75 ----
      $c->add('microsummary_short','GL: ','text',0,0,NULL,80,TRUE);
      $c->add('site_disabled_msg','Geeklog Site is down. Please come back soon.','text',0,0,NULL,510,TRUE);
!     $c->add('copyrightyear','2008','text',0,0,NULL,1440,FALSE);
      $c->add('url_rewrite',FALSE,'select',0,0,1,1800,TRUE);
  



From dhaun at qs1489.pair.com  Sun Feb 24 12:07:10 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 17:07:10 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.28,
	1.29
Message-ID: <20080224170710.4A0E310FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv40824/system/classes

Modified Files:
	config.class.php 
Log Message:
Re-enabled help link (for the core config only, for the moment)


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** config.class.php	17 Feb 2008 08:54:33 -0000	1.28
--- config.class.php	24 Feb 2008 17:07:08 -0000	1.29
***************
*** 466,470 ****
              foreach ($params as $name => $e) {
                  $fs_contents .=
!                     $this->_UI_get_conf_element($name,
                                                 $e['display_name'],
                                                 $e['type'],
--- 466,470 ----
              foreach ($params as $name => $e) {
                  $fs_contents .=
!                     $this->_UI_get_conf_element($grp, $name,
                                                 $e['display_name'],
                                                 $e['type'],
***************
*** 534,539 ****
      }
  
!     function _UI_get_conf_element($name, $display_name, $type, $val,
!                                           $selectionArray = null , $deletable=0)
      {
          global $LANG_CONFIG;
--- 534,539 ----
      }
  
!     function _UI_get_conf_element($group, $name, $display_name, $type, $val,
!                                   $selectionArray = null , $deletable = 0)
      {
          global $LANG_CONFIG;
***************
*** 562,568 ****
          if ($deletable) {
              $t->set_var('delete', $t->parse('output', 'delete-button'));
!         } elseif (false) { // ??? } elseif ($this->ref == 'Core' ) {
!             $t->set_var('unset_link',
!                         "(<a href='#' onClick='unset(\"{$name}\");'>X</a>)");
              if (($a = strrchr($name, '[')) !== FALSE) {
                  $o = substr($a, 1, -1);
--- 562,568 ----
          if ($deletable) {
              $t->set_var('delete', $t->parse('output', 'delete-button'));
!         } else {
!             //$t->set_var('unset_link',
!             //            "(<a href='#' onClick='unset(\"{$name}\");'>X</a>)");
              if (($a = strrchr($name, '[')) !== FALSE) {
                  $o = substr($a, 1, -1);
***************
*** 576,582 ****
                      $baseUrl = 'http://www.geeklog.net';
                  }
!                 $t->set_var('doc_link',
!                             '(<a href="' . $baseUrl . '/docs/config.html#desc_'
!                             . $o . '" target="help">?</a>)');
              }
          }
--- 576,587 ----
                      $baseUrl = 'http://www.geeklog.net';
                  }
!                 if ($group == 'Core') {
!                     $descUrl = $baseUrl . '/docs/config.html#desc_' . $o;
!                     $t->set_var('doc_url', $descUrl);
!                     $t->set_var('doc_link',
!                             '(<a href="' . $descUrl . '" target="help">?</a>)');
!                 } else {
!                     // TBD: link to description of plugin option
!                 }
              }
          }
***************
*** 626,630 ****
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($name . '[' . $valkey . ']',
                                                        $display_name . '[' . $valkey . ']',
                                                        substr($type, 1), $valval, $selectionArray);
--- 631,635 ----
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($group, $name . '[' . $valkey . ']',
                                                        $display_name . '[' . $valkey . ']',
                                                        substr($type, 1), $valval, $selectionArray);
***************
*** 640,644 ****
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($name . '[' . $valkey . ']', $valkey,
                                                        substr($type, 1), $valval, $selectionArray, true);
              }
--- 645,649 ----
              $result = "";
              foreach ($val as $valkey => $valval) {
!                 $result .= config::_UI_get_conf_element($group, $name . '[' . $valkey . ']', $valkey,
                                                        substr($type, 1), $valval, $selectionArray, true);
              }



From dhaun at qs1489.pair.com  Sun Feb 24 14:43:55 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 19:43:55 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html usersettings.php, 1.170, 1.171
Message-ID: <20080224194355.BAB8510FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html
In directory qs1489.pair.com:/tmp/cvs-serv46118/public_html

Modified Files:
	usersettings.php 
Log Message:
Ease restriction that email addresses have to be unique to make handling of remote / OpenID accounts easier


Index: usersettings.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/usersettings.php,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** usersettings.php	20 Feb 2008 20:07:59 -0000	1.170
--- usersettings.php	24 Feb 2008 19:43:53 -0000	1.171
***************
*** 724,728 ****
  * @param   uid     int      user id of current user
  * @return          bool     true = exists, false = does not exist
! *
  */
  function emailAddressExists ($email, $uid)
--- 724,728 ----
  * @param   uid     int      user id of current user
  * @return          bool     true = exists, false = does not exist
! * @note    Allows remote accounts to have duplicate email addresses
  */
  function emailAddressExists ($email, $uid)
***************
*** 730,741 ****
      global $_TABLES;
  
!     $result = DB_query ("SELECT uid FROM {$_TABLES['users']} WHERE email = '{$email}'");
!     $numrows = DB_numRows ($result);
!     for ($i = 0; $i < $numrows; $i++) {
!         $A = DB_fetchArray ($result);
!         if ($A['uid'] != $uid) {
!             // email address is already in use for another account
!             return true;
!         }
      }
  
--- 730,744 ----
      global $_TABLES;
  
!     $old_email = DB_getItem($_TABLES['users'], 'email', "uid = '$uid'");
!     if ($email == $old_email) {
!         // email address didn't change so don't care
!         return false;
!     }
! 
!     $email = addslashes($email);
!     $result = DB_query("SELECT uid FROM {$_TABLES['users']} WHERE email = '$email' AND uid <> '$uid' AND (remoteservice IS NULL OR remoteservice = '')");
!     if (DB_numRows($result) > 0) {
!         // email address is already in use for another non-remote account
!         return true;
      }
  



From dhaun at qs1489.pair.com  Sun Feb 24 14:43:55 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 19:43:55 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin user.php,1.200,1.201
Message-ID: <20080224194355.D0C0910FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv46118/public_html/admin

Modified Files:
	user.php 
Log Message:
Ease restriction that email addresses have to be unique to make handling of remote / OpenID accounts easier


Index: user.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -d -r1.200 -r1.201
*** user.php	20 Feb 2008 20:07:58 -0000	1.200
--- user.php	24 Feb 2008 19:43:53 -0000	1.201
***************
*** 9,13 ****
  // | Geeklog user administration page.                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Geeklog user administration page.                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 470,474 ****
              } else {
                  $ucount = DB_getItem ($_TABLES['users'], 'COUNT(*)',
!                                   "username = '$uname' AND uid <> $uid AND (remoteservice = '' OR remoteservice is null)");
              }
          }
--- 470,474 ----
              } else {
                  $ucount = DB_getItem ($_TABLES['users'], 'COUNT(*)',
!                                   "username = '$uname' AND uid <> $uid AND (remoteservice = '' OR remoteservice IS NULL)");
              }
          }
***************
*** 478,492 ****
          }
  
!         $emailaddr = addslashes ($email);
!         if (empty ($uid)) {
!             $ucount = DB_getItem ($_TABLES['users'], 'COUNT(*)',
!                                   "email = '$emailaddr'");
          } else {
!             $ucount = DB_getItem ($_TABLES['users'], 'COUNT(*)',
!                                   "email = '$emailaddr' AND uid <> $uid");
          }
          if ($ucount > 0) {
              // Admin just changed a user's email to one that already exists
!             return edituser ($uid, 56);
          }
  
--- 478,500 ----
          }
  
!         $emailaddr = addslashes($email);
!         $exclude_remote = " AND (remoteservice IS NULL OR remoteservice = '')";
!         if (empty($uid)) {
!             $ucount = DB_getItem($_TABLES['users'], 'COUNT(*)',
!                                  "email = '$emailaddr'" . $exclude_remote);
          } else {
!             $old_email = DB_getItem($_TABLES['users'], 'email', "uid = '$uid'");
!             if ($old_email == $email) {
!                 // email address didn't change so don't care
!                 $ucount = 0;
!             } else {
!                 $ucount = DB_getItem($_TABLES['users'], 'COUNT(*)',
!                                      "email = '$emailaddr' AND uid <> $uid"
!                                      . $exclude_remote);
!             }
          }
          if ($ucount > 0) {
              // Admin just changed a user's email to one that already exists
!             return edituser($uid, 56);
          }
  



From dhaun at qs1489.pair.com  Sun Feb 24 14:43:55 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 19:43:55 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.607,1.608
Message-ID: <20080224194355.F23F010FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs
In directory qs1489.pair.com:/tmp/cvs-serv46118/public_html/docs

Modified Files:
	history 
Log Message:
Ease restriction that email addresses have to be unique to make handling of remote / OpenID accounts easier


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.607
retrieving revision 1.608
diff -C2 -d -r1.607 -r1.608
*** history	20 Feb 2008 20:27:25 -0000	1.607
--- history	24 Feb 2008 19:43:53 -0000	1.608
***************
*** 3,10 ****
  ??? ??, 2008 (1.5.0)
  ------------
  - Bug: Email user form doesn't display correctly with " in subject when sending
    is failed due to incomplete fields. [Mike]
! - Bugs: Ensure that site_url, site_admin_url, layout_url and xhtml available to all
!   templates. [Mike]
  - Support for [raw][/raw] tag in HTML post mode. All the benefits of code and
    pre, with none of the ugly styling. [Mike]
--- 3,12 ----
  ??? ??, 2008 (1.5.0)
  ------------
+ - Ease restriction that email addresses have to be unique: Remote accounts can
+   have non-unique addresses, on-site accounts can't [Dirk]
  - Bug: Email user form doesn't display correctly with " in subject when sending
    is failed due to incomplete fields. [Mike]
! - Bugs: Ensure that site_url, site_admin_url, layout_url and xhtml available to
!   all templates. [Mike]
  - Support for [raw][/raw] tag in HTML post mode. All the benefits of code and
    pre, with none of the ugly styling. [Mike]



From dhaun at qs1489.pair.com  Sun Feb 24 14:43:55 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 19:43:55 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin user.php,1.200,1.201
Message-ID: <20080224194355.D0C0910FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv46118/public_html/admin

Modified Files:
	user.php 
Log Message:
Ease restriction that email addresses have to be unique to make handling of remote / OpenID accounts easier


Index: user.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -d -r1.200 -r1.201
*** user.php	20 Feb 2008 20:07:58 -0000	1.200
--- user.php	24 Feb 2008 19:43:53 -0000	1.201
***************
*** 9,13 ****
  // | Geeklog user administration page.                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Geeklog user administration page.                                         |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 470,474 ****
              } else {
                  $ucount = DB_getItem ($_TABLES['users'], 'COUNT(*)',
!                                   "username = '$uname' AND uid <> $uid AND (remoteservice = '' OR remoteservice is null)");
              }
          }
--- 470,474 ----
              } else {
                  $ucount = DB_getItem ($_TABLES['users'], 'COUNT(*)',
!                                   "username = '$uname' AND uid <> $uid AND (remoteservice = '' OR remoteservice IS NULL)");
              }
          }
***************
*** 478,492 ****
          }
  
!         $emailaddr = addslashes ($email);
!         if (empty ($uid)) {
!             $ucount = DB_getItem ($_TABLES['users'], 'COUNT(*)',
!                                   "email = '$emailaddr'");
          } else {
!             $ucount = DB_getItem ($_TABLES['users'], 'COUNT(*)',
!                                   "email = '$emailaddr' AND uid <> $uid");
          }
          if ($ucount > 0) {
              // Admin just changed a user's email to one that already exists
!             return edituser ($uid, 56);
          }
  
--- 478,500 ----
          }
  
!         $emailaddr = addslashes($email);
!         $exclude_remote = " AND (remoteservice IS NULL OR remoteservice = '')";
!         if (empty($uid)) {
!             $ucount = DB_getItem($_TABLES['users'], 'COUNT(*)',
!                                  "email = '$emailaddr'" . $exclude_remote);
          } else {
!             $old_email = DB_getItem($_TABLES['users'], 'email', "uid = '$uid'");
!             if ($old_email == $email) {
!                 // email address didn't change so don't care
!                 $ucount = 0;
!             } else {
!                 $ucount = DB_getItem($_TABLES['users'], 'COUNT(*)',
!                                      "email = '$emailaddr' AND uid <> $uid"
!                                      . $exclude_remote);
!             }
          }
          if ($ucount > 0) {
              // Admin just changed a user's email to one that already exists
!             return edituser($uid, 56);
          }
  



From dhaun at qs1489.pair.com  Sun Feb 24 16:22:44 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 24 Feb 2008 21:22:44 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin group.php,1.98,1.99
Message-ID: <20080224212244.8236E10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv49917/public_html/admin

Modified Files:
	group.php 
Log Message:
Added a sanity check to prevent all groups from being deleted after a problem with multi-byte group names (reported by mystral_kk); needs more research ...


Index: group.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/group.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** group.php	25 Nov 2007 06:58:55 -0000	1.98
--- group.php	24 Feb 2008 21:22:42 -0000	1.99
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | group.php                                                                 |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | group.php                                                                 |
***************
*** 9,13 ****
  // | Geeklog group administration page.                                        |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Geeklog group administration page.                                        |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 473,476 ****
--- 473,486 ----
                       "$grp_id,'$grp_name','$grp_descr',$grp_gl_core");
              $new_group = false;
+         }
+ 
+         if (empty($grp_id) || ($grp_id < 1)) {
+             // "this shouldn't happen"
+             COM_errorLog("Internal error: invalid group id");
+             $retval .= COM_siteHeader('menu', $LANG_ACCESS['groupeditor']);
+             $retval .= COM_showMessage(95);
+             $retval .= COM_siteFooter();
+ 
+             return $retval;
          }
  



From mjervis at qs1489.pair.com  Fri Feb 29 03:22:55 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Fri, 29 Feb 2008 08:22:55 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/links index.php,
	1.55, 1.56
Message-ID: <20080229082255.0546210FE14@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links
In directory qs1489.pair.com:/tmp/cvs-serv4301/public_html/admin/plugins/links

Modified Files:
	index.php 
Log Message:
Security change refinement + implementation for other issues.

Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/links/index.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** index.php	13 Jan 2008 11:56:09 -0000	1.55
--- index.php	29 Feb 2008 08:22:52 -0000	1.56
***************
*** 54,57 ****
--- 54,58 ----
  require_once '../../../lib-common.php';
  require_once '../../auth.inc.php';
+ require_once $_CONF['path_system'] . 'lib-security.php';
  
  // Uncomment the lines below if you need to debug the HTTP variables being passed
***************
*** 366,385 ****
  
      $validate = '';
!     if (isset($_GET['validate'])) {
          $menu_arr[] = array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php',
              'text' => $LANG_LINKS_ADMIN[53]);
!         $dovalidate_url = $_CONF['site_admin_url'] . '/plugins/links/index.php?validate=validate';
          $dovalidate_text = $LANG_LINKS_ADMIN[58];
          $form_arr['top'] = COM_createLink($dovalidate_text, $dovalidate_url);
          if ($_GET['validate'] == 'enabled') {
              $header_arr[] = array('text' => $LANG_LINKS_ADMIN[27], 'field' => 'beforevalidate', 'sort' => false);
!             $validate = '?validate=enabled';
          } else if ($_GET['validate'] == 'validate'){
              $header_arr[] = array('text' => $LANG_LINKS_ADMIN[27], 'field' => 'dovalidate', 'sort' => false);
!             $validate = '?validate=validate';
          }
          $validate_help = $LANG_LINKS_ADMIN[59];
      } else {
!         $menu_arr[] = array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?validate=enabled',
                'text' => $LANG_LINKS_ADMIN[26]);
          $form_arr = array();
--- 367,388 ----
  
      $validate = '';
!     $token = SEC_createToken();
!     if (isset($_GET['validate']) && SEC_checkToken()) {
          $menu_arr[] = array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php',
              'text' => $LANG_LINKS_ADMIN[53]);
!         $dovalidate_url = $_CONF['site_admin_url'] . '/plugins/links/index.php?validate=validate'
!                           . '&amp;'.CSRF_TOKEN.'='.$token;
          $dovalidate_text = $LANG_LINKS_ADMIN[58];
          $form_arr['top'] = COM_createLink($dovalidate_text, $dovalidate_url);
          if ($_GET['validate'] == 'enabled') {
              $header_arr[] = array('text' => $LANG_LINKS_ADMIN[27], 'field' => 'beforevalidate', 'sort' => false);
!             $validate = '?validate=enabled&amp;'.CSRF_TOKEN.'='.$token;
          } else if ($_GET['validate'] == 'validate'){
              $header_arr[] = array('text' => $LANG_LINKS_ADMIN[27], 'field' => 'dovalidate', 'sort' => false);
!             $validate = '?validate=validate&amp;'.CSRF_TOKEN.'='.$token;
          }
          $validate_help = $LANG_LINKS_ADMIN[59];
      } else {
!         $menu_arr[] = array('url' => $_CONF['site_admin_url'] . '/plugins/links/index.php?validate=enabled&amp;'.CSRF_TOKEN.'='.$token,
                'text' => $LANG_LINKS_ADMIN[26]);
          $form_arr = array();



From mjervis at qs1489.pair.com  Fri Feb 29 03:22:54 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Fri, 29 Feb 2008 08:22:54 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin database.php, 1.45, 1.46
Message-ID: <20080229082254.EBAF410FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin
In directory qs1489.pair.com:/tmp/cvs-serv4301/public_html/admin

Modified Files:
	database.php 
Log Message:
Security change refinement + implementation for other issues.

Index: database.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/database.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** database.php	25 Nov 2007 06:58:55 -0000	1.45
--- database.php	29 Feb 2008 08:22:52 -0000	1.46
***************
*** 37,40 ****
--- 37,41 ----
  require_once '../lib-common.php';
  require_once 'auth.inc.php';
+ require_once $_CONF['path_system'] . 'lib-security.php';
  
  /**
***************
*** 112,116 ****
          $menu_arr = array(
              array('url' => $_CONF['site_admin_url']
!                            . '/database.php?mode=backup',
                    'text' => $LANG_ADMIN['create_new']),
              array('url' => $_CONF['site_admin_url'],
--- 113,117 ----
          $menu_arr = array(
              array('url' => $_CONF['site_admin_url']
!                            . '/database.php?mode=backup&'.CSRF_TOKEN.'='.SEC_createToken(),
                    'text' => $LANG_ADMIN['create_new']),
              array('url' => $_CONF['site_admin_url'],
***************
*** 285,289 ****
--- 286,292 ----
  if ($mode == 'backup') {
      // Perform the backup if asked
+     if (SEC_checkToken()) {
      $display .= dobackup();
+     }
  } else if ($mode == 'delete') {
      foreach ($_POST['delitem'] as $delfile) {



From mjervis at qs1489.pair.com  Fri Feb 29 03:22:55 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Fri, 29 Feb 2008 08:22:55 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-admin.php, 1.128,
	1.129 lib-security.php, 1.64, 1.65
Message-ID: <20080229082255.1C8F910FE15@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/system
In directory qs1489.pair.com:/tmp/cvs-serv4301/system

Modified Files:
	lib-admin.php lib-security.php 
Log Message:
Security change refinement + implementation for other issues.

Index: lib-security.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** lib-security.php	22 Feb 2008 08:22:42 -0000	1.64
--- lib-security.php	29 Feb 2008 08:22:53 -0000	1.65
***************
*** 74,77 ****
--- 74,82 ----
  define('USER_ACCOUNT_ACTIVE', 3); // active account
  
+ /* Constant for Security Token */
+ if (!defined('CSRF_TOKEN')) {
+     define('CSRF_TOKEN', '_glsectoken');
+ }
+ 
  /**
  * Returns the groups a user belongs to
***************
*** 1092,1099 ****
      $return = false; // Default to fail.
      
!     if(array_key_exists('token', $_GET)) {
!         $token = COM_applyFilter($_GET['token']);
!     } else if(array_key_exists('token', $_POST)) {
!         $token = COM_applyFilter($_POST['token']);
      }
      
--- 1097,1104 ----
      $return = false; // Default to fail.
      
!     if(array_key_exists(CSRF_TOKEN, $_GET)) {
!         $token = COM_applyFilter($_GET[CSRF_TOKEN]);
!     } else if(array_key_exists(CSRF_TOKEN, $_POST)) {
!         $token = COM_applyFilter($_POST[CSRF_TOKEN]);
      }
      

Index: lib-admin.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-admin.php,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** lib-admin.php	21 Feb 2008 19:52:53 -0000	1.128
--- lib-admin.php	29 Feb 2008 08:22:53 -0000	1.129
***************
*** 639,645 ****
                      $retval.="<img src=\"{$_CONF['layout_url']}/images/admin/$blockcontrol_image\" width=\"45\" height=\"20\" usemap=\"#arrow{$A['bid']}\" alt=\"\"" . XHTML . ">"
                              ."<map id=\"arrow{$A['bid']}\" name=\"arrow{$A['bid']}\">"
!                             ."<area coords=\"0,0,12,20\"  title=\"{$LANG21[58]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=up&amp;token={$token}\" alt=\"{$LANG21[58]}\"" . XHTML . ">"
!                             ."<area coords=\"13,0,29,20\" title=\"$moveTitleMsg\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=$switchside&amp;token={$token}\" alt=\"$moveTitleMsg\"" . XHTML . ">"
!                             ."<area coords=\"30,0,43,20\" title=\"{$LANG21[57]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=dn&amp;token={$token}\" alt=\"{$LANG21[57]}\"" . XHTML . ">"
                              ."</map>";
                  }
--- 639,645 ----
                      $retval.="<img src=\"{$_CONF['layout_url']}/images/admin/$blockcontrol_image\" width=\"45\" height=\"20\" usemap=\"#arrow{$A['bid']}\" alt=\"\"" . XHTML . ">"
                              ."<map id=\"arrow{$A['bid']}\" name=\"arrow{$A['bid']}\">"
!                             ."<area coords=\"0,0,12,20\"  title=\"{$LANG21[58]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=up&amp;".CSRF_TOKEN."={$token}\" alt=\"{$LANG21[58]}\"" . XHTML . ">"
!                             ."<area coords=\"13,0,29,20\" title=\"$moveTitleMsg\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=$switchside&amp;".CSRF_TOKEN."={$token}\" alt=\"$moveTitleMsg\"" . XHTML . ">"
!                             ."<area coords=\"30,0,43,20\" title=\"{$LANG21[57]}\" href=\"{$_CONF['site_admin_url']}/block.php?mode=move&amp;bid={$A['bid']}&amp;where=dn&amp;".CSRF_TOKEN."={$token}\" alt=\"{$LANG21[57]}\"" . XHTML . ">"
                              ."</map>";
                  }