From dhaun at qs1489.pair.com  Thu May  1 04:46:24 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 08:46:24 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install/language
	english.php, 1.8, 1.9 german.php, 1.4, 1.5
Message-ID: <20080501084624.BC6DD10FE14@qs1489.pair.com>

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

Modified Files:
	english.php german.php 
Log Message:
Added UTF-8 option (bug #0000610)


Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/language/english.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** english.php	29 Mar 2008 22:21:08 -0000	1.8
--- english.php	1 May 2008 08:46:22 -0000	1.9
***************
*** 142,146 ****
      89 => 'Current Version:',
      90 => 'Empty database?',
!     91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.'
  );
  
--- 142,147 ----
      89 => 'Current Version:',
      90 => 'Empty database?',
!     91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.',
!     92 => 'Use UTF-8'
  );
  

Index: german.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/language/german.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** german.php	2 Jan 2008 13:29:02 -0000	1.4
--- german.php	1 May 2008 08:46:22 -0000	1.5
***************
*** 142,150 ****
      89 => 'Aktuelle Version:',
      90 => 'Empty database?',
!     91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.'
  );
  
  // +---------------------------------------------------------------------------+
! // success.php (TBD)
  
  $LANG_SUCCESS = array(
--- 142,151 ----
      89 => 'Aktuelle Version:',
      90 => 'Empty database?',
!     91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.',
!     92 => 'Benutze UTF-8'
  );
  
  // +---------------------------------------------------------------------------+
! // success.php
  
  $LANG_SUCCESS = array(
***************
*** 174,178 ****
  
  // +---------------------------------------------------------------------------+
! // help.php (TBD)
  
  $LANG_HELP = array(
--- 175,179 ----
  
  // +---------------------------------------------------------------------------+
! // help.php
  
  $LANG_HELP = array(



From dhaun at qs1489.pair.com  Thu May  1 04:46:24 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 08:46:24 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.36,
	1.37
Message-ID: <20080501084624.ADA0110FE12@qs1489.pair.com>

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

Modified Files:
	index.php 
Log Message:
Added UTF-8 option (bug #0000610)


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** index.php	20 Apr 2008 08:26:50 -0000	1.36
--- index.php	1 May 2008 08:46:22 -0000	1.37
***************
*** 118,122 ****
  function INST_installEngine($install_type, $install_step)
  {
!     global $_CONF, $LANG_INSTALL, $_DB, $_TABLES, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language;
  
      switch ($install_step) {
--- 118,122 ----
  function INST_installEngine($install_type, $install_step)
  {
!     global $_CONF, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_TABLES, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language;
  
      switch ($install_step) {
***************
*** 170,173 ****
--- 170,181 ----
              $site_mail = isset($_POST['site_mail']) ? $_POST['site_mail'] : ($_CONF['site_mail'] == 'admin at example.com' ? $_CONF['site_mail'] : 'admin@' . $host_name);
              $noreply_mail = isset($_POST['noreply_mail']) ? $_POST['noreply_mail'] : ($_CONF['noreply_mail'] == 'noreply at example.com' ? $_CONF['noreply_mail'] : 'noreply@' . $host_name);
+             if (isset($_POST['utf8']) && ($_POST['utf8'] == 'on')) {
+                 $utf8 = true;
+             } else {
+                 $utf8 = false;
+                 if (strcasecmp($LANG_CHARSET, 'utf-8') == 0) {
+                     $utf8 = true;
+                 }
+             }
  
              if ($install_type == 'install') {
***************
*** 204,209 ****
                  <p><label>' . $LANG_INSTALL[47] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_admin_url" value="' . $site_admin_url . '" size="50"' . XHTML . '>  &nbsp; ' . $LANG_INSTALL[46] . '</p>
                  <p><label>' . $LANG_INSTALL[48] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_mail" value="' . $site_mail . '" size="50"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[49] . ' ' . INST_helpLink('') . '</label> <input type="text" name="noreply_mail" value="' . $noreply_mail . '" size="50"' . XHTML . '></p>
  
                  <br' . XHTML . '>
                  <input type="submit" name="submit" class="submit" value="' . $buttontext . ' &gt;&gt;"' . XHTML . '>
--- 212,223 ----
                  <p><label>' . $LANG_INSTALL[47] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_admin_url" value="' . $site_admin_url . '" size="50"' . XHTML . '>  &nbsp; ' . $LANG_INSTALL[46] . '</p>
                  <p><label>' . $LANG_INSTALL[48] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_mail" value="' . $site_mail . '" size="50"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[49] . ' ' . INST_helpLink('') . '</label> <input type="text" name="noreply_mail" value="' . $noreply_mail . '" size="50"' . XHTML . '></p>';
! 
!             if ($install_type == 'install') {
!                 $display .= '
!                     <p><label>' . $LANG_INSTALL[92] . ' ' . INST_helpLink('') . '</label> <input type="checkbox" name="utf8"' . ($utf8 ? ' checked="checked"' : '') . XHTML . '></p>';
!             }
  
+             $display .= '
                  <br' . XHTML . '>
                  <input type="submit" name="submit" class="submit" value="' . $buttontext . ' &gt;&gt;"' . XHTML . '>
***************
*** 213,217 ****
  
          /**
!          * Page 2 - Enter information into config.php
           * and ask about InnoDB tables (if supported)
           */
--- 227,231 ----
  
          /**
!          * Page 2 - Enter information into db-config.php
           * and ask about InnoDB tables (if supported)
           */
***************
*** 230,233 ****
--- 244,248 ----
              $site_mail = $_POST['site_mail'];
              $noreply_mail = $_POST['noreply_mail'];
+             $utf8 = (isset($_POST['utf8']) && ($_POST['utf8'] == 'on')) ? true : false;
  
              // If using MySQL check to make sure the version is supported
***************
*** 313,320 ****
                          $dbconfig_file = fopen($dbconfig_path, 'w');
                          if (!fwrite($dbconfig_file, $dbconfig_data)) {
!                             exit($LANG_INSTALL[26] . ' ' . $dbconfig_path . $LANG_INSTALL[58]);
                          }
                          fclose($dbconfig_file);
  
                          require $dbconfig_path;
                          require_once $siteconfig_path;
--- 328,342 ----
                          $dbconfig_file = fopen($dbconfig_path, 'w');
                          if (!fwrite($dbconfig_file, $dbconfig_data)) {
!                             exit($LANG_INSTALL[26] . ' ' . $dbconfig_path
!                                  . $LANG_INSTALL[58]);
                          }
                          fclose($dbconfig_file);
  
+                         // for the default charset, patch siteconfig.php again
+                         if (!INST_setDefaultCharset($siteconfig_path, $utf8)) {
+                             exit($LANG_INSTALL[26] . ' ' . $siteconfig_path
+                                  . $LANG_INSTALL[58]);
+                         }
+ 
                          require $dbconfig_path;
                          require_once $siteconfig_path;
***************
*** 328,331 ****
--- 350,356 ----
                                      . '&site_mail=' . urlencode($site_mail)
                                      . '&noreply_mail=' . urlencode($noreply_mail);
+                         if ($utf8) {
+                             $req_string .= '&utf8=true';
+                         }
  
                          switch ($install_type) {
***************
*** 340,344 ****
                                          <input type="hidden" name="site_admin_url" value="' . urlencode($site_admin_url) . '"' . XHTML . '>
                                          <input type="hidden" name="site_mail" value="' . urlencode($site_mail) . '"' . XHTML . '>
!                                         <input type="hidden" name="noreply_mail" value="' . urlencode($noreply_mail) . '"' . XHTML . '>';
  
                              // If using MySQL check to see if InnoDB is supported
--- 365,370 ----
                                          <input type="hidden" name="site_admin_url" value="' . urlencode($site_admin_url) . '"' . XHTML . '>
                                          <input type="hidden" name="site_mail" value="' . urlencode($site_mail) . '"' . XHTML . '>
!                                         <input type="hidden" name="noreply_mail" value="' . urlencode($noreply_mail) . '"' . XHTML . '>
!                                         <input type="hidden" name="utf8" value="' . ($utf8 ? 'true' : 'false') . '"' . XHTML . '>';
  
                              // If using MySQL check to see if InnoDB is supported
***************
*** 445,448 ****
--- 471,479 ----
                      }
  
+                     $utf8 = false;
+                     if ((isset($_POST['utf8']) && $_POST['utf8'] == 'true') || (isset($_GET['utf8']) && $_GET['utf8'] == 'true')) {
+                         $utf8 = true;
+                     }
+ 
                      // We need all this just to do one DB query
                      require_once $dbconfig_path;
***************
*** 519,524 ****
                              $config->set_default('default_photo', urldecode($site_url) . '/default.jpg');
  
!                             $charset = ''; // TBD: needs to be set ...
!                             $lng = INST_getDefaultLanguage($gl_path . 'language/', $language, $charset);
                              if (!empty($lng)) {
                                  $config->set('language', $lng);
--- 550,554 ----
                              $config->set_default('default_photo', urldecode($site_url) . '/default.jpg');
  
!                             $lng = INST_getDefaultLanguage($gl_path . 'language/', $language, $utf8);
                              if (!empty($lng)) {
                                  $config->set('language', $lng);
***************
*** 601,607 ****
   * server. If they aren't display a warning message.
   *
!  * @param   string  $dbconfig_path      Path to config.php
!  * @param   string  $siteconfig_path    Path to lib-common.php
!  * @return  boolean                     true if both files are writeable
   *
   */
--- 631,636 ----
   * server. If they aren't display a warning message.
   *
!  * @param   array   $files              list of files to check
!  * @return  boolean                     true if all files are writeable
   *
   */
***************
*** 617,620 ****
--- 646,650 ----
          }
      }
+ 
      return $writable;
  }
***************
*** 895,906 ****
  * @param    string  $langpath   path where the language files are kept
  * @param    string  $language   language used in the install script
! * @param    string  $charset    character set: UTF-8 or something else
  * @return   string              name of default language (for the config)
  *
  */
! function INST_getDefaultLanguage($langpath, $language, $charset = '')
  {
!     if (strcasecmp('UTF-8', $charset) == 0) {
!         $lngname = $language . '_' . strtolower($charset);
      } else {
          $lngname = $language;
--- 925,936 ----
  * @param    string  $langpath   path where the language files are kept
  * @param    string  $language   language used in the install script
! * @param    boolean $utf8       whether to use UTF-8
  * @return   string              name of default language (for the config)
  *
  */
! function INST_getDefaultLanguage($langpath, $language, $utf8 = false)
  {
!     if ($utf8) {
!         $lngname = $language . '_utf-8';
      } else {
          $lngname = $language;
***************
*** 910,915 ****
      if (!file_exists($langpath . $lngfile)) {
          // doesn't exist - fall back to English
!         if (strcasecmp('UTF-8', $charset) == 0) {
!             $lngname = 'english_' . strtolower($charset);
          } else {
              $lngname = 'english';
--- 940,945 ----
      if (!file_exists($langpath . $lngfile)) {
          // doesn't exist - fall back to English
!         if ($utf8) {
!             $lngname = 'english_utf-8';
          } else {
              $lngname = 'english';
***************
*** 1464,1467 ****
--- 1494,1537 ----
  
      return $disabled;
+ }
+ 
+ /**
+ * Change default character set to UTF-8
+ *
+ * @param   string   $siteconfig_path  complete path to siteconfig.php
+ * @param   boolen   $utf8             true: use UTF-8
+ * @return  boolean                    true: success; false: an error occured
+ * @note    Yes, this means that we need to patch siteconfig.php a second time.
+ *
+ */
+ function INST_setDefaultCharset($siteconfig_path, $utf8 = false)
+ {
+     global $LANG_CHARSET;
+ 
+     $result = true;
+ 
+     $siteconfig_file = fopen($siteconfig_path, 'r');
+     $siteconfig_data = fread($siteconfig_file, filesize($siteconfig_path));
+     fclose($siteconfig_file);
+ 
+     if ($utf8) {
+         $new_charset = 'utf-8';
+     } else {
+         $new_charset = $LANG_CHARSET;
+     }
+ 
+     require_once $siteconfig_path;
+ 
+     $siteconfig_data = str_replace("\$_CONF['default_charset'] = '{$_CONF['default_charset']}';",
+                                    "\$_CONF['default_charset'] = '{$new_charset}';",
+                                    $siteconfig_data);
+ 
+     $siteconfig_file = fopen($siteconfig_path, 'w');
+     if (!fwrite($siteconfig_file, $siteconfig_data)) {
+         $result = false;
+     }
+     @fclose($siteconfig_file);
+ 
+     return $result;
  }
  



From dhaun at qs1489.pair.com  Thu May  1 05:52:58 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 09:52:58 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install help.php, 1.3,
	1.4 index.php, 1.37, 1.38
Message-ID: <20080501095258.5CCF910FE12@qs1489.pair.com>

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

Modified Files:
	help.php index.php 
Log Message:
Added missing help links; moved InnoDB note to the help screen; cosmetics


Index: help.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/help.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** help.php	29 Mar 2008 22:17:47 -0000	1.3
--- help.php	1 May 2008 09:52:56 -0000	1.4
***************
*** 9,13 ****
  // | Support for Geeklog installation script.                                  |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Support for Geeklog installation script.                                  |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 87,124 ****
              <h1 class="heading">' . $LANG_HELP[0] . '</h1>
              <h2><a name="site_name">' . $LANG_INSTALL[32] . '</a></h2>
!             <p>' . $LANG_HELP[1] . '</p>
  
              <h2><a name="site_slogan">' . $LANG_INSTALL[33] . '</a></h2>
!             <p>' . $LANG_HELP[2] . '</p>
  
              <h2><a name="db_type">' . $LANG_INSTALL[34] . '</a></h2>
!             <p>' . $LANG_HELP[3] . '</p>
  
              <h2><a name="db_host">' . $LANG_INSTALL[39] . '</a></h2>
!             <p>' . $LANG_HELP[4] . '</p>
  
              <h2><a name="db_name">' . $LANG_INSTALL[40] . '</a></h2>
!             <p>' . $LANG_HELP[5] . '</p>
  
              <h2><a name="db_user">' . $LANG_INSTALL[41] . '</a></h2>
!             <p>' . $LANG_HELP[6] . '</p>
  
              <h2><a name="db_pass">' . $LANG_INSTALL[42] . '</a></h2>
!             <p>' . $LANG_HELP[7] . '</p>
  
              <h2><a name="db_prefix">' . $LANG_INSTALL[43] . '</a></h2>
!             <p>' . $LANG_HELP[8] . '</p>
  
              <h2><a name="site_url">' . $LANG_INSTALL[45] . '</a></h2>
!             <p>' . $LANG_HELP[9] . '</p>
  
              <h2><a name="site_admin_url">' . $LANG_INSTALL[47] . '</a></h2>
!             <p>' . $LANG_HELP[10] . '</p>
  
              <h2><a name="site_mail">' . $LANG_INSTALL[48] . '</a></h2>
!             <p>' . $LANG_HELP[11] . '</p>
  
              <h2><a name="noreply_mail">' . $LANG_INSTALL[49] . '</a></h2>
!             <p>' . $LANG_HELP[12] . '</p>
  
          </div>
--- 87,127 ----
              <h1 class="heading">' . $LANG_HELP[0] . '</h1>
              <h2><a name="site_name">' . $LANG_INSTALL[32] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[1] . '</p>
  
              <h2><a name="site_slogan">' . $LANG_INSTALL[33] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[2] . '</p>
  
              <h2><a name="db_type">' . $LANG_INSTALL[34] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[3] . '</p>
  
              <h2><a name="db_host">' . $LANG_INSTALL[39] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[4] . '</p>
  
              <h2><a name="db_name">' . $LANG_INSTALL[40] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[5] . '</p>
  
              <h2><a name="db_user">' . $LANG_INSTALL[41] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[6] . '</p>
  
              <h2><a name="db_pass">' . $LANG_INSTALL[42] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[7] . '</p>
  
              <h2><a name="db_prefix">' . $LANG_INSTALL[43] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[8] . '</p>
  
              <h2><a name="site_url">' . $LANG_INSTALL[45] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[9] . '</p>
  
              <h2><a name="site_admin_url">' . $LANG_INSTALL[47] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[10] . '</p>
  
              <h2><a name="site_mail">' . $LANG_INSTALL[48] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[11] . '</p>
  
              <h2><a name="noreply_mail">' . $LANG_INSTALL[49] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[12] . '</p>
! 
!             <h2><a name="utf8">' . $LANG_INSTALL[92] . '</a></h2>
!             <p class="indent">' . $LANG_HELP[13] . '</p>
  
          </div>
***************
*** 130,132 ****
  echo $display;
  
! ?>
\ No newline at end of file
--- 133,135 ----
  echo $display;
  
! ?>

Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** index.php	1 May 2008 08:46:22 -0000	1.37
--- index.php	1 May 2008 09:52:56 -0000	1.38
***************
*** 196,220 ****
  
                  <p><label>' . $LANG_INSTALL[32] . ' ' . INST_helpLink('site_name') . '</label> <input type="text" name="site_name" value="' . $site_name . '" size="40"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[33] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_slogan" value="' . $site_slogan . '" size="40"' . XHTML . '></p><br' . XHTML . '>
!                 <p><label>' . $LANG_INSTALL[34] . ' ' . INST_helpLink('') . '</label> <select name="db_type">
                      <option value="mysql"' . $mysql_selected . '>' . $LANG_INSTALL[35] . '</option>
                      ' . ($install_type == 'install' ? '<option value="mysql-innodb"' . $mysql_innodb_selected . '>' . $LANG_INSTALL[36] . '</option>' : '') . '
                      <option value="mssql"' . $mssql_selected . '>' . $LANG_INSTALL[37] . '</option></select> ' . $innodbnote . '</p>
!                 <p><label>' . $LANG_INSTALL[39] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_host" value="'. $db_host .'" size="20"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[40] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_name" value="'. $db_name . '" size="20"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[41] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_user" value="' . $db_user . '" size="20"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[42] . ' ' . INST_helpLink('') . '</label> <input type="password" name="db_pass" value="' . $db_pass . '" size="20"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[43] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_prefix" value="' . $db_prefix . '" size="20"' . XHTML . '></p>
  
                  <br' . XHTML . '>
                  <h2>' . $LANG_INSTALL[44] . '</h2>
!                 <p><label>' . $LANG_INSTALL[45] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_url" value="' . $site_url . '" size="50"' . XHTML . '>  &nbsp; ' . $LANG_INSTALL[46] . '</p>
!                 <p><label>' . $LANG_INSTALL[47] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_admin_url" value="' . $site_admin_url . '" size="50"' . XHTML . '>  &nbsp; ' . $LANG_INSTALL[46] . '</p>
!                 <p><label>' . $LANG_INSTALL[48] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_mail" value="' . $site_mail . '" size="50"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[49] . ' ' . INST_helpLink('') . '</label> <input type="text" name="noreply_mail" value="' . $noreply_mail . '" size="50"' . XHTML . '></p>';
  
              if ($install_type == 'install') {
                  $display .= '
!                     <p><label>' . $LANG_INSTALL[92] . ' ' . INST_helpLink('') . '</label> <input type="checkbox" name="utf8"' . ($utf8 ? ' checked="checked"' : '') . XHTML . '></p>';
              }
  
--- 196,220 ----
  
                  <p><label>' . $LANG_INSTALL[32] . ' ' . INST_helpLink('site_name') . '</label> <input type="text" name="site_name" value="' . $site_name . '" size="40"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[33] . ' ' . INST_helpLink('site_slogan') . '</label> <input type="text" name="site_slogan" value="' . $site_slogan . '" size="40"' . XHTML . '></p><br' . XHTML . '>
!                 <p><label>' . $LANG_INSTALL[34] . ' ' . INST_helpLink('db_type') . '</label> <select name="db_type">
                      <option value="mysql"' . $mysql_selected . '>' . $LANG_INSTALL[35] . '</option>
                      ' . ($install_type == 'install' ? '<option value="mysql-innodb"' . $mysql_innodb_selected . '>' . $LANG_INSTALL[36] . '</option>' : '') . '
                      <option value="mssql"' . $mssql_selected . '>' . $LANG_INSTALL[37] . '</option></select> ' . $innodbnote . '</p>
!                 <p><label>' . $LANG_INSTALL[39] . ' ' . INST_helpLink('db_host') . '</label> <input type="text" name="db_host" value="'. $db_host .'" size="20"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[40] . ' ' . INST_helpLink('db_name') . '</label> <input type="text" name="db_name" value="'. $db_name . '" size="20"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[41] . ' ' . INST_helpLink('db_user') . '</label> <input type="text" name="db_user" value="' . $db_user . '" size="20"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[42] . ' ' . INST_helpLink('db_pass') . '</label> <input type="password" name="db_pass" value="' . $db_pass . '" size="20"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[43] . ' ' . INST_helpLink('db_prefix') . '</label> <input type="text" name="db_prefix" value="' . $db_prefix . '" size="20"' . XHTML . '></p>
  
                  <br' . XHTML . '>
                  <h2>' . $LANG_INSTALL[44] . '</h2>
!                 <p><label>' . $LANG_INSTALL[45] . ' ' . INST_helpLink('site_url') . '</label> <input type="text" name="site_url" value="' . $site_url . '" size="50"' . XHTML . '>  &nbsp; ' . $LANG_INSTALL[46] . '</p>
!                 <p><label>' . $LANG_INSTALL[47] . ' ' . INST_helpLink('site_admin_url') . '</label> <input type="text" name="site_admin_url" value="' . $site_admin_url . '" size="50"' . XHTML . '>  &nbsp; ' . $LANG_INSTALL[46] . '</p>
!                 <p><label>' . $LANG_INSTALL[48] . ' ' . INST_helpLink('site_mail') . '</label> <input type="text" name="site_mail" value="' . $site_mail . '" size="50"' . XHTML . '></p>
!                 <p><label>' . $LANG_INSTALL[49] . ' ' . INST_helpLink('noreply_mail') . '</label> <input type="text" name="noreply_mail" value="' . $noreply_mail . '" size="50"' . XHTML . '></p>';
  
              if ($install_type == 'install') {
                  $display .= '
!                     <p><label>' . $LANG_INSTALL[92] . ' ' . INST_helpLink('utf8') . '</label> <input type="checkbox" name="utf8"' . ($utf8 ? ' checked="checked"' : '') . XHTML . '></p>';
              }
  



From dhaun at qs1489.pair.com  Thu May  1 05:52:58 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 09:52:58 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install/language
	english.php, 1.9, 1.10 german.php, 1.5, 1.6
Message-ID: <20080501095258.7828510FE14@qs1489.pair.com>

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

Modified Files:
	english.php german.php 
Log Message:
Added missing help links; moved InnoDB note to the help screen; cosmetics


Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/language/english.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** english.php	1 May 2008 08:46:22 -0000	1.9
--- english.php	1 May 2008 09:52:56 -0000	1.10
***************
*** 89,93 ****
      36 => 'MySQL with InnoDB Table support',
      37 => 'Microsoft SQL',
!     38 => 'InnoDB Tables may improve performance on (very) large sites, but they also make database backups more complicated.',
      39 => 'Database Hostname',
      40 => 'Database Name',
--- 89,93 ----
      36 => 'MySQL with InnoDB Table support',
      37 => 'Microsoft SQL',
!     38 => '',
      39 => 'Database Hostname',
      40 => 'Database Name',
***************
*** 181,185 ****
      1 => 'The name of your website.',
      2 => 'A simple description of your website.',
!     3 => 'Geeklog can be installed using either a MySQL or Microsoft SQL database. If you are not sure which option to select contact your hosting provider.',
      4 => 'The network name (or IP address) of your database server. This is typically "localhost". If you are not sure contact your hosting provider.',
      5 => 'The name of your database. If you are not sure what this is contact your hosting provider.',
--- 181,185 ----
      1 => 'The name of your website.',
      2 => 'A simple description of your website.',
!     3 => 'Geeklog can be installed using either a MySQL or Microsoft SQL database. If you are not sure which option to select contact your hosting provider.<br><br><strong>Note:</strong> InnoDB Tables may improve performance on (very) large sites, but they also make database backups more complicated.',
      4 => 'The network name (or IP address) of your database server. This is typically "localhost". If you are not sure contact your hosting provider.',
      5 => 'The name of your database. If you are not sure what this is contact your hosting provider.',
***************
*** 190,194 ****
      10 => 'Some hosting services have a preconfigured admin directory. In that case, you need to rename Geeklog\'s admin directory to something like "myadmin" and change the following URL as well. Leave as is until you experience any problems accessing Geeklog\'s admin menu.',
      11 => 'This is the return address for all email sent by Geeklog and contact info displayed in syndication feeds.',
!     12 => 'This is the sender\'s address of emails sent by the system when users register, etc. This should be either the same as Site Email or a bouncing address to prevent spammers from getting your email address by registering on the site. If this is NOT the same as above, there will be a message in sent messages that replying to those emails is recommended.'
  );
  
--- 190,195 ----
      10 => 'Some hosting services have a preconfigured admin directory. In that case, you need to rename Geeklog\'s admin directory to something like "myadmin" and change the following URL as well. Leave as is until you experience any problems accessing Geeklog\'s admin menu.',
      11 => 'This is the return address for all email sent by Geeklog and contact info displayed in syndication feeds.',
!     12 => 'This is the sender\'s address of emails sent by the system when users register, etc. This should be either the same as Site Email or a bouncing address to prevent spammers from getting your email address by registering on the site. If this is NOT the same as above, there will be a message in sent messages that replying to those emails is recommended.',
!     13 => 'Indicate whether to use UTF-8 as the default character set for your site. Recommended especially for multi-lingual setups.'
  );
  

Index: german.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/language/german.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** german.php	1 May 2008 08:46:22 -0000	1.5
--- german.php	1 May 2008 09:52:56 -0000	1.6
***************
*** 89,93 ****
      36 => 'MySQL mit Support f?r InnoDB-Tabellen',
      37 => 'Microsoft SQL',
!     38 => 'InnoDB-Tabellen k?nnen zu besserer Performance auf (sehr) gro?en Websites f?hren, machen den Backup-Prozess aber komplizierter.',
      39 => 'Datenbank-Server',
      40 => 'Name der Datenbank',
--- 89,93 ----
      36 => 'MySQL mit Support f?r InnoDB-Tabellen',
      37 => 'Microsoft SQL',
!     38 => '',
      39 => 'Datenbank-Server',
      40 => 'Name der Datenbank',
***************
*** 179,194 ****
  $LANG_HELP = array(
      0 => 'Geeklog Installation Support',
!     1 => 'Site name',
!     2 => 'Slogan',
!     3 => 'Database type',
!     4 => 'Hostname',
!     5 => 'Name',
!     6 => 'Username',
!     7 => 'Password',
!     8 => 'Prefix',
!     9 => 'Site URL',
!     10 => 'Admin Directory Url',
!     11 => 'Site Email',
!     12 => 'Site No-Reply'
  );
  
--- 179,195 ----
  $LANG_HELP = array(
      0 => 'Geeklog Installation Support',
!     1 => 'The name of your website.',
!     2 => 'A simple description of your website.',
!     3 => 'Geeklog can be installed using either a MySQL or Microsoft SQL database. If you are not sure which option to select contact your hosting provider.<br><br><strong>Hinweis:</strong> InnoDB-Tabellen k?nnen zu besserer Performance auf (sehr) gro?en Websites f?hren, machen den Backup-Prozess aber komplizierter.',
!     4 => 'The network name (or IP address) of your database server. This is typically "localhost". If you are not sure contact your hosting provider.',
!     5 => 'The name of your database. If you are not sure what this is contact your hosting provider.',
!     6 => 'Your database user account. If you are not sure what this is contact your hosting provider.',
!     7 => 'Your database account password. If you are not sure what this is contact your hosting provider.',
!     8 => 'Some users want to install multiple copies of Geeklog on the same database. In order for each copy of Geeklog to function correctly it must have its own unique table prefix (i.e. gl1_, gl2_, etc).',
!     9 => 'Make sure this is the correct URL to your site, i.e. to where Geeklog\'s <code>index.php</code> file resides (no trailing slash).',
!     10 => 'Some hosting services have a preconfigured admin directory. In that case, you need to rename Geeklog\'s admin directory to something like "myadmin" and change the following URL as well. Leave as is until you experience any problems accessing Geeklog\'s admin menu.',
!     11 => 'This is the return address for all email sent by Geeklog and contact info displayed in syndication feeds.',
!     12 => 'This is the sender\'s address of emails sent by the system when users register, etc. This should be either the same as Site Email or a bouncing address to prevent spammers from getting your email address by registering on the site. If this is NOT the same as above, there will be a message in sent messages that replying to those emails is recommended.',
!     13 => 'Indicate whether to use UTF-8 as the default character set for your site. Recommended especially for multi-lingual setups.'
  );
  



From dhaun at qs1489.pair.com  Thu May  1 05:52:58 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 09:52:58 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install/layout
	style.css, 1.4, 1.5
Message-ID: <20080501095258.7EB7710FE15@qs1489.pair.com>

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

Modified Files:
	style.css 
Log Message:
Added missing help links; moved InnoDB note to the help screen; cosmetics


Index: style.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/layout/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** style.css	25 Nov 2007 06:58:55 -0000	1.4
--- style.css	1 May 2008 09:52:56 -0000	1.5
***************
*** 368,370 ****
    font-family: "Monaco";
    font-size: 8pt;
! }
\ No newline at end of file
--- 368,373 ----
    font-family: "Monaco";
    font-size: 8pt;
! }
! .indent {
!   margin-left:1em;
! }



From dhaun at qs1489.pair.com  Thu May  1 07:51:28 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 11:51:28 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/webservices/atom index.php,
	1.3, 1.4
Message-ID: <20080501115128.4B42710FE14@qs1489.pair.com>

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

Modified Files:
	index.php 
Log Message:
Need to check the PHP version here (not in lib-webservices.php, where it's too late)


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/webservices/atom/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php	2 Jan 2008 14:40:22 -0000	1.3
--- index.php	1 May 2008 11:51:26 -0000	1.4
***************
*** 33,37 ****
  
  require_once '../../lib-common.php';
! require_once $_CONF['path_system'] . '/lib-webservices.php';
  
  /* Check if WS component is enabled */
--- 33,43 ----
  
  require_once '../../lib-common.php';
! 
! /* Check for PHP5 */
! if (PHP_VERSION < 5) {
!     $_CONF['disable_webservices'] = true;
! } else {
!     require_once $_CONF['path_system'] . '/lib-webservices.php';
! }
  
  /* Check if WS component is enabled */



From dhaun at qs1489.pair.com  Thu May  1 09:23:30 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 13:23:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.38,
	1.39
Message-ID: <20080501132330.95CCB10FE12@qs1489.pair.com>

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

Modified Files:
	index.php 
Log Message:
Handle $_CONF['default_charset'] for upgrades


Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** index.php	1 May 2008 09:52:56 -0000	1.38
--- index.php	1 May 2008 13:23:28 -0000	1.39
***************
*** 334,340 ****
  
                          // for the default charset, patch siteconfig.php again
!                         if (!INST_setDefaultCharset($siteconfig_path, $utf8)) {
!                             exit($LANG_INSTALL[26] . ' ' . $siteconfig_path
!                                  . $LANG_INSTALL[58]);
                          }
  
--- 334,343 ----
  
                          // for the default charset, patch siteconfig.php again
!                         if ($install_type != 'upgrade') {
!                             if (!INST_setDefaultCharset($siteconfig_path,
!                                     ($utf8 ? 'utf-8' : $LANG_CHARSET))) {
!                                 exit($LANG_INSTALL[26] . ' ' . $siteconfig_path
!                                      . $LANG_INSTALL[58]);
!                             }
                          }
  
***************
*** 628,633 ****
  
  /**
!  * Check to see if config.php and lib-common.php are writeable by the web
!  * server. If they aren't display a warning message.
   *
   * @param   array   $files              list of files to check
--- 631,635 ----
  
  /**
!  * Check to see if required files are writeable by the web server.
   *
   * @param   array   $files              list of files to check
***************
*** 639,643 ****
      $writable = true;
      foreach ($files as $file) {
!         if (!$tmp_file = @fopen ($file, 'a')) {
              // Unable to modify
              $writable = false;
--- 641,645 ----
      $writable = true;
      foreach ($files as $file) {
!         if (!$tmp_file = @fopen($file, 'a')) {
              // Unable to modify
              $writable = false;
***************
*** 1362,1365 ****
--- 1364,1374 ----
                      $config->set($key, $val);
                  }
+ 
+                 if (!INST_setDefaultCharset($siteconfig_path,
+                                             $_CONF['default_charset'])) {
+                     exit($LANG_INSTALL[26] . ' ' . $siteconfig_path
+                          . $LANG_INSTALL[58]);
+                 }
+ 
                  require $siteconfig_path;
                  require $dbconfig_path;
***************
*** 1500,1512 ****
  *
  * @param   string   $siteconfig_path  complete path to siteconfig.php
! * @param   boolen   $utf8             true: use UTF-8
  * @return  boolean                    true: success; false: an error occured
  * @note    Yes, this means that we need to patch siteconfig.php a second time.
  *
  */
! function INST_setDefaultCharset($siteconfig_path, $utf8 = false)
  {
-     global $LANG_CHARSET;
- 
      $result = true;
  
--- 1509,1519 ----
  *
  * @param   string   $siteconfig_path  complete path to siteconfig.php
! * @param   string   $charset          default character set to use
  * @return  boolean                    true: success; false: an error occured
  * @note    Yes, this means that we need to patch siteconfig.php a second time.
  *
  */
! function INST_setDefaultCharset($siteconfig_path, $charset)
  {
      $result = true;
  
***************
*** 1515,1529 ****
      fclose($siteconfig_file);
  
!     if ($utf8) {
!         $new_charset = 'utf-8';
!     } else {
!         $new_charset = $LANG_CHARSET;
!     }
! 
!     require_once $siteconfig_path;
! 
!     $siteconfig_data = str_replace("\$_CONF['default_charset'] = '{$_CONF['default_charset']}';",
!                                    "\$_CONF['default_charset'] = '{$new_charset}';",
!                                    $siteconfig_data);
  
      $siteconfig_file = fopen($siteconfig_path, 'w');
--- 1522,1531 ----
      fclose($siteconfig_file);
  
!     $siteconfig_data = preg_replace
!             (
!              '/\$_CONF\[\'default_charset\'\] = \'[^\']*\';/',
!              "\$_CONF['default_charset'] = '" . $charset . "';",
!              $siteconfig_data
!             );
  
      $siteconfig_file = fopen($siteconfig_path, 'w');



From dhaun at qs1489.pair.com  Thu May  1 11:43:18 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 15:43:18 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.691,1.692
Message-ID: <20080501154318.4DD8710FE12@qs1489.pair.com>

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

Modified Files:
	lib-common.php 
Log Message:
Revert earlier change - COM_showMessage should be restricted to fixed predefined messages


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.691
retrieving revision 1.692
diff -C2 -d -r1.691 -r1.692
*** lib-common.php	26 Apr 2008 17:58:37 -0000	1.691
--- lib-common.php	1 May 2008 15:43:16 -0000	1.692
***************
*** 4403,4408 ****
  * Displays a message on the webpage
  *
! * Receives either a message number and gets the according message from the
! * language file or gets a message in cleartext and displays it then to the user
  *
  * @param      int     $msg        ID of message to show
--- 4403,4408 ----
  * Displays a message on the webpage
  *
! * Pulls $msg off the URL string and gets the corresponding message and returns
! * it for display on the calling page
  *
  * @param      int     $msg        ID of message to show
***************
*** 4417,4444 ****
      $retval = '';
  
!     $timestamp = strftime( $_CONF['daytime'] );
!     if($msg > 0) {
!         if(!empty($plugin)) {
              $var = 'PLG_' . $plugin . '_MESSAGE' . $msg;
              global $$var;
!             if(isset($$var)) {
                  $message = $$var;
              } else {
!                 $message = sprintf( $MESSAGE[61], $plugin );
!                 COM_errorLog ($MESSAGE[61]. ": " . $var,1);
              }
          } else {
              $message = $MESSAGE[$msg];
          }
!     } else if (strlen($msg) > 0) {
!         $message = $msg;
      }
-     $retval .= COM_startBlock( $MESSAGE[40] . ' - ' . $timestamp, '',
-                        COM_getBlockTemplate( '_msg_block', 'header' ))
-         . '<p><img src="' . $_CONF['layout_url']
-         . '/images/sysmessage.' . $_IMAGE_TYPE . '" alt="" '
-         . 'style="padding-right:5px; padding-bottom:3px; border:none; float:left;"' . XHTML . '>'
-         . $message . '</p>'
-         . COM_endBlock( COM_getBlockTemplate( '_msg_block', 'footer' ));
  
      return $retval;
--- 4417,4443 ----
      $retval = '';
  
!     if ($msg > 0) {
!         $timestamp = strftime($_CONF['daytime']);
!         if (!empty($plugin)) {
              $var = 'PLG_' . $plugin . '_MESSAGE' . $msg;
              global $$var;
!             if (isset($$var)) {
                  $message = $$var;
              } else {
!                 $message = sprintf($MESSAGE[61], $plugin);
!                 COM_errorLog($MESSAGE[61] . ": " . $var, 1);
              }
          } else {
              $message = $MESSAGE[$msg];
          }
! 
!         $retval .= COM_startBlock($MESSAGE[40] . ' - ' . $timestamp, '',
!                                   COM_getBlockTemplate('_msg_block', 'header'))
!                 . '<p><img src="' . $_CONF['layout_url']
!                 . '/images/sysmessage.' . $_IMAGE_TYPE . '" alt="" '
!                 . 'style="padding-right:5px; padding-bottom:3px; border:none; float:left;"' . XHTML . '>'
!                 . $message . '</p>'
!                 . COM_endBlock(COM_getBlockTemplate('_msg_block', 'footer'));
      }
  
      return $retval;



From dhaun at qs1489.pair.com  Thu May  1 13:01:46 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 17:01:46 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-webservices.php,1.35,1.36
Message-ID: <20080501170146.055C510FE12@qs1489.pair.com>

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

Modified Files:
	lib-webservices.php 
Log Message:
It doesn't work, but I didn't want to lose the code: This is how WSSE authentication _would_ work if we had access to the user's _unencrypted_ password ...


Index: lib-webservices.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-webservices.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** lib-webservices.php	31 Mar 2008 20:03:23 -0000	1.35
--- lib-webservices.php	1 May 2008 17:01:43 -0000	1.36
***************
*** 718,722 ****
  function WS_authenticate()
  {
!     global $_CONF, $_USER, $_GROUPS, $_RIGHTS, $WS_VERBOSE;
  
      $uid = '';
--- 718,722 ----
  function WS_authenticate()
  {
!     global $_CONF, $_TABLES, $_USER, $_GROUPS, $_RIGHTS, $WS_VERBOSE;
  
      $uid = '';
***************
*** 733,736 ****
--- 733,797 ----
              COM_errorLog("WS: Attempting to log in user '$username'");
          }
+ 
+ /** this does not work! *******************************************************
+ 
+     } elseif (!empty($_SERVER['HTTP_X_WSSE']) &&
+             (strpos($_SERVER['HTTP_X_WSSE'], 'UsernameToken') !== false)) {
+ 
+         // this is loosely based on a code snippet taken from Elgg (elgg.org)
+ 
+         $wsse = str_replace('UsernameToken', '', $_SERVER['HTTP_X_WSSE']);
+         $wsse = explode(',', $wsse);
+ 
+         $username = '';
+         $pwdigest = '';
+         $created = '';
+         $nonce = '';
+ 
+         foreach ($wsse as $element) {
+             $element = explode('=', $element);
+             $key = array_shift($element);
+             if (count($element) == 1) {
+                 $val = $element[0];
+             } else {
+                 $val = implode('=', $element);
+             }
+             $key = trim($key);
+             $val = trim($val, "\x22\x27");
+             if ($key == 'Username') {
+                 $username = $val;
+             } elseif ($key == 'PasswordDigest') {
+                 $pwdigest = $val;
+             } elseif ($key == 'Created') {
+                 $created = $val;
+             } elseif ($key == 'Nonce') {
+                 $nonce = $val;
+             }
+         }
+ 
+         if (!empty($username) && !empty($pwdigest) && !empty($created) &&
+                 !empty($nonce)) {
+ 
+             $uname = addslashes($username);
+             $pwd = DB_getItem($_TABLES['users'], 'passwd',
+                               "username = '$uname'");
+             // ... and here we would need the _unencrypted_ password
+ 
+             if (!empty($pwd)) {
+                 $mydigest = pack('H*', sha1($nonce . $created . $pwd));
+                 $mydigest = base64_encode($mydigest);
+ 
+                 if ($pwdigest == $mydigest) {
+                     $password = $pwd;
+                 }   
+             }   
+         }
+ 
+         if ($WS_VERBOSE) {
+             COM_errorLog("WS: Attempting to log in user '$username' (via WSSE)");
+         }
+ 
+ ******************************************************************************/
+ 
      } elseif (!empty($_SERVER['REMOTE_USER'])) {
          /* PHP installed as CGI may not have access to authorization headers of



From dhaun at qs1489.pair.com  Thu May  1 13:23:43 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 17:23:43 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs install.html, 1.51,
	1.52 support.html, 1.23, 1.24
Message-ID: <20080501172343.6E4A010FE12@qs1489.pair.com>

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

Modified Files:
	install.html support.html 
Log Message:
Minor documentation updates


Index: install.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/install.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** install.html	29 Mar 2008 22:29:55 -0000	1.51
--- install.html	1 May 2008 17:23:41 -0000	1.52
***************
*** 16,25 ****
    <li><a href="#installation_requirements">Installation Requirements</a></li>
      <ul>
!       <li><a href="#required_software">Required Software</a></li>
        <li><a href="#things_you_should_know">Things You Should Know</a></li>
      </ul></li>
!   <li><a href="#new_installation">New Installation</a>
!   <li><a href="#upgrading">Upgrading</a>
!   <li><a href="#common_problems_and_troubleshooting">Common Problems and Troubleshooting</a></li>
  </ul>
  
--- 16,25 ----
    <li><a href="#installation_requirements">Installation Requirements</a></li>
      <ul>
!       <li><a href="#preinstall">Required Software</a></li>
        <li><a href="#things_you_should_know">Things You Should Know</a></li>
      </ul></li>
!   <li><a href="#install">New Installation</a>
!   <li><a href="#upgrade">Upgrading</a>
!   <li><a href="#installprob">Common Problems and Troubleshooting</a></li>
  </ul>
  
***************
*** 36,40 ****
  <h2><a name="installation_requirements">Installation Requirements</a></h2>
  
!     <h3><a name="required_software">Required Software</a></h3>
  
          <p>To install and use Geeklog you will need to have a server running Apache or Microsoft IIS with PHP 4.1.0 or higher installed. You will also need either <a href="http://dev.mysql.com/downloads/" target="_blank">MySQL 3.23.2</a> or greater or <a href="http://www.microsoft.com/sql/default.mspx" target="_blank">Microsoft SQL Server 2000</a> or newer.</p>
--- 36,40 ----
  <h2><a name="installation_requirements">Installation Requirements</a></h2>
  
!     <h3><a name="preinstall">Required Software</a></h3>
  
          <p>To install and use Geeklog you will need to have a server running Apache or Microsoft IIS with PHP 4.1.0 or higher installed. You will also need either <a href="http://dev.mysql.com/downloads/" target="_blank">MySQL 3.23.2</a> or greater or <a href="http://www.microsoft.com/sql/default.mspx" target="_blank">Microsoft SQL Server 2000</a> or newer.</p>
***************
*** 51,55 ****
      
  
! <h2><a name="new_installation">New Installation</a></h2>
  
      <ol>
--- 51,55 ----
      
  
! <h2><a name="install">New Installation</a></h2>
  
      <ol>
***************
*** 61,65 ****
              <p><code>tar -zxvf geeklog-1.5.0.tar.gz</code> </p>
              
!             <p><strong>Note:</strong> Some users have reported that WinZip corrupts certain Geeklog files during decompression. This will cause errors during the installation process. You are strongly urged not to use WinZip. Try <a href="http://www.rarlab.com/" target="_blank">WinRAR</a> if you must decompress the file locally.</p>
          </li>
          <li>
--- 61,65 ----
              <p><code>tar -zxvf geeklog-1.5.0.tar.gz</code> </p>
              
!             <p><strong>Note:</strong> Some users have reported that WinZip corrupts certain Geeklog files during decompression. This will cause errors during the installation process. You are strongly urged not to use WinZip. Try <a href="http://www.7-zip.org/" target="_blank">7-Zip</a> or <a href="http://www.rarlab.com/" target="_blank">WinRAR</a> if you must decompress the file locally.</p>
          </li>
          <li>
***************
*** 92,96 ****
     
  
! <h2><a name="upgrading">Upgrading</a></h2>
  
      <p>Upgrading is no different than a New Installation except your database already exists and needs to be updated.</p> 
--- 92,96 ----
     
  
! <h2><a name="upgrade">Upgrading</a></h2>
  
      <p>Upgrading is no different than a New Installation except your database already exists and needs to be updated.</p> 
***************
*** 109,113 ****
              <p><code>tar -zxvf geeklog-1.5.0.tar.gz</code> </p>
              
!             <p><strong>Note:</strong> Some users have reported that WinZip corrupts certain Geeklog files during decompression. This will cause errors during the installation process. You are strongly urged not to use WinZip. Try <a href="http://www.rarlab.com/" target="_blank">WinRAR</a> if you must decompress the file locally.</p>
          </li>
          <li>
--- 109,113 ----
              <p><code>tar -zxvf geeklog-1.5.0.tar.gz</code> </p>
              
!             <p><strong>Note:</strong> Some users have reported that WinZip corrupts certain Geeklog files during decompression. This will cause errors during the installation process. You are strongly urged not to use WinZip. Try <a href="http://www.7-zip.org/" target="_blank">7-Zip</a> or <a href="http://www.rarlab.com/" target="_blank">WinRAR</a> if you must decompress the file locally.</p>
          </li>
          <li>
***************
*** 127,131 ****
     
  
! <h2><a name="common_problems_and_troubleshooting">Common Problems and Troubleshooting</a></h2>
  
      <p>Before you go any further, please open siteconfig.php and <strong>double check your paths!</strong> Bad paths, or typos in the paths, will cause all sorts of errors in Geeklog.</p>   
--- 127,131 ----
     
  
! <h2><a name="installprob">Common Problems and Troubleshooting</a></h2>
  
      <p>Before you go any further, please open siteconfig.php and <strong>double check your paths!</strong> Bad paths, or typos in the paths, will cause all sorts of errors in Geeklog.</p>   
***************
*** 170,174 ****
                  <p>As noted at the top of this document this is usually caused by one of the following:</p>
                  <ul>
!                     <li>Uncompressing the tarball with certain versions of WinZip (try using <a href="http://www.rarlab.com/" target="_blank">WinRAR</a> instead)</li>
                      <li>Editing the lib-common.php with Dreamweaver or other so-called WYSIWYG HTML editors (use a simple text editor instead)</li>
                      <li>Editing the lib-common.php with "on-site" text editors built into tools like Cpanel (again, use a simple text editor instead)</li>
--- 170,174 ----
                  <p>As noted at the top of this document this is usually caused by one of the following:</p>
                  <ul>
!                     <li>Uncompressing the tarball with certain versions of WinZip (try using <a href="http://www.7-zip.org/" target="_blank">7-Zip</a> or <a href="http://www.rarlab.com/" target="_blank">WinRAR</a> instead)</li>
                      <li>Editing the lib-common.php with Dreamweaver or other so-called WYSIWYG HTML editors (use a simple text editor instead)</li>
                      <li>Editing the lib-common.php with "on-site" text editors built into tools like Cpanel (again, use a simple text editor instead)</li>

Index: support.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/support.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** support.html	24 Apr 2008 19:34:52 -0000	1.23
--- support.html	1 May 2008 17:23:41 -0000	1.24
***************
*** 61,65 ****
  <h2>Security Issues</h2>
  
! <p>The Geeklog developers take security very seriously. Should you need to report a security issue with Geeklog, please email details to <a href="mailto:geeklog-security at lists.geeklog.net">geeklog-security at lists.geeklog.net</a>. Thank you.</p>
  
  <p><strong>Note:</strong> Posts to geeklog-security are of course <em>not</em> discarded and you don't (and can't, actually) subscribe to this list. Simply send an email to this address and we will get back to you ASAP.</p>
--- 61,65 ----
  <h2>Security Issues</h2>
  
! <p>The Geeklog developers take security very seriously. Should you need to report a security issue with Geeklog, please email details to <a href="mailto:geeklog-security at lists.geeklog.net" rel="nofollow">geeklog-security(at)lists.geeklog.net</a>. Thank you.</p>
  
  <p><strong>Note:</strong> Posts to geeklog-security are of course <em>not</em> discarded and you don't (and can't, actually) subscribe to this list. Simply send an email to this address and we will get back to you ASAP.</p>



From mjervis at qs1489.pair.com  Thu May  1 14:35:16 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 01 May 2008 18:35:16 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql mssql_tableanddata.php,1.36,1.37
Message-ID: <20080501183516.DD72110FE14@qs1489.pair.com>

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

Modified Files:
	mssql_tableanddata.php 
Log Message:
Fixes for MSSQL install (Partial II)

Index: mssql_tableanddata.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mssql_tableanddata.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** mssql_tableanddata.php	26 Apr 2008 08:45:40 -0000	1.36
--- mssql_tableanddata.php	1 May 2008 18:35:14 -0000	1.37
***************
*** 1720,1725 ****
  set identity_insert {$_TABLES['users']} on
  
! INSERT INTO {$_TABLES['users']} (uid, username, fullname, passwd, email, homepage, sig, regdate, cookietimeout, theme, status) VALUES (1,'Anonymous','Anonymous','',NULL,NULL,'',getdate(),0,NULL,3)
! INSERT INTO {$_TABLES['users']} (uid, username, fullname, passwd, email, homepage, sig, regdate, cookietimeout, theme, status) VALUES (2,'Admin','Geeklog SuperUser','5f4dcc3b5aa765d61d8327deb882cf99','root at localhost','http://www.geeklog.net/','',getdate(),28800,NULL,3)
  
  set identity_insert {$_TABLES['users']} off
--- 1720,1725 ----
  set identity_insert {$_TABLES['users']} on
  
! INSERT INTO {$_TABLES['users']} (uid, username, fullname, passwd, email, homepage, sig, regdate, cookietimeout, theme, status, num_reminders) VALUES (1,'Anonymous','Anonymous','',NULL,NULL,'',getdate(),0,NULL,3,0)
! INSERT INTO {$_TABLES['users']} (uid, username, fullname, passwd, email, homepage, sig, regdate, cookietimeout, theme, status, num_reminders) VALUES (2,'Admin','Geeklog SuperUser','5f4dcc3b5aa765d61d8327deb882cf99','root at localhost','http://www.geeklog.net/','',getdate(),28800,NULL,3,0)
  
  set identity_insert {$_TABLES['users']} off



From mjervis at qs1489.pair.com  Thu May  1 14:35:16 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 01 May 2008 18:35:16 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin database.php, 1.46, 1.47
Message-ID: <20080501183516.D06CC10FE12@qs1489.pair.com>

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

Modified Files:
	database.php 
Log Message:
Fixes for MSSQL install (Partial II)

Index: database.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/database.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** database.php	29 Feb 2008 08:22:52 -0000	1.46
--- database.php	1 May 2008 18:35:14 -0000	1.47
***************
*** 287,291 ****
      // Perform the backup if asked
      if (SEC_checkToken()) {
!     $display .= dobackup();
      }
  } else if ($mode == 'delete') {
--- 287,291 ----
      // Perform the backup if asked
      if (SEC_checkToken()) {
!         $display .= dobackup();
      }
  } else if ($mode == 'delete') {



From mjervis at qs1489.pair.com  Thu May  1 14:35:16 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 01 May 2008 18:35:16 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.36,
	1.37
Message-ID: <20080501183516.EB66E10FE16@qs1489.pair.com>

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

Modified Files:
	config.class.php 
Log Message:
Fixes for MSSQL install (Partial II)

Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** config.class.php	13 Apr 2008 11:28:12 -0000	1.36
--- config.class.php	1 May 2008 18:35:14 -0000	1.37
***************
*** 281,285 ****
          if ($_DB_dbms == 'mssql') {
              $sql_query = str_replace("\\'","''",$sql_query);
!             $sql_query = str_replace('\\"','"',$sql_query);
              $_DB->dbQuery($sql_query, 0, 1);
          } else {
--- 281,285 ----
          if ($_DB_dbms == 'mssql') {
              $sql_query = str_replace("\\'","''",$sql_query);
!             $sql_query = str_replace('\\"','""',$sql_query);
              $_DB->dbQuery($sql_query, 0, 1);
          } else {



From dhaun at qs1489.pair.com  Thu May  1 15:23:49 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 19:23:49 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-security.php,1.67,1.68
Message-ID: <20080501192349.ED1B610FE12@qs1489.pair.com>

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

Modified Files:
	lib-security.php 
Log Message:
Sanitize service filename


Index: lib-security.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** lib-security.php	9 Mar 2008 10:23:13 -0000	1.67
--- lib-security.php	1 May 2008 19:23:47 -0000	1.68
***************
*** 813,816 ****
--- 813,817 ----
      }
  
+     $service = COM_sanitizeFilename($service);
      $servicefile = $_CONF['path_system'] . 'classes/authentication/' . $service
                   . '.auth.class.php';



From dhaun at qs1489.pair.com  Thu May  1 15:26:47 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 19:26:47 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes/authentication/ldap - New
	directory
Message-ID: <20080501192647.DC0E110FE12@qs1489.pair.com>

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

Log Message:
Directory /cvsroot/geeklog/Geeklog-1.x/system/classes/authentication/ldap added to the repository




From dhaun at qs1489.pair.com  Thu May  1 15:27:50 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 19:27:50 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes/authentication
	LDAP.auth.class.php, NONE, 1.1
Message-ID: <20080501192750.19A6110FE14@qs1489.pair.com>

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

Added Files:
	LDAP.auth.class.php 
Log Message:
LDAP remote authentication module, provided by Jessica Blank / MTV Networks


--- NEW FILE: LDAP.auth.class.php ---
<?php

/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
// | Geeklog 1.5                                                               |
// +---------------------------------------------------------------------------+
// | LDAP.auth.class.php                                                       |
// |                                                                           |
// | Geeklog Distributed Authentication Module.                                |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2008 by the following authors:                              |
// |                                                                           |
// | Authors: Jessica Blank   - jessica.blank AT mtvnmix DOT com               |
// |                            under contract to MTV Networks                 |
// +---------------------------------------------------------------------------+
// |                                                                           |
// | 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: LDAP.auth.class.php,v 1.1 2008/05/01 19:27:48 dhaun Exp $

/**
 * LDAP Remote Authentication class
 *
 * Be sure to edit system/classes/authentication/ldap/config.php first!
 *
 */

class LDAP
{
    function ascii2hex($ascii)
    {
        /* Adapted from function courtesy kuukelekuu at gmail dot com,
         * from http://www.thescripts.com/forum/thread519762.html
         */
        $hex = '';

        for ($i = 0; $i < strlen($ascii); $i++) {
            $byte = strtolower(dechex(ord($ascii{$i})));
            $byte = str_repeat('0', 2 - strlen($byte)) . $byte;
            $hex .= $byte;
        }

        return $hex;
    }

    function authenticate($username, $password)
    {
        global $_CONF;

        require_once $_CONF['path']
                     . 'system/classes/authentication/ldap/config.php';

        $link_identifier = ldap_connect($_LDAP_CONF['servers'][$_LDAP_CONF['server_num']]['host']);

        if ($link_identifier === false) {
            COM_errorLog("Can't connect to LDAP server "
                . $_LDAP_CONF['servers'][$_LDAP_CONF['server_num']]['host']);
            return false;
        } else {
            ldap_set_option($link_identifier, LDAP_OPT_PROTOCOL_VERSION, 3);

            $connected = @ldap_bind($link_identifier,
                $_LDAP_CONF['servers'][$_LDAP_CONF['server_num']]['bind_dn'],
                $_LDAP_CONF['servers'][$_LDAP_CONF['server_num']]['password']);
            if (!$connected) {
                COM_errorLog("Can't bind to LDAP directory: "
                             . ldap_error($link_identifier));
                return false;
            }
        }

        $filter = "uid=$username";
        $search_result = ldap_search($link_identifier, $_LDAP_CONF['branch'],
                                     $filter);
        $A = ldap_get_entries($link_identifier, $search_result);
        if ($A['count'] < 1) {
            return false; // The username was not found in the LDAP database.
        } else {
            /* By default, we assume passwords are crypted with traditional
             * DES crypt().
             */
            $crypt_method = 'des';
            $correct_cyphertext = $A[0]['userpassword'][0];

            if (preg_match("/^\{(crypt|des)\}(.*)$/i", $correct_cyphertext,
                    $tmpmatches)) {
                /* Yes, I know, we're being redundant -- in the interest of
                 * being verbose. This is just in case we ever change the
                 * defaults.
                 */
                $crypt_method = 'des';
                $correct_cyphertext = $tmpmatches[2];
            } else {
                if (preg_match("/^\{md5\}(.*)$/i", $correct_cyphertext,
                        $tmpmatches)) {
                    $crypt_method = 'md5'; // MD5 hash, no salt.
                    $correct_cyphertext = $tmpmatches[1];
                } else {
                    if (preg_match("/^{SMD5}(.*)$/i", $correct_cyphertext,
                            $tmpmatches)) {
                        $crypt_method = 'smd5'; // MD5 hash, with salt.
                        $orig_cyphertext = $tmpmatches[1];
                        $salted_hash = base64_decode($orig_cyphertext);
                        $salt = substr($salted_hash,16);
                        $without_salt = explode($salt, $salted_hash);
                        $correct_cyphertext = $this->ascii2hex($without_salt[0]);
                    } else { // assume no encryption
                        $crypt_method = '';
                        $correct_cyphertext = $password;
                    }
                }
            }

            switch ($crypt_method) {
            case 'md5':
                if (preg_match("/^\$/", $correct_cyphertext)) {
                    // passwd/style-shadow MD5, starting with '$'
	                $password_cyphertext = crypt($password);
                } else {
                    // hexadecimal MD5
	                $password_cyphertext = md5($password);
                }
                break;

            case 'smd5';
                // $salt was set above.
                $password_cyphertext = md5($password . $salt);
                break;

            case 'crypt':
            case 'des':
                $password_cyphertext = crypt($password,
                                             substr($correct_cyphertext, 0, 2));
                break;

            default: // no encryption at all!
                 $password_cyphertext = $password;
                 break;
            }

            if ($password_cyphertext == $correct_cyphertext) {
                // Set some variables pulled from the LDAP server...
                $this->fullname = $A[0]['cn'][0];
                $this->email    = $A[0]['mail'][0];

                return true; // Password given was CORRECT!
            } else {
                return false; // Password given was NOT correct.
            }
        }
    }
}

?>



From dhaun at qs1489.pair.com  Thu May  1 15:27:50 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 19:27:50 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes/authentication/ldap
	config.php, NONE, 1.1
Message-ID: <20080501192750.2800E10FE15@qs1489.pair.com>

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

Added Files:
	config.php 
Log Message:
LDAP remote authentication module, provided by Jessica Blank / MTV Networks


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

/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
// | Geeklog 1.5                                                               |
// +---------------------------------------------------------------------------+
// | config.php                                                                |
// |                                                                           |
// | LDAP configuration file.                                                  |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2008 by the following authors:                              |
// |                                                                           |
// | Authors: Jessica Blank     - jessica.blank AT mtvnmix DOT com             |
// |                              under contract to MTV Networks               |
// |          Evan Rappaport    - evan.rappaport AT mtvi DOT com               |
// +---------------------------------------------------------------------------+
// |                                                                           |
// | 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: config.php,v 1.1 2008/05/01 19:27:48 dhaun Exp $

global $_LDAP_CONF;

$_LDAP_CONF['version']            = '1.0.0'; // Module Version


// LDAP Settings

// Basic LDAP variables
$_LDAP_CONF['user_ou'] = "People";
$_LDAP_CONF['group_ou'] = "Group";
$_LDAP_CONF['branch'] = "dc=mydc,dc=com";
$_LDAP_CONF['user_branch'] = "ou={$_LDAP_CONF['user_ou']}," . $_LDAP_CONF['branch'];
$_LDAP_CONF['user_attributes'] = array("uid","cn","ou","objectClass","shadowLastChange","loginShell","uidnumber","gidNumber","homeDirectory","gecos","userPassword","givenName","sn","mail");

// LDAP server configuration
$_LDAP_CONF['servers'][0]['bind_dn'] = "cn=mycn,ou=LDAPusers,dc=mydc,dc=com";
$_LDAP_CONF['servers'][0]['password'] = "mypassword";
$_LDAP_CONF['servers'][0]['host'] = "localhost";

// (put additional servers here; example given below)
// $_LDAP_CONF['servers'][1]['bind_dn'] = 'cn=foo,ou=people,dc=corp,dc=com';
// $_LDAP_CONF['servers'][1]['password'] = 'joshua';
// $_LDAP_CONF['servers'][1]['host'] = 'ldap.example.com';

// LDAP server selection

/**
 * If you wanted to set up some complex logic to determine which
 * LDAP server is in use, this is where it would go.
 * We have provided the basic infrastructure for multiple LDAP servers;
 * the rest is left as an exercise for the user.
 */
$_LDAP_CONF['server_num'] = 0;


// Default user settings
$_LDAP_CONF['user_defaults']['ou'] = $_LDAP_CONF['user_ou'];
$_LDAP_CONF['user_defaults']['objectClass'] = array("account","posixAccount","top","shadowAccount","person","organizationalPerson","inetOrgPerson");
$_LDAP_CONF['user_defaults']['shadowLastChange'] = "0";
$_LDAP_CONF['user_defaults']['loginShell'] = "/etc/ftponly";

?>



From dhaun at qs1489.pair.com  Thu May  1 15:27:50 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 19:27:50 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.618,1.619
Message-ID: <20080501192750.0F6D510FE12@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:
LDAP remote authentication module, provided by Jessica Blank / MTV Networks


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.618
retrieving revision 1.619
diff -C2 -d -r1.618 -r1.619
*** history	26 Apr 2008 21:32:13 -0000	1.618
--- history	1 May 2008 19:27:47 -0000	1.619
***************
*** 12,15 ****
--- 12,16 ----
  
  Other changes:
+ - LDAP remote authentication module, provided by Jessica Blank / MTV Networks
  - The {lang_attribute} can only properly be set in a multi-language setup
    (bug #0000616) [Dirk]



From mjervis at qs1489.pair.com  Thu May  1 15:43:44 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 01 May 2008 19:43:44 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin story.php,1.266,1.267
Message-ID: <20080501194344.4DD5210FE15@qs1489.pair.com>

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

Modified Files:
	story.php 
Log Message:
Story security.

Index: story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/story.php,v
retrieving revision 1.266
retrieving revision 1.267
diff -C2 -d -r1.266 -r1.267
*** story.php	30 Dec 2007 12:15:47 -0000	1.266
--- story.php	1 May 2008 19:43:42 -0000	1.267
***************
*** 633,636 ****
--- 633,638 ----
      $story_templates->set_var('lang_cancel', $LANG_ADMIN['cancel']);
      $story_templates->set_var('lang_delete', $LANG_ADMIN['delete']);
+     $story_templates->set_var('gltoken_name', CSRF_TOKEN);
+     $story_templates->set_var('gltoken', SEC_createToken());
      $story_templates->parse('output','editor');
      $display .= $story_templates->finish($story_templates->get_var('output'));
***************
*** 721,730 ****
              COM_accessLog ("User {$_USER['username']} tried to illegally delete story submission $sid.");
              echo COM_refresh ($_CONF['site_admin_url'] . '/index.php');
!         } else {
              DB_delete ($_TABLES['storysubmission'], 'sid', $sid,
                         $_CONF['site_admin_url'] . '/moderation.php');
          }
!     } else {
          echo STORY_deleteStory ($sid);
      }
  } else if (($mode == $LANG_ADMIN['preview']) && !empty ($LANG_ADMIN['preview'])) {
--- 723,738 ----
              COM_accessLog ("User {$_USER['username']} tried to illegally delete story submission $sid.");
              echo COM_refresh ($_CONF['site_admin_url'] . '/index.php');
!         } else if (SEC_checkToken()) {
              DB_delete ($_TABLES['storysubmission'], 'sid', $sid,
                         $_CONF['site_admin_url'] . '/moderation.php');
+         } else {
+             COM_accessLog ("User {$_USER['username']} tried to illegally delete story submission $sid and failed CSRF checks.");
+             echo COM_refresh ($_CONF['site_admin_url'] . '/index.php');
          }
!     } else if (SEC_checkToken()) {
          echo STORY_deleteStory ($sid);
+     } else {
+         COM_accessLog ("User {$_USER['username']} tried to delete story and failed CSRF checks $sid.");
+         echo COM_refresh ($_CONF['site_admin_url'] . '/index.php');
      }
  } else if (($mode == $LANG_ADMIN['preview']) && !empty ($LANG_ADMIN['preview'])) {
***************
*** 760,764 ****
      $display .= COM_siteFooter();
      echo $display;
! } else if (($mode == $LANG_ADMIN['save']) && !empty ($LANG_ADMIN['save'])) {
      submitstory ();
  } else { // 'cancel' or no mode at all
--- 768,772 ----
      $display .= COM_siteFooter();
      echo $display;
! } else if (($mode == $LANG_ADMIN['save']) && !empty ($LANG_ADMIN['save']) && SEC_checkToken()) {
      submitstory ();
  } else { // 'cancel' or no mode at all



From mjervis at qs1489.pair.com  Thu May  1 15:43:44 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 01 May 2008 19:43:44 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.24, 1.25
Message-ID: <20080501194344.769DF10FE17@qs1489.pair.com>

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

Modified Files:
	story.class.php 
Log Message:
Story security.

Index: story.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** story.class.php	12 Apr 2008 19:28:41 -0000	1.24
--- story.class.php	1 May 2008 19:43:42 -0000	1.25
***************
*** 373,377 ****
              $this->_expire = $story['expireunix'];
          } else {
!             $this->_expire = '';
          }
  
--- 373,377 ----
              $this->_expire = $story['expireunix'];
          } else {
!             $this->_expire = '0';
          }
  
***************
*** 1508,1512 ****
                  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]');
--- 1508,1512 ----
                  while( $start_pos !== false ) {
                      /* Copy in to start to out */
!                     $out .= MBYTE_substr($inlower, 0, $start_pos);
                      /* Find end */
                      $end_pos = MBYTE_strpos($inlower, '[/raw]');
***************
*** 1542,1546 ****
                  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]');
--- 1542,1546 ----
                  while( $start_pos !== false ) {
                      /* Copy in to start to out */
!                     $out .= MBYTE_substr($inlower, 0, $start_pos);
                      /* Find end */
                      $end_pos = MBYTE_strpos($inlower, '[/code]');



From mjervis at qs1489.pair.com  Thu May  1 15:43:44 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 01 May 2008 19:43:44 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/story
	storyeditor.thtml, 1.20, 1.21 storyeditor_advanced.thtml, 1.31, 1.32
Message-ID: <20080501194344.6794A10FE12@qs1489.pair.com>

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

Modified Files:
	storyeditor.thtml storyeditor_advanced.thtml 
Log Message:
Story security.

Index: storyeditor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/story/storyeditor.thtml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** storyeditor.thtml	30 Dec 2007 12:16:37 -0000	1.20
--- storyeditor.thtml	1 May 2008 19:43:42 -0000	1.21
***************
*** 226,229 ****
--- 226,230 ----
                                              <input type="hidden" name="editopt" value="default"{xhtml}>
                                              <input type="hidden" name="hour_mode" value="{hour_mode}"{xhtml}>
+                                             <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
                                          </td>
                                      </tr>

Index: storyeditor_advanced.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/story/storyeditor_advanced.thtml,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** storyeditor_advanced.thtml	20 Jan 2008 08:37:41 -0000	1.31
--- storyeditor_advanced.thtml	1 May 2008 19:43:42 -0000	1.32
***************
*** 217,220 ****
--- 217,221 ----
              <input type="hidden" name="old_sid" value="{old_story_id}"{xhtml}>
              <input type="hidden" name="hour_mode" value="{hour_mode}"{xhtml}>
+             <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
          </div>
      </form>



From mjervis at qs1489.pair.com  Thu May  1 15:43:44 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Thu, 01 May 2008 19:43:44 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs theme.html,1.75,1.76
Message-ID: <20080501194344.5915010FE16@qs1489.pair.com>

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

Modified Files:
	theme.html 
Log Message:
Story security.

Index: theme.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** theme.html	24 Apr 2008 19:26:55 -0000	1.75
--- theme.html	1 May 2008 19:43:42 -0000	1.76
***************
*** 210,213 ****
--- 210,215 ----
  <ul>
      <li>admin/plugins/editor.thtml</li>
+     <li>admin/story/storyeditor.thtml</li>
+     <li>admin/story/storyeditor_advanced.thtml</li>
  </ul>
  



From dhaun at qs1489.pair.com  Thu May  1 16:10:40 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 20:10:40 +0000
Subject: [geeklog-cvs] tools/lm/include core.inc,1.1,1.2
Message-ID: <20080501201040.89D2010FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/tools/lm/include
In directory qs1489.pair.com:/tmp/cvs-serv8862/include

Modified Files:
	core.inc 
Log Message:
Special fix for a common URL mistake in some language files


Index: core.inc
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/include/core.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** core.inc	27 Apr 2008 17:11:13 -0000	1.1
--- core.inc	1 May 2008 20:10:38 -0000	1.2
***************
*** 32,35 ****
--- 32,48 ----
  // $Id$
  
+ /**
+ * Helper function: Fix URL in some language files
+ *
+ */
+ function Core_fix_storydenialmsg(&$access)
+ {
+     if (isset($access['storydenialmsg'])) {
+         $access['storydenialmsg'] = str_replace('<a href=users.php?mode=new>',
+                     '<a href="{$_CONF[\'site_url\']}/users.php?mode=new">',
+                     $access['storydenialmsg']);
+     }
+ }
+ 
  // save the english text strings
  $ENG01 = $LANG01;
***************
*** 161,164 ****
--- 174,178 ----
  
  mergeArrays($ENGMS,  $MESSAGE, 'MESSAGE', 'confirmation and error messages');
+ Core_fix_storydenialmsg($LANG_ACCESS);
  mergeArrays($ENGAC,  $LANG_ACCESS, 'LANG_ACCESS');
  mergeArrays($ENGDB,  $LANG_DB_BACKUP, 'LANG_DB_BACKUP', 'admin/database.php');



From dhaun at qs1489.pair.com  Thu May  1 17:01:49 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 21:01:49 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-story.php,1.124,1.125
Message-ID: <20080501210149.E7B9710FE12@qs1489.pair.com>

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

Modified Files:
	lib-story.php 
Log Message:
Fixes for E_ALL


Index: lib-story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-story.php,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** lib-story.php	20 Feb 2008 20:23:00 -0000	1.124
--- lib-story.php	1 May 2008 21:01:47 -0000	1.125
***************
*** 1036,1040 ****
      }
  
!     $gl_edit = $args['gl_edit'];
      if ($gl_edit) {
          /* This is EDIT mode, so there should be an old sid */
--- 1036,1043 ----
      }
  
!     $gl_edit = false;
!     if (isset($args['gl_edit'])) {
!         $gl_edit = $args['gl_edit'];
!     }
      if ($gl_edit) {
          /* This is EDIT mode, so there should be an old sid */
***************
*** 1061,1067 ****
      }
  
      if (!empty($args['content'])) {
          $content = $args['content'];
!     } else {
          $content = $args['summary'];
      }   
--- 1064,1071 ----
      }
  
+     $content = '';
      if (!empty($args['content'])) {
          $content = $args['content'];
!     } else if (!empty($args['summary'])) {
          $content = $args['summary'];
      }   
***************
*** 1184,1188 ****
      $story = new Story();
  
!     if ($args['gl_edit'] && !empty($args['gl_etag'])) {
          /* First load the original story to check if it has been modified */
          $result = $story->loadFromDatabase($args['sid']);
--- 1188,1196 ----
      $story = new Story();
  
!     $gl_edit = false;
!     if (isset($args['gl_edit'])) {
!         $gl_edit = $args['gl_edit'];
!     }
!     if ($gl_edit && !empty($args['gl_etag'])) {
          /* First load the original story to check if it has been modified */
          $result = $story->loadFromDatabase($args['sid']);



From dhaun at qs1489.pair.com  Thu May  1 17:08:33 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 21:08:33 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install/language
	english.php, 1.10, 1.11
Message-ID: <20080501210833.7C12210FE12@qs1489.pair.com>

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

Modified Files:
	english.php 
Log Message:
Typo


Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/language/english.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** english.php	1 May 2008 09:52:56 -0000	1.10
--- english.php	1 May 2008 21:08:31 -0000	1.11
***************
*** 73,77 ****
      20 => 'Warning!',
      21 => 'Your Geeklog and site will not work properly until the errors listed above are corrected. Not following this step is the #1 reason why people receive errors when they first try to use Geeklog. Please make the necessary changes before you continue.',
!     22 => 'unkown',
      23 => 'Choose your installation method:',
      24 => 'New Install',
--- 73,77 ----
      20 => 'Warning!',
      21 => 'Your Geeklog and site will not work properly until the errors listed above are corrected. Not following this step is the #1 reason why people receive errors when they first try to use Geeklog. Please make the necessary changes before you continue.',
!     22 => 'unknown',
      23 => 'Choose your installation method:',
      24 => 'New Install',



From dhaun at qs1489.pair.com  Thu May  1 17:09:02 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Thu, 01 May 2008 21:09:02 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install/language
	german.php, 1.6, 1.7
Message-ID: <20080501210902.8CE9610FE16@qs1489.pair.com>

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

Modified Files:
	german.php 
Log Message:
Translated some texts - still far from done


Index: german.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/language/german.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** german.php	1 May 2008 09:52:56 -0000	1.6
--- german.php	1 May 2008 21:09:00 -0000	1.7
***************
*** 56,69 ****
      2 => 'Zuverl?ssigkeit eingebaut',
      3 => 'Geeklog-Installation',
!     4 => 'PHP 4.1.0 required',
!     5 => 'Sorry, but Geeklog requires at least PHP 4.1.0 to run (you have version ',
!     6 => '). Please <a href="http://www.php.net/downloads.php">upgrade your PHP</a> install or ask your hosting service to do it for you.',
!     7 => 'Unable to locate Geeklog files',
!     8 => 'The installation script was unable to locate critical Geeklog files. This is probably because you have moved them from their default location. Please specify the paths to the files and directories below:',
      9 => 'Willkommen und Danke, dass Du Geeklog gew?hlt hast!',
!     10 => 'File/Directory',
!     11 => 'Permissions',
!     12 => 'Change to',
!     13 => 'Currently',
      14 => 'Change directory to',
      15 => 'Export of Geeklog headlines is switched off. The <code>backend</code> directory was not tested',
--- 56,69 ----
      2 => 'Zuverl?ssigkeit eingebaut',
      3 => 'Geeklog-Installation',
!     4 => 'PHP 4.1.0 ben?tigt',
!     5 => 'Sorry, Geeklog ben?tigt mindestens PHP 4.1.0 (Du hast Version '),
!     6 => '). Bitte <a href="http://www.php.net/downloads.php">aktualisiere Deine PHP-Installation</a> oder bitte Deinen Hosting-Provider darum.',
!     7 => 'Geeklog-Dateien nicht gefunden',
!     8 => 'Das Installations-Skript hat einige wichtige Geeklog-Dateien nicht gefunden. Wahrscheinlich hast Du diese in andere Verzeichnisse verschoben. Bitte gib hier die Pfade zu den Dateien und Verzeichnissen an:',
      9 => 'Willkommen und Danke, dass Du Geeklog gew?hlt hast!',
!     10 => 'Datei/Verzeichnis',
!     11 => 'Zugriffsrechte',
!     12 => '?ndern auf',
!     13 => 'Derzeit',
      14 => 'Change directory to',
      15 => 'Export of Geeklog headlines is switched off. The <code>backend</code> directory was not tested',
***************
*** 71,77 ****
      18 => 'Images in articles are disabled. The <code>articles</code> directory was not tested',
      19 => 'Geeklog requires certain files and directories to be writeable by the web server. Below is a list of which files and directories need to be changed.',
!     20 => 'Warning!',
      21 => 'Your Geeklog and site will not work properly until the errors listed above are corrected. Please make the necessary changes before you continue.',
!     22 => 'unkown',
      23 => 'Bitte w?hle eine Installationsmethode:',
      24 => 'Neuinstallation',
--- 71,77 ----
      18 => 'Images in articles are disabled. The <code>articles</code> directory was not tested',
      19 => 'Geeklog requires certain files and directories to be writeable by the web server. Below is a list of which files and directories need to be changed.',
!     20 => 'Warnung!',
      21 => 'Your Geeklog and site will not work properly until the errors listed above are corrected. Please make the necessary changes before you continue.',
!     22 => 'unbekannt',
      23 => 'Bitte w?hle eine Installationsmethode:',
      24 => 'Neuinstallation',
***************
*** 110,114 ****
      57 => 'Sorry, but the installer could not find the database you specified. Either the database does not exist or you misspelled the name. Please go back and try again.',
      58 => '. Did you make sure the file is write-able by the web server?',
!     59 => 'Notice:',
      60 => 'InnoDB tables are not supported by your version of MySQL. Would you like to continue the installation without InnoDB support?',
      61 => 'zur?ck',
--- 110,114 ----
      57 => 'Sorry, but the installer could not find the database you specified. Either the database does not exist or you misspelled the name. Please go back and try again.',
      58 => '. Did you make sure the file is write-able by the web server?',
!     59 => 'Hinweis:',
      60 => 'InnoDB tables are not supported by your version of MySQL. Would you like to continue the installation without InnoDB support?',
      61 => 'zur?ck',
***************
*** 141,145 ****
      88 => 'Change directory and containing files to',
      89 => 'Aktuelle Version:',
!     90 => 'Empty database?',
      91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.',
      92 => 'Benutze UTF-8'
--- 141,145 ----
      88 => 'Change directory and containing files to',
      89 => 'Aktuelle Version:',
!     90 => 'Leere Datenbank?',
      91 => 'It appears that either your database is empty or the database credentials you entered are incorrect. Or maybe you wanted to perform a New Install (instead of an Upgrade)? Please go back and try again.',
      92 => 'Benutze UTF-8'



From dhaun at qs1489.pair.com  Fri May  2 07:32:11 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 11:32:11 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mssql_1.4.1_to_1.5.0.php, 1.14,
	1.15
Message-ID: <20080502113211.E001E10FE12@qs1489.pair.com>

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

Modified Files:
	mssql_1.4.1_to_1.5.0.php 
Log Message:
Copied the code to initialize the config over from the MySQL file - the rest of the file is still incomplete


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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mssql_1.4.1_to_1.5.0.php	8 Mar 2008 21:53:34 -0000	1.14
--- mssql_1.4.1_to_1.5.0.php	2 May 2008 11:32:09 -0000	1.15
***************
*** 51,55 ****
  function create_ConfValues()
  {
!     global $_TABLES;
      // Create conf_values table for new configuration system
      DB_query ("
--- 51,56 ----
  function create_ConfValues()
  {
!     global $_CONF, $_TABLES;
! 
      // Create conf_values table for new configuration system
      DB_query ("
***************
*** 66,257 ****
          ON [PRIMARY]
          ");
!         require_once($_CONF['path_system'] . 'classes/config.class.php');
  
      $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',0,'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','text',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',7,9,1,340,TRUE);
!     $c->add('language','english','text',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','text',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_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',0,'text',7,13,NULL,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,0,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,'text',4,17,NULL,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','text',3,18,NULL,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',3,20,0,930,TRUE);
!     $c->add('emailstorieslength',1,'text',3,20,NULL,940,TRUE);
!     $c->add('emailstoriesperdefault',0,'select',3,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('pingback_enabled',TRUE,'select',1,23,1,1070,TRUE);
!     $c->add('ping_enabled',TRUE,'select',1,23,1,1080,TRUE);
!     $c->add('trackback_code',0,'select',1,22,3,1090,TRUE);
!     $c->add('multiple_trackbacks',0,'select',1,22,2,1100,TRUE);
!     $c->add('trackbackspeedlimit',300,'text',1,22,NULL,1110,TRUE);
!     $c->add('check_trackback_link',2,'select',1,22,4,1120,TRUE);
!     $c->add('pingback_self',0,'select',1,23,13,1130,TRUE);
!     $c->add('pingback_excerpt',TRUE,'select',1,23,1,1140,TRUE);
!     $c->add('link_documentation',1,'select',7,9,0,1150,TRUE);
!     $c->add('link_versionchecker',1,'select',7,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','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);
!     $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('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);
!     $c->add('path_to_netpbm','','text',5,27,NULL,1470,FALSE);
!     $c->add('debug_image_upload',FALSE,'select',5,28,1,1480,FALSE);
!     $c->add('keep_unscaled_image',0,'select',5,28,0,1490,TRUE);
!     $c->add('allow_user_scaling',1,'select',5,28,0,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,0,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);
  }
  
--- 67,365 ----
          ON [PRIMARY]
          ");
! 
!     require_once $_CONF['path_system'] . 'classes/config.class.php';
  
      $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('copyrightyear','2008','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','select',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',FALSE,'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','select',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  Fri May  2 07:44:35 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 11:44:35 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/pear README,1.3,1.4
Message-ID: <20080502114435.44A3A10FE12@qs1489.pair.com>

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

Modified Files:
	README 
Log Message:
Updated PEAR README


Index: README
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/pear/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** README	11 Feb 2006 12:28:43 -0000	1.3
--- README	2 May 2008 11:44:33 -0000	1.4
***************
*** 1,12 ****
  This directory contains the PEAR packages that are needed by Geeklog. If you
! don't have PEAR installed on your webserver, simply set
! 
!      $_CONF['have_pear'] = false;
! 
! in config.php and Geeklog will pick up the PEAR packages from here.
  
  Currently, Geeklog uses the following PEAR packages:
  
  - PEAR
  - HTTP_Request
  - Mail
--- 1,11 ----
  This directory contains the PEAR packages that are needed by Geeklog. If you
! don't have PEAR installed on your webserver, simply set the "Have Pear?" option
! in the configutation to "False" and Geeklog will pick up the PEAR packages from
! here.
  
  Currently, Geeklog uses the following PEAR packages:
  
  - PEAR
+ - Date
  - HTTP_Request
  - Mail
***************
*** 15,18 ****
--- 14,18 ----
  - Net_URL
  - PHP_Compat
+ - Text_Wiki
  - XML_RPC
  



From dhaun at qs1489.pair.com  Fri May  2 08:08:09 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 12:08:09 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/calendar/sql mssql_install.php,
	1.4, 1.5 mysql_install.php, 1.2, 1.3
Message-ID: <20080502120809.DB1E210FE12@qs1489.pair.com>

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

Modified Files:
	mssql_install.php mysql_install.php 
Log Message:
An attempt to update the MS SQL for the plugin installs (and no, I don't know what I'm doing ...)


Index: mssql_install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/sql/mssql_install.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mssql_install.php	27 Jan 2008 15:23:33 -0000	1.4
--- mssql_install.php	2 May 2008 12:08:07 -0000	1.5
***************
*** 7,11 ****
  // | Installation SQL                                                          |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 7,11 ----
  // | Installation SQL                                                          |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 13,17 ****
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity AT steubentech DOT com               |
  // |          Randy Kolenko     - randy AT nextide DOT ca                      |
  // +---------------------------------------------------------------------------+
--- 13,17 ----
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity93 AT gmail DOT com                   |
  // |          Randy Kolenko     - randy AT nextide DOT ca                      |
  // +---------------------------------------------------------------------------+
***************
*** 34,38 ****
  // $Id$
  
- 
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['events']}] (
--- 34,37 ----
***************
*** 137,142 ****
  ";
  
  
- $_SQL[] = "INSERT INTO {$_TABLES['eventsubmission']} (eid, title, description, location, datestart, dateend, url, allday, zipcode, state, city, address2, address1, event_type, timestart, timeend) VALUES ('2006051410130162','Installed the Calendar plugin','Today, you successfully installed the Calendar plugin.','Your webserver',getdate(),getdate(),'http://www.geeklog.net/',1,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL)";
  $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'events_block','phpblock','Events','all',4,'',1,'phpblock_calendar',{$_USER['uid']},#group#,3,3)";
  
--- 136,141 ----
  ";
  
+ $_SQL[] = "INSERT INTO {$_TABLES['eventsubmission']} (eid, title, description, location, datestart, dateend, url, allday, zipcode, state, city, address2, address1, event_type, timestart, timeend) VALUES ('2008050110130162','Installed the Calendar plugin','Today, you successfully installed the Calendar plugin.','Your webserver',getdate(),getdate(),'http://www.geeklog.net/',1,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL)";
  
  $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'events_block','phpblock','Events','all',4,'',1,'phpblock_calendar',{$_USER['uid']},#group#,3,3)";
  

Index: mysql_install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/sql/mysql_install.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mysql_install.php	27 Jan 2008 15:23:33 -0000	1.2
--- mysql_install.php	2 May 2008 12:08:07 -0000	1.3
***************
*** 13,17 ****
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity AT steubentech DOT com               |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 13,17 ----
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity93 AT gmail DOT com                   |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 119,123 ****
  ";
  
! $_SQL[] = "INSERT INTO {$_TABLES['eventsubmission']} (eid, title, description, location, datestart, dateend, url, allday, zipcode, state, city, address2, address1, event_type, timestart, timeend) VALUES ('2006051410130162','Installed the Calendar plugin','Today, you successfully installed the Calendar plugin.','Your webserver',CURDATE(),CURDATE(),'http://www.geeklog.net/',1,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL)";
  
  $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'events_block','phpblock','Events','all',4,'',1,'phpblock_calendar',{$_USER['uid']},#group#,3,3)";
--- 119,123 ----
  ";
  
! $_SQL[] = "INSERT INTO {$_TABLES['eventsubmission']} (eid, title, description, location, datestart, dateend, url, allday, zipcode, state, city, address2, address1, event_type, timestart, timeend) VALUES ('2008050110130162','Installed the Calendar plugin','Today, you successfully installed the Calendar plugin.','Your webserver',CURDATE(),CURDATE(),'http://www.geeklog.net/',1,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL)";
  
  $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'events_block','phpblock','Events','all',4,'',1,'phpblock_calendar',{$_USER['uid']},#group#,3,3)";



From dhaun at qs1489.pair.com  Fri May  2 08:08:09 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 12:08:09 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links/sql mssql_install.php, 1.6,
	1.7
Message-ID: <20080502120809.E8C0210FE14@qs1489.pair.com>

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

Modified Files:
	mssql_install.php 
Log Message:
An attempt to update the MS SQL for the plugin installs (and no, I don't know what I'm doing ...)


Index: mssql_install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/sql/mssql_install.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mssql_install.php	12 Apr 2008 13:21:34 -0000	1.6
--- mssql_install.php	2 May 2008 12:08:07 -0000	1.7
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Links Plugin 1.0                                                          |
  // +---------------------------------------------------------------------------+
  // | Installation SQL                                                          |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Links Plugin 2.0                                                          |
  // +---------------------------------------------------------------------------+
  // | Installation SQL                                                          |
***************
*** 51,59 ****
  
  
  
!  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['links']}] (
      [lid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
!     [category] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [url] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
--- 51,76 ----
  
  
+ $_SQL[] = "
+ CREATE TABLE [dbo].[{$_TABLES['linkcategories']}] (
+     [cid] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+     [pid] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+     [category] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+     [description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+     [tid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+     [created] [datetime] NULL ,
+     [modified] [datetime] NULL ,
+     [owner_id] [numeric](8, 0) NOT NULL ,
+     [group_id] [numeric](8, 0) NOT NULL ,
+     [perm_owner] [tinyint] NOT NULL ,
+     [perm_group] [tinyint] NOT NULL ,
+     [perm_members] [tinyint] NOT NULL ,
+     [perm_anon] [tinyint] NOT NULL
+ ) ON [PRIMARY]
+ ";
  
! $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['links']}] (
      [lid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
!     [cid] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [url] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
***************
*** 67,86 ****
      [perm_members] [tinyint] NOT NULL ,
      [perm_anon] [tinyint] NOT NULL
! ) ON [PRIMARY] 
  ";
  
- 
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['linksubmission']}] (
      [lid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
!     [category] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [url] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [title] [varchar] (96) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [hits] [int] NULL ,
!     [date] [datetime] NULL
! ) ON [PRIMARY] 
  ";
  
  
  $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['links']}] ADD
--- 84,109 ----
      [perm_members] [tinyint] NOT NULL ,
      [perm_anon] [tinyint] NOT NULL
! ) ON [PRIMARY]
  ";
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['linksubmission']}] (
      [lid] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
!     [cid] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [url] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [title] [varchar] (96) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [hits] [int] NULL ,
!     [date] [datetime] NULL ,
!     [owner_id] [numeric](8, 0) NOT NULL
! ) ON [PRIMARY]
  ";
  
+ $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['linkcategories']}] ADD
+     CONSTRAINT [PK_gl_linkcategories] PRIMARY KEY  CLUSTERED
+     (
+         [pid]
+     )  ON [PRIMARY]
+ ";
  
  $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['links']}] ADD



From dhaun at qs1489.pair.com  Fri May  2 08:08:09 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 12:08:09 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls/sql mssql_install.php, 1.3,
	1.4 mysql_install.php, 1.9, 1.10
Message-ID: <20080502120810.0166810FE15@qs1489.pair.com>

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

Modified Files:
	mssql_install.php mysql_install.php 
Log Message:
An attempt to update the MS SQL for the plugin installs (and no, I don't know what I'm doing ...)


Index: mssql_install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/sql/mssql_install.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mssql_install.php	16 Jan 2007 04:01:07 -0000	1.3
--- mssql_install.php	2 May 2008 12:08:07 -0000	1.4
***************
*** 3,11 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Polls Plugin 1.0                                                          |
  // +---------------------------------------------------------------------------+
  // | Installation SQL                                                          |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 3,11 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Polls Plugin 2.0                                                          |
  // +---------------------------------------------------------------------------+
  // | Installation SQL                                                          |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 13,17 ****
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity AT steubentech DOT com               |
  // |          Randy Kolenko     - randy AT nextide DOT ca                      |
  // +---------------------------------------------------------------------------+
--- 13,17 ----
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity93 AT gmail DOT com                   |
  // |          Randy Kolenko     - randy AT nextide DOT ca                      |
  // +---------------------------------------------------------------------------+
***************
*** 32,56 ****
  // +---------------------------------------------------------------------------+
  //
! 
! 
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['pollanswers']}] (
!     [qid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [aid] [tinyint] NOT NULL ,
      [answer] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [votes] [numeric](8, 0) NULL ,
!     [remark] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
  ) ON [PRIMARY]
  ";
  
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['polltopics']}] (
      [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
!     [question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [voters] [numeric](8, 0) NULL ,
      [date] [datetime] NULL ,
!     [display] [smallint] NOT NULL ,
      [commentcode] [smallint] NOT NULL ,
      [statuscode] [smallint] NOT NULL ,
--- 32,66 ----
  // +---------------------------------------------------------------------------+
  //
! // $Id$
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['pollanswers']}] (
!     [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
!     [qid] [int] NOT NULL ,
      [aid] [tinyint] NOT NULL ,
      [answer] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [votes] [numeric](8, 0) NULL ,
!     [remark] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
  ) ON [PRIMARY]
  ";
  
+ $_SQL[] = "
+ CREATE TABLE [dbo].[{$_TABLES['pollquestions']}] (
+     [qid] [int] NOT NULL ,
+     [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+     [question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+ ) ON [PRIMARY]
+ ";
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['polltopics']}] (
      [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
!     [topic] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [voters] [numeric](8, 0) NULL ,
+     [questions] [int] NOT NULL ,
      [date] [datetime] NULL ,
!     [display] [tinyint] NOT NULL ,
!     [open] [tinyint] NOT NULL ,
!     [hideresults] [tinyint] NOT NULL ,
      [commentcode] [smallint] NOT NULL ,
      [statuscode] [smallint] NOT NULL ,
***************
*** 59,72 ****
      [perm_owner] [tinyint] NOT NULL ,
      [perm_group] [tinyint] NOT NULL ,
!     [perm_members] [tinyint]  NULL ,
!     [perm_anon] [tinyint]  NULL
  ) ON [PRIMARY]
  ";
  
- 
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['pollvoters']}] (
      [id] [numeric](10, 0) IDENTITY (1, 1) NOT NULL ,
!     [qid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [ipaddress] [varchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [date] [numeric](10, 0) NULL
--- 69,81 ----
      [perm_owner] [tinyint] NOT NULL ,
      [perm_group] [tinyint] NOT NULL ,
!     [perm_members] [tinyint] NOT NULL ,
!     [perm_anon] [tinyint] NOT NULL
  ) ON [PRIMARY]
  ";
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['pollvoters']}] (
      [id] [numeric](10, 0) IDENTITY (1, 1) NOT NULL ,
!     [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [ipaddress] [varchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [date] [numeric](10, 0) NULL
***************
*** 74,80 ****
  ";
  
- 
- 
- 
  $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['pollanswers']}] ADD
      CONSTRAINT [PK_gl_pollanswers] PRIMARY KEY  CLUSTERED
--- 83,86 ----
***************
*** 85,89 ****
  ";
  
! $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['polltopics']}] ADD
      CONSTRAINT [PK_gl_pollquestions] PRIMARY KEY  CLUSTERED
      (
--- 91,95 ----
  ";
  
! $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['pollquestions']}] ADD
      CONSTRAINT [PK_gl_pollquestions] PRIMARY KEY  CLUSTERED
      (
***************
*** 92,95 ****
--- 98,108 ----
  ";
  
+ $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['polltopics']}] ADD
+     CONSTRAINT [PK_gl_polltopics] PRIMARY KEY  CLUSTERED
+     (
+         [pid]
+     )  ON [PRIMARY]
+ ";
+ 
  $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['pollvoters']}] ADD
      CONSTRAINT [PK_gl_pollvoters] PRIMARY KEY  CLUSTERED
***************
*** 99,113 ****
  ";
  
  
  
  
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',1,'Trackbacks',0)";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',2,'Links and Polls plugins',0)";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',3,'Revamped admin areas',0)";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',4,'FCKeditor included',0)";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',5,'Remote user authentication',0)";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',6,'Other',0)";
! 
! $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',30,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
  
  ?>
--- 112,132 ----
  ";
  
+ // Note: The 'pollquestion' entry for the above answers is in the install script
  
+ $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',30,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
  
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 1, 'MS SQL support', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 2, 'Multi-language support', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 3, 'Calendar as a plugin', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 4, 'SLV spam protection', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 5, 'Mass-delete users', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 6, 'Other', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 1, 'Story-Images', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 2, 'User-Rights handling', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 3, 'The Support', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 4, 'Plugin Availability', 0, '');";
  
! $_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (0, 'geeklogfeaturepoll', 'What is the best new feature of Geeklog?');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (1, 'geeklogfeaturepoll', 'What is the all-time best feature of Geeklog?');";
  
  ?>

Index: mysql_install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/sql/mysql_install.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mysql_install.php	19 Jan 2008 14:53:12 -0000	1.9
--- mysql_install.php	2 May 2008 12:08:07 -0000	1.10
***************
*** 13,17 ****
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity AT steubentech DOT com               |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 13,17 ----
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity93 AT gmail DOT com                   |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 95,111 ****
  $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',30,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
  
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 1, 'MS SQL support', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 2, 'Multi-language support', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 3, 'Calendar as a plugin', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 4, 'SLV spam protection', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 5, 'Mass-delete users', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 6, 'Other', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 1, 1, 'Story-Images', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 1, 2, 'User-Rights handling', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 1, 3, 'The Support', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 1, 4, 'Plugin Availability', 0, '');";
  
! $_SQL[] = "INSERT INTO `{$_TABLES['pollquestions']}` (`qid`, `pid`, `question`) VALUES (0, 'geeklogfeaturepoll', 'What is the best new feature of Geeklog?');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollquestions']}` (`qid`, `pid`, `question`) VALUES (1, 'geeklogfeaturepoll', 'What is the all-time best feature of Geeklog?');";
  
  ?>
--- 95,111 ----
  $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',30,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
  
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 1, 'MS SQL support', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 2, 'Multi-language support', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 3, 'Calendar as a plugin', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 4, 'SLV spam protection', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 5, 'Mass-delete users', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 6, 'Other', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 1, 'Story-Images', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 2, 'User-Rights handling', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 3, 'The Support', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 4, 'Plugin Availability', 0, '');";
  
! $_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (0, 'geeklogfeaturepoll', 'What is the best new feature of Geeklog?');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (1, 'geeklogfeaturepoll', 'What is the all-time best feature of Geeklog?');";
  
  ?>



From dhaun at qs1489.pair.com  Fri May  2 08:08:09 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 12:08:09 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls/sql mssql_install.php, 1.3,
	1.4 mysql_install.php, 1.9, 1.10
Message-ID: <20080502120810.0166810FE15@qs1489.pair.com>

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

Modified Files:
	mssql_install.php mysql_install.php 
Log Message:
An attempt to update the MS SQL for the plugin installs (and no, I don't know what I'm doing ...)


Index: mssql_install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/sql/mssql_install.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mssql_install.php	16 Jan 2007 04:01:07 -0000	1.3
--- mssql_install.php	2 May 2008 12:08:07 -0000	1.4
***************
*** 3,11 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Polls Plugin 1.0                                                          |
  // +---------------------------------------------------------------------------+
  // | Installation SQL                                                          |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 3,11 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Polls Plugin 2.0                                                          |
  // +---------------------------------------------------------------------------+
  // | Installation SQL                                                          |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 13,17 ****
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity AT steubentech DOT com               |
  // |          Randy Kolenko     - randy AT nextide DOT ca                      |
  // +---------------------------------------------------------------------------+
--- 13,17 ----
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity93 AT gmail DOT com                   |
  // |          Randy Kolenko     - randy AT nextide DOT ca                      |
  // +---------------------------------------------------------------------------+
***************
*** 32,56 ****
  // +---------------------------------------------------------------------------+
  //
! 
! 
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['pollanswers']}] (
!     [qid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [aid] [tinyint] NOT NULL ,
      [answer] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [votes] [numeric](8, 0) NULL ,
!     [remark] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
  ) ON [PRIMARY]
  ";
  
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['polltopics']}] (
      [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
!     [question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [voters] [numeric](8, 0) NULL ,
      [date] [datetime] NULL ,
!     [display] [smallint] NOT NULL ,
      [commentcode] [smallint] NOT NULL ,
      [statuscode] [smallint] NOT NULL ,
--- 32,66 ----
  // +---------------------------------------------------------------------------+
  //
! // $Id$
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['pollanswers']}] (
!     [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
!     [qid] [int] NOT NULL ,
      [aid] [tinyint] NOT NULL ,
      [answer] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [votes] [numeric](8, 0) NULL ,
!     [remark] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
  ) ON [PRIMARY]
  ";
  
+ $_SQL[] = "
+ CREATE TABLE [dbo].[{$_TABLES['pollquestions']}] (
+     [qid] [int] NOT NULL ,
+     [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+     [question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+ ) ON [PRIMARY]
+ ";
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['polltopics']}] (
      [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
!     [topic] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
      [voters] [numeric](8, 0) NULL ,
+     [questions] [int] NOT NULL ,
      [date] [datetime] NULL ,
!     [display] [tinyint] NOT NULL ,
!     [open] [tinyint] NOT NULL ,
!     [hideresults] [tinyint] NOT NULL ,
      [commentcode] [smallint] NOT NULL ,
      [statuscode] [smallint] NOT NULL ,
***************
*** 59,72 ****
      [perm_owner] [tinyint] NOT NULL ,
      [perm_group] [tinyint] NOT NULL ,
!     [perm_members] [tinyint]  NULL ,
!     [perm_anon] [tinyint]  NULL
  ) ON [PRIMARY]
  ";
  
- 
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['pollvoters']}] (
      [id] [numeric](10, 0) IDENTITY (1, 1) NOT NULL ,
!     [qid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [ipaddress] [varchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [date] [numeric](10, 0) NULL
--- 69,81 ----
      [perm_owner] [tinyint] NOT NULL ,
      [perm_group] [tinyint] NOT NULL ,
!     [perm_members] [tinyint] NOT NULL ,
!     [perm_anon] [tinyint] NOT NULL
  ) ON [PRIMARY]
  ";
  
  $_SQL[] = "
  CREATE TABLE [dbo].[{$_TABLES['pollvoters']}] (
      [id] [numeric](10, 0) IDENTITY (1, 1) NOT NULL ,
!     [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [ipaddress] [varchar] (15) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
      [date] [numeric](10, 0) NULL
***************
*** 74,80 ****
  ";
  
- 
- 
- 
  $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['pollanswers']}] ADD
      CONSTRAINT [PK_gl_pollanswers] PRIMARY KEY  CLUSTERED
--- 83,86 ----
***************
*** 85,89 ****
  ";
  
! $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['polltopics']}] ADD
      CONSTRAINT [PK_gl_pollquestions] PRIMARY KEY  CLUSTERED
      (
--- 91,95 ----
  ";
  
! $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['pollquestions']}] ADD
      CONSTRAINT [PK_gl_pollquestions] PRIMARY KEY  CLUSTERED
      (
***************
*** 92,95 ****
--- 98,108 ----
  ";
  
+ $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['polltopics']}] ADD
+     CONSTRAINT [PK_gl_polltopics] PRIMARY KEY  CLUSTERED
+     (
+         [pid]
+     )  ON [PRIMARY]
+ ";
+ 
  $_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['pollvoters']}] ADD
      CONSTRAINT [PK_gl_pollvoters] PRIMARY KEY  CLUSTERED
***************
*** 99,113 ****
  ";
  
  
  
  
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',1,'Trackbacks',0)";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',2,'Links and Polls plugins',0)";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',3,'Revamped admin areas',0)";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',4,'FCKeditor included',0)";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',5,'Remote user authentication',0)";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (qid, aid, answer, votes) VALUES ('geeklogfeaturepoll',6,'Other',0)";
! 
! $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',30,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
  
  ?>
--- 112,132 ----
  ";
  
+ // Note: The 'pollquestion' entry for the above answers is in the install script
  
+ $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',30,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
  
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 1, 'MS SQL support', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 2, 'Multi-language support', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 3, 'Calendar as a plugin', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 4, 'SLV spam protection', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 5, 'Mass-delete users', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 6, 'Other', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 1, 'Story-Images', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 2, 'User-Rights handling', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 3, 'The Support', 0, '');";
+ $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 4, 'Plugin Availability', 0, '');";
  
! $_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (0, 'geeklogfeaturepoll', 'What is the best new feature of Geeklog?');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (1, 'geeklogfeaturepoll', 'What is the all-time best feature of Geeklog?');";
  
  ?>

Index: mysql_install.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/sql/mysql_install.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mysql_install.php	19 Jan 2008 14:53:12 -0000	1.9
--- mysql_install.php	2 May 2008 12:08:07 -0000	1.10
***************
*** 13,17 ****
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity AT steubentech DOT com               |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 13,17 ----
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity93 AT gmail DOT com                   |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 95,111 ****
  $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',30,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
  
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 1, 'MS SQL support', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 2, 'Multi-language support', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 3, 'Calendar as a plugin', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 4, 'SLV spam protection', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 5, 'Mass-delete users', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 0, 6, 'Other', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 1, 1, 'Story-Images', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 1, 2, 'User-Rights handling', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 1, 3, 'The Support', 0, '');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollanswers']}` (`pid`, `qid`, `aid`, `answer`, `votes`, `remark`) VALUES ('geeklogfeaturepoll', 1, 4, 'Plugin Availability', 0, '');";
  
! $_SQL[] = "INSERT INTO `{$_TABLES['pollquestions']}` (`qid`, `pid`, `question`) VALUES (0, 'geeklogfeaturepoll', 'What is the best new feature of Geeklog?');";
! $_SQL[] = "INSERT INTO `{$_TABLES['pollquestions']}` (`qid`, `pid`, `question`) VALUES (1, 'geeklogfeaturepoll', 'What is the all-time best feature of Geeklog?');";
  
  ?>
--- 95,111 ----
  $_SQL[] = "INSERT INTO {$_TABLES['blocks']} (is_enabled, name, type, title, tid, blockorder, content, onleft, phpblockfn, owner_id, group_id, perm_owner, perm_group) VALUES (1,'polls_block','phpblock','Poll','all',30,'',0,'phpblock_polls',{$_USER['uid']},#group#,3,3)";
  
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 1, 'MS SQL support', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 2, 'Multi-language support', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 3, 'Calendar as a plugin', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 4, 'SLV spam protection', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 5, 'Mass-delete users', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 0, 6, 'Other', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 1, 'Story-Images', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 2, 'User-Rights handling', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 3, 'The Support', 0, '');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollanswers']} (pid, qid, aid, answer, votes, remark) VALUES ('geeklogfeaturepoll', 1, 4, 'Plugin Availability', 0, '');";
  
! $_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (0, 'geeklogfeaturepoll', 'What is the best new feature of Geeklog?');";
! $_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (qid, pid, question) VALUES (1, 'geeklogfeaturepoll', 'What is the all-time best feature of Geeklog?');";
  
  ?>



From dhaun at qs1489.pair.com  Fri May  2 08:12:07 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 12:12:07 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links functions.inc, 1.107,
	1.108 install_defaults.php, 1.2, 1.3
Message-ID: <20080502121207.EF20B10FE14@qs1489.pair.com>

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

Modified Files:
	functions.inc install_defaults.php 
Log Message:
Changed Trinity's email address, as requested


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/functions.inc,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** functions.inc	19 Apr 2008 12:15:57 -0000	1.107
--- functions.inc	2 May 2008 12:12:05 -0000	1.108
***************
*** 17,21 ****
  // |          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          |
--- 17,21 ----
  // |          Jason Whittenburg  - jwhitten AT securitygeeks DOT com           |
  // |          Dirk Haun          - dirk AT haun-online DOT de                  |
! // |          Trinity Bays       - trinity93 AT gmail DOT com                  |
  // |          Oliver Spiesshofer - oliver AT spiesshofer DOT com               |
  // |          Euan McKay         - info AT heatherengineering DOT com          |

Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/install_defaults.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install_defaults.php	10 Feb 2008 17:09:37 -0000	1.2
--- install_defaults.php	2 May 2008 12:12:05 -0000	1.3
***************
*** 17,21 ****
  // |          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          |
--- 17,21 ----
  // |          Jason Whittenburg  - jwhitten AT securitygeeks DOT com           |
  // |          Dirk Haun          - dirk AT haun-online DOT de                  |
! // |          Trinity Bays       - trinity93 AT gmail DOT com                  |
  // |          Oliver Spiesshofer - oliver AT spiesshofer DOT com               |
  // |          Euan McKay         - info AT heatherengineering DOT com          |



From dhaun at qs1489.pair.com  Fri May  2 08:12:07 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 12:12:07 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/calendar install_defaults.php, 1.2,
	1.3
Message-ID: <20080502121207.DEA1C10FE12@qs1489.pair.com>

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

Modified Files:
	install_defaults.php 
Log Message:
Changed Trinity's email address, as requested


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/install_defaults.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install_defaults.php	21 Mar 2008 17:09:26 -0000	1.2
--- install_defaults.php	2 May 2008 12:12:05 -0000	1.3
***************
*** 17,21 ****
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity93 AT steubentech DOT com             |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 17,21 ----
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
! // |          Trinity Bays      - trinity93 AT gmail DOT com                   |
  // +---------------------------------------------------------------------------+
  // |                                                                           |



From dhaun at qs1489.pair.com  Fri May  2 08:12:08 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 12:12:08 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/links index.php, 1.33,
	1.34 portal.php, 1.6, 1.7
Message-ID: <20080502121208.18A9110FE15@qs1489.pair.com>

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

Modified Files:
	index.php portal.php 
Log Message:
Changed Trinity's email address, as requested


Index: portal.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/links/portal.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** portal.php	1 Jan 2008 12:33:48 -0000	1.6
--- portal.php	2 May 2008 12:12:05 -0000	1.7
***************
*** 45,49 ****
   * @copyright Copyright &copy; 2005-2008
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
!  * @author Trinity Bays <trinity93 AT steubentech.com>
   * @author Tony Bibbs <tony AT tonybibbs DOT com>
   * @author Tom Willett <twillett AT users DOT sourceforge DOT net>
--- 45,49 ----
   * @copyright Copyright &copy; 2005-2008
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
!  * @author Trinity Bays <trinity93 AT gmail.com>
   * @author Tony Bibbs <tony AT tonybibbs DOT com>
   * @author Tom Willett <twillett AT users DOT sourceforge DOT net>

Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/links/index.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** index.php	3 Feb 2008 09:12:30 -0000	1.33
--- index.php	2 May 2008 12:12:05 -0000	1.34
***************
*** 15,19 ****
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Tom Willett       - tomw AT pigstye DOT net                      |
! // |          Trinity Bays      - trinity AT steubentech DOT com               |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
  // +---------------------------------------------------------------------------+
--- 15,19 ----
  // |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
  // |          Tom Willett       - tomw AT pigstye DOT net                      |
! // |          Trinity Bays      - trinity93 AT gmail DOT com                   |
  // |          Dirk Haun         - dirk AT haun-online DOT de                   |
  // +---------------------------------------------------------------------------+
***************
*** 51,55 ****
   * @author Jason Whittenburg <jwhitten AT securitygeeks DOT com>
   * @author Tom Willett <tomw AT pigstye DOT net>
!  * @author Trinity Bays <trinity AT steubentech DOT com>
   * @author Dirk Haun <dirk AT haun-online DOT de>
   *
--- 51,55 ----
   * @author Jason Whittenburg <jwhitten AT securitygeeks DOT com>
   * @author Tom Willett <tomw AT pigstye DOT net>
!  * @author Trinity Bays <trinity93 AT gmail DOT com>
   * @author Dirk Haun <dirk AT haun-online DOT de>
   *



From dhaun at qs1489.pair.com  Fri May  2 08:12:08 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 12:12:08 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-security.php,1.68,1.69
Message-ID: <20080502121208.1FCC910FE16@qs1489.pair.com>

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

Modified Files:
	lib-security.php 
Log Message:
Changed Trinity's email address, as requested


Index: lib-security.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** lib-security.php	1 May 2008 19:23:47 -0000	1.68
--- lib-security.php	2 May 2008 12:12:06 -0000	1.69
***************
*** 893,897 ****
    * Is this the right place for this, Dirk?
    *
!   * @author Trinity L Bays <trinity93 at steubentech.com>
    *
    * @param  string  $uid Their user id
--- 893,897 ----
    * Is this the right place for this, Dirk?
    *
!   * @author Trinity L Bays <trinity93 AT gmail DOT com>
    *
    * @param  string  $uid Their user id



From dhaun at qs1489.pair.com  Fri May  2 08:12:08 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 12:12:08 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-security.php,1.68,1.69
Message-ID: <20080502121208.1FCC910FE16@qs1489.pair.com>

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

Modified Files:
	lib-security.php 
Log Message:
Changed Trinity's email address, as requested


Index: lib-security.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-security.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** lib-security.php	1 May 2008 19:23:47 -0000	1.68
--- lib-security.php	2 May 2008 12:12:06 -0000	1.69
***************
*** 893,897 ****
    * Is this the right place for this, Dirk?
    *
!   * @author Trinity L Bays <trinity93 at steubentech.com>
    *
    * @param  string  $uid Their user id
--- 893,897 ----
    * Is this the right place for this, Dirk?
    *
!   * @author Trinity L Bays <trinity93 AT gmail DOT com>
    *
    * @param  string  $uid Their user id



From dhaun at qs1489.pair.com  Fri May  2 11:18:22 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 15:18:22 +0000
Subject: [geeklog-cvs] tools/lm/include core.inc,1.2,1.3
Message-ID: <20080502151822.4DB7F10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/tools/lm/include
In directory qs1489.pair.com:/tmp/cvs-serv50014

Modified Files:
	core.inc 
Log Message:
Fix for another common mistake in many language files


Index: core.inc
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/include/core.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** core.inc	1 May 2008 20:10:38 -0000	1.2
--- core.inc	2 May 2008 15:18:20 -0000	1.3
***************
*** 33,40 ****
  
  /**
! * Helper function: Fix URL in some language files
  *
  */
! function Core_fix_storydenialmsg(&$access)
  {
      if (isset($access['storydenialmsg'])) {
--- 33,40 ----
  
  /**
! * Helper function: Fix URLs in some language files
  *
  */
! function Core_fix_some_urls(&$access)
  {
      if (isset($access['storydenialmsg'])) {
***************
*** 43,46 ****
--- 43,51 ----
                      $access['storydenialmsg']);
      }
+ 
+     if (isset($access['editrootmsg'])) {
+         $access['editrootmsg'] = str_replace('users.php', 'user.php',
+                                              $access['editrootmsg']);
+     }
  }
  
***************
*** 174,178 ****
  
  mergeArrays($ENGMS,  $MESSAGE, 'MESSAGE', 'confirmation and error messages');
! Core_fix_storydenialmsg($LANG_ACCESS);
  mergeArrays($ENGAC,  $LANG_ACCESS, 'LANG_ACCESS');
  mergeArrays($ENGDB,  $LANG_DB_BACKUP, 'LANG_DB_BACKUP', 'admin/database.php');
--- 179,183 ----
  
  mergeArrays($ENGMS,  $MESSAGE, 'MESSAGE', 'confirmation and error messages');
! Core_fix_some_urls($LANG_ACCESS);
  mergeArrays($ENGAC,  $LANG_ACCESS, 'LANG_ACCESS');
  mergeArrays($ENGDB,  $LANG_DB_BACKUP, 'LANG_DB_BACKUP', 'admin/database.php');



From dhaun at qs1489.pair.com  Fri May  2 11:24:28 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 15:24:28 +0000
Subject: [geeklog-cvs] Geeklog-1.x/language english.php, 1.334,
	1.335 english_utf-8.php, 1.118, 1.119
Message-ID: <20080502152428.AF31F10FE12@qs1489.pair.com>

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

Modified Files:
	english.php english_utf-8.php 
Log Message:
Added a rel="nofollow" to all the links pointing to users.php (already did that in all the other language files during the previous update)


Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english.php,v
retrieving revision 1.334
retrieving revision 1.335
diff -C2 -d -r1.334 -r1.335
*** english.php	26 Apr 2008 16:53:16 -0000	1.334
--- english.php	2 May 2008 15:24:26 -0000	1.335
***************
*** 101,105 ****
      57 => 'Password',
      58 => 'Login',
!     59 => "Don't have an account yet?  Sign up as a <a href=\"{$_CONF['site_url']}/users.php?mode=new\">New User</a>",
      60 => 'Post a comment',
      61 => 'Create New Account',
--- 101,105 ----
      57 => 'Password',
      58 => 'Login',
!     59 => "Don't have an account yet?  Sign up as a <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">New User</a>",
      60 => 'Post a comment',
      61 => 'Create New Account',
***************
*** 161,165 ****
      117 => 'Directory',
      118 => 'Please continue reading on the next page:',
!     119 => "Lost your <a href=\"{$_CONF['site_url']}/users.php?mode=getpassword\">password</a>?",
      120 => 'Permanent link to this comment',
      121 => 'Comments (%d)',
--- 161,165 ----
      117 => 'Directory',
      118 => 'Please continue reading on the next page:',
!     119 => "Lost your <a href=\"{$_CONF['site_url']}/users.php?mode=getpassword\" rel=\"nofollow\">password</a>?",
      120 => 'Permanent link to this comment',
      121 => 'Comments (%d)',
***************
*** 282,286 ****
      69 => 'How long should we remember you after logging in?',
      70 => "Customize the layout and content of {$_CONF['site_name']}",
!     71 => "One of the great features of {$_CONF['site_name']} is you can customize the content you get and you can change the overall layout of this site.  In order to take advantage of these great features you must first <a href=\"{$_CONF['site_url']}/users.php?mode=new\">register</a> with {$_CONF['site_name']}.  Are you already a member?  Then use the login form to the left to log in!",
      72 => 'Theme',
      73 => 'Language',
--- 282,286 ----
      69 => 'How long should we remember you after logging in?',
      70 => "Customize the layout and content of {$_CONF['site_name']}",
!     71 => "One of the great features of {$_CONF['site_name']} is you can customize the content you get and you can change the overall layout of this site.  In order to take advantage of these great features you must first <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">register</a> with {$_CONF['site_name']}.  Are you already a member?  Then use the login form to the left to log in!",
      72 => 'Theme',
      73 => 'Language',
***************
*** 334,338 ****
      121 => 'Service',
      122 => 'Sorry, new user registration is disabled',
!     123 => "Are you a <a href=\"{$_CONF['site_url']}/users.php?mode=new\">new user</a>?",
      124 => 'Confirm Email',
      125 => 'You have to enter the same email address in both fields!',
--- 334,338 ----
      121 => 'Service',
      122 => 'Sorry, new user registration is disabled',
!     123 => "Are you a <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">new user</a>?",
      124 => 'Confirm Email',
      125 => 'You have to enter the same email address in both fields!',
***************
*** 1219,1223 ****
      'none' => 'None',
      'accessdenied' => 'Access Denied',
!     'storydenialmsg' => "You do not have access to view this story.  This could be because you aren't a member of {$_CONF['site_name']}.  Please <a href=\"{$_CONF['site_url']}/users.php?mode=new\">become a member</a> of {$_CONF['site_name']} to receive full membership access!",
      'nogroupsforcoregroup' => 'This group doesn\'t belong to any of the other groups',
      'grouphasnorights' => 'This group doesn\'t have access to any of the administrative features of this site',
--- 1219,1223 ----
      'none' => 'None',
      'accessdenied' => 'Access Denied',
!     'storydenialmsg' => "You do not have access to view this story.  This could be because you aren't a member of {$_CONF['site_name']}.  Please <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">become a member</a> of {$_CONF['site_name']} to receive full membership access!",
      'nogroupsforcoregroup' => 'This group doesn\'t belong to any of the other groups',
      'grouphasnorights' => 'This group doesn\'t have access to any of the administrative features of this site',

Index: english_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/english_utf-8.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** english_utf-8.php	26 Apr 2008 16:53:16 -0000	1.118
--- english_utf-8.php	2 May 2008 15:24:26 -0000	1.119
***************
*** 101,105 ****
      57 => 'Password',
      58 => 'Login',
!     59 => "Don't have an account yet?  Sign up as a <a href=\"{$_CONF['site_url']}/users.php?mode=new\">New User</a>",
      60 => 'Post a comment',
      61 => 'Create New Account',
--- 101,105 ----
      57 => 'Password',
      58 => 'Login',
!     59 => "Don't have an account yet?  Sign up as a <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">New User</a>",
      60 => 'Post a comment',
      61 => 'Create New Account',
***************
*** 161,165 ****
      117 => 'Directory',
      118 => 'Please continue reading on the next page:',
!     119 => "Lost your <a href=\"{$_CONF['site_url']}/users.php?mode=getpassword\">password</a>?",
      120 => 'Permanent link to this comment',
      121 => 'Comments (%d)',
--- 161,165 ----
      117 => 'Directory',
      118 => 'Please continue reading on the next page:',
!     119 => "Lost your <a href=\"{$_CONF['site_url']}/users.php?mode=getpassword\" rel=\"nofollow\">password</a>?",
      120 => 'Permanent link to this comment',
      121 => 'Comments (%d)',
***************
*** 282,286 ****
      69 => 'How long should we remember you after logging in?',
      70 => "Customize the layout and content of {$_CONF['site_name']}",
!     71 => "One of the great features of {$_CONF['site_name']} is you can customize the content you get and you can change the overall layout of this site.  In order to take advantage of these great features you must first <a href=\"{$_CONF['site_url']}/users.php?mode=new\">register</a> with {$_CONF['site_name']}.  Are you already a member?  Then use the login form to the left to log in!",
      72 => 'Theme',
      73 => 'Language',
--- 282,286 ----
      69 => 'How long should we remember you after logging in?',
      70 => "Customize the layout and content of {$_CONF['site_name']}",
!     71 => "One of the great features of {$_CONF['site_name']} is you can customize the content you get and you can change the overall layout of this site.  In order to take advantage of these great features you must first <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">register</a> with {$_CONF['site_name']}.  Are you already a member?  Then use the login form to the left to log in!",
      72 => 'Theme',
      73 => 'Language',
***************
*** 334,338 ****
      121 => 'Service',
      122 => 'Sorry, new user registration is disabled',
!     123 => "Are you a <a href=\"{$_CONF['site_url']}/users.php?mode=new\">new user</a>?",
      124 => 'Confirm Email',
      125 => 'You have to enter the same email address in both fields!',
--- 334,338 ----
      121 => 'Service',
      122 => 'Sorry, new user registration is disabled',
!     123 => "Are you a <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">new user</a>?",
      124 => 'Confirm Email',
      125 => 'You have to enter the same email address in both fields!',
***************
*** 1219,1223 ****
      'none' => 'None',
      'accessdenied' => 'Access Denied',
!     'storydenialmsg' => "You do not have access to view this story.  This could be because you aren't a member of {$_CONF['site_name']}.  Please <a href=\"{$_CONF['site_url']}/users.php?mode=new\">become a member</a> of {$_CONF['site_name']} to receive full membership access!",
      'nogroupsforcoregroup' => 'This group doesn\'t belong to any of the other groups',
      'grouphasnorights' => 'This group doesn\'t have access to any of the administrative features of this site',
--- 1219,1223 ----
      'none' => 'None',
      'accessdenied' => 'Access Denied',
!     'storydenialmsg' => "You do not have access to view this story.  This could be because you aren't a member of {$_CONF['site_name']}.  Please <a href=\"{$_CONF['site_url']}/users.php?mode=new\" rel=\"nofollow\">become a member</a> of {$_CONF['site_name']} to receive full membership access!",
      'nogroupsforcoregroup' => 'This group doesn\'t belong to any of the other groups',
      'grouphasnorights' => 'This group doesn\'t have access to any of the administrative features of this site',



From dirk at haun-online.de  Fri May  2 11:15:23 2008
From: dirk at haun-online.de (Dirk Haun)
Date: Fri, 2 May 2008 17:15:23 +0200
Subject: [geeklog-cvs] Language files updated
Message-ID: <20080502151523.219111245@smtp.haun-online.de>

Okay, I thought I'd spare everyone the 1.3 MB or so of update posts: The
language files (core and all 5 plugins) have now been updated.

bye, Dirk


-- 
http://www.geeklog.net/
http://geeklog.info/



From dhaun at qs1489.pair.com  Fri May  2 15:30:13 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 19:30:13 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs config.html,1.84,1.85
Message-ID: <20080502193013.9446810FE14@qs1489.pair.com>

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

Modified Files:
	config.html 
Log Message:
Create unique anchors for the documentation (e.g. desc_backend was used twice)


Index: config.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/config.html,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** config.html	20 Apr 2008 16:26:31 -0000	1.84
--- config.html	2 May 2008 19:30:11 -0000	1.85
***************
*** 494,528 ****
      <th width="29%">Default Value</th>
      <th width="63%">Description</th></tr>
! <tr><td valign="top"><a name="desc_backend">backend</a></td>
      <td valign="top">mail</td>
      <td valign="top">Used to select how to send email. Can be one of 'smtp',
          'sendmail', or 'mail'.</td></tr>
! <tr><td valign="top"><a name="desc_sendmail_path">sendmail_path</a></td>
      <td valign="top"><tt>/usr/bin/sendmail</tt></td>
      <td valign="top">If you chose 'sendmail' for the backend setting, this
          specifies the complete path to the sendmail binary.</td></tr>
! <tr><td valign="top"><a name="desc_sendmail_args">sendmail_args</a></td>
      <td valign="top"><tt>''</tt> <i>(empty)</i></td>
      <td valign="top">If you chose 'sendmail' for the backend setting, this
          variable can be used to pass additional parameters to the sendmail
          binary.</td></tr>
! <tr><td valign="top"><a name="desc_host">host</a></td>
      <td valign="top">smtp.example.com</td>
      <td valign="top">If you chose 'smtp' for the backend setting, this is the
          SMTP server to use.</td></tr>
! <tr><td valign="top"><a name="desc_port">port</a></td>
      <td valign="top">25</td>
      <td valign="top">If you chose 'smtp' for the backend setting, this is the
          port number to talk to on the SMTP server.</td></tr>
! <tr><td valign="top"><a name="desc_auth">auth</a></td>
      <td valign="top">false</td>
      <td valign="top">If you chose 'smtp' for the backend setting, set this to
          <code>true</code> if your SMTP server requires authorization, and
          <code>false</code> if it doesn't.</td></tr>
! <tr><td valign="top"><a name="desc_username">username</a></td>
      <td valign="top">smtp-username</td>
      <td valign="top">If you chose 'smtp' for the backend setting, this is the
          name of your SMTP account.</td></tr>
! <tr><td valign="top"><a name="desc_password">password</a></td>
      <td valign="top">smtp-password</td>
      <td valign="top">If you chose 'smtp' for the backend setting, this is the
--- 494,528 ----
      <th width="29%">Default Value</th>
      <th width="63%">Description</th></tr>
! <tr><td valign="top"><a name="desc_mail_settings_backend">backend</a></td>
      <td valign="top">mail</td>
      <td valign="top">Used to select how to send email. Can be one of 'smtp',
          'sendmail', or 'mail'.</td></tr>
! <tr><td valign="top"><a name="desc_mail_settings_sendmail_path">sendmail_path</a></td>
      <td valign="top"><tt>/usr/bin/sendmail</tt></td>
      <td valign="top">If you chose 'sendmail' for the backend setting, this
          specifies the complete path to the sendmail binary.</td></tr>
! <tr><td valign="top"><a name="desc_mail_settings_sendmail_args">sendmail_args</a></td>
      <td valign="top"><tt>''</tt> <i>(empty)</i></td>
      <td valign="top">If you chose 'sendmail' for the backend setting, this
          variable can be used to pass additional parameters to the sendmail
          binary.</td></tr>
! <tr><td valign="top"><a name="desc_mail_settings_host">host</a></td>
      <td valign="top">smtp.example.com</td>
      <td valign="top">If you chose 'smtp' for the backend setting, this is the
          SMTP server to use.</td></tr>
! <tr><td valign="top"><a name="desc_mail_settings_port">port</a></td>
      <td valign="top">25</td>
      <td valign="top">If you chose 'smtp' for the backend setting, this is the
          port number to talk to on the SMTP server.</td></tr>
! <tr><td valign="top"><a name="desc_mail_settings_auth">auth</a></td>
      <td valign="top">false</td>
      <td valign="top">If you chose 'smtp' for the backend setting, set this to
          <code>true</code> if your SMTP server requires authorization, and
          <code>false</code> if it doesn't.</td></tr>
! <tr><td valign="top"><a name="desc_mail_settings_username">username</a></td>
      <td valign="top">smtp-username</td>
      <td valign="top">If you chose 'smtp' for the backend setting, this is the
          name of your SMTP account.</td></tr>
! <tr><td valign="top"><a name="desc_mail_settings_password">password</a></td>
      <td valign="top">smtp-password</td>
      <td valign="top">If you chose 'smtp' for the backend setting, this is the



From dhaun at qs1489.pair.com  Fri May  2 15:30:13 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Fri, 02 May 2008 19:30:13 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.37,
	1.38
Message-ID: <20080502193013.8873A10FE12@qs1489.pair.com>

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

Modified Files:
	config.class.php 
Log Message:
Create unique anchors for the documentation (e.g. desc_backend was used twice)


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** config.class.php	1 May 2008 18:35:14 -0000	1.37
--- config.class.php	2 May 2008 19:30:11 -0000	1.38
***************
*** 594,602 ****
              //            "(<a href='#' onClick='unset(\"{$name}\");'>X</a>)");
              if (($a = strrchr($name, '[')) !== FALSE) {
!                 $o = substr($a, 1, -1);
              } else {
                  $o = $name;
              }
!             if (! is_numeric($o)) {
                  if (!empty($GLOBALS['_CONF']['site_url'])) {
                      $baseUrl = $GLOBALS['_CONF']['site_url'];
--- 594,604 ----
              //            "(<a href='#' onClick='unset(\"{$name}\");'>X</a>)");
              if (($a = strrchr($name, '[')) !== FALSE) {
!                 $on = substr($a, 1, -1);
!                 $o = str_replace(array('[', ']'), array('_', ''), $name);
              } else {
                  $o = $name;
+                 $on = $name;
              }
!             if (! is_numeric($on)) {
                  if (!empty($GLOBALS['_CONF']['site_url'])) {
                      $baseUrl = $GLOBALS['_CONF']['site_url'];



From dhaun at qs1489.pair.com  Sat May  3 04:36:12 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 03 May 2008 08:36:12 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs config.html,1.85,1.86
Message-ID: <20080503083612.0A54B10FE12@qs1489.pair.com>

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

Modified Files:
	config.html 
Log Message:
Regrouped options to be in sync with the Configuration admin panel


Index: config.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/config.html,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** config.html	2 May 2008 19:30:11 -0000	1.85
--- config.html	3 May 2008 08:36:09 -0000	1.86
***************
*** 20,163 ****
  
  <p>For technical reasons, some configuration options still have to be
! stored in files. There are two such configuration files now, called
! <tt>db-config.php</tt> and <tt>siteconfig.php</tt>. These files are updated
  when you install Geeklog and you will not normally have to edit them
  manually.</p>
  
! <h2>Configuration options</h2>
  
! <p>Geeklog's configuration options can be grouped like this:</p>
[...2269 lines suppressed...]
+ 
+ <h2><a name="url-rewrite">URL Rewriting</a></h2>
+ 
+ <p>Geeklog includes a simple but useful URL rewriting feature which can help
+ make your site more crawler friendly (i.e. the URLs of your site are more
+ likely to be picked up by the search engine's indexing bots). This feature is
+ supported for URLs to stories, static pages, the article directory, and links.
+ </p>
+ <p>URL rewriting means that your URLs will look like this</p>
+ <p align="center"><tt>http://www.geeklog.net/article.php/20021022234959146</tt></p>
+ <p>instead of like this</p>
+ <p align="center"><tt>http://www.geeklog.net/article.php?story=20021022234959146</tt></p>
+ <p>While some search engines will pick up the second form, Google seems to
+ prefer the first format and often ignores the second format.</p>
+ <p><strong>Note:</strong> This feature may not work with all web servers. It
+ is known to work with Apache (all versions) and known <em>not</em> to work
+ with IIS (at least some versions). Please try it out before you go public
+ with your site.</p>
  
  



From dhaun at qs1489.pair.com  Sat May  3 07:23:52 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 03 May 2008 11:23:52 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs config.html,1.86,1.87
Message-ID: <20080503112352.BC1E910FE15@qs1489.pair.com>

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

Modified Files:
	config.html 
Log Message:
Added missing options and explanations


Index: config.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/config.html,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** config.html	3 May 2008 08:36:09 -0000	1.86
--- config.html	3 May 2008 11:23:50 -0000	1.87
***************
*** 75,79 ****
    <td valign="top"><a name="desc_microsummary_short">microsummary_short</a></td>
    <td valign="top">GL:</td>
!   <td valign="top">(Microsummary)</td></tr>
  <tr>
    <td valign="top"><a name="desc_site_disabled_msg">site_disabled_msg</a></td>
--- 75,79 ----
    <td valign="top"><a name="desc_microsummary_short">microsummary_short</a></td>
    <td valign="top">GL:</td>
!   <td valign="top">Prefix to use for a <a href="http://wiki.mozilla.org/Microsummaries">microsummary</a>.</td></tr>
  <tr>
    <td valign="top"><a name="desc_site_disabled_msg">site_disabled_msg</a></td>
***************
*** 245,249 ****
      <td valign="top">Enable or disable the backup functionality (1 = on,
          0 = off).</td></tr>
! <tr><td valign="top">_DB_mysqldump_path</td>
      <td valign="top">/usr/bin/mysqldump</td>
      <td valign="top">Complete path to the <a
--- 245,249 ----
      <td valign="top">Enable or disable the backup functionality (1 = on,
          0 = off).</td></tr>
! <tr><td valign="top"><a name="desc_mysqldump_path">_DB_mysqldump_path</a></td>
      <td valign="top">/usr/bin/mysqldump</td>
      <td valign="top">Complete path to the <a
***************
*** 356,361 ****
  <tr>
    <td valign="top"><a name="desc_aftersave_story">aftersave_story</a></td>
!   <td valign="top">0</td>
!   <td valign="top">(After Saving Story)</td></tr>
  </table>
  
--- 356,367 ----
  <tr>
    <td valign="top"><a name="desc_aftersave_story">aftersave_story</a></td>
!   <td valign="top">'list'</td>
!   <td valign="top">Which page to go to after a story has been saved:
!     <ul>
!     <li>'item': display the story</li>
!     <li>'list': show admin's list of stories (default)</li>
!     <li>'home': display the site's homepage</li>
!     <li>'admin': go to the "Admin Home" page, i.e. Command &amp; Control</li>
!     </ul></td></tr>
  </table>
  
***************
*** 508,514 ****
      Set this to 0 if you don't want that link to show up.</td></tr>
  <tr>
!   <td valign="top"><a name="desc_link_documentation">link_documentation</a></td>
    <td valign="top">1</td>
!   <td valign="top">(Link to Version Checker)</td></tr>
  </table>
  
--- 514,524 ----
      Set this to 0 if you don't want that link to show up.</td></tr>
  <tr>
!   <td valign="top"><a name="desc_link_versionchecker">link_versionchecker</a></td>
    <td valign="top">1</td>
!   <td valign="top">Add a link "GL Version Test" to the Admin block so that you
!     can easily check if your Geeklog version is up to date. Set this to 0 if
!     you don't want that link to show up.<br>
!     <strong>Note:</strong> The link is only displayed to members of the Root
!     group anyway.</td></tr>
  </table>
  
***************
*** 657,665 ****
    <td valign="top"><a name="desc_login_method_standard">standard</a></td>
    <td valign="top"><code>true</code></td>
!   <td valign="top">(Login Method: Standard)</td></tr>
  <tr>
    <td valign="top"><a name="desc_login_method_openid">openid</a></td>
    <td valign="top"><code>false</code></td>
!   <td valign="top">(Login Method: OpenID)</td></tr>
  <tr>
    <td valign="top"><a name="desc_login_method_3rdparty">3rdparty</a></td>
--- 667,677 ----
    <td valign="top"><a name="desc_login_method_standard">standard</a></td>
    <td valign="top"><code>true</code></td>
!   <td valign="top">Whether to allow normal logins into the site, i.e. with
!     a user account that only exists in your site's database.</td></tr>
  <tr>
    <td valign="top"><a name="desc_login_method_openid">openid</a></td>
    <td valign="top"><code>false</code></td>
!   <td valign="top">Whether to allow logins using <a href="http://openid.net/">OpenID</a>. This will display a special OpenID login below the normal login field.<br>
!     <strong>Note:</strong> Currently only OpenID 1.1 is supported.</td></tr>
  <tr>
    <td valign="top"><a name="desc_login_method_3rdparty">3rdparty</a></td>
***************
*** 671,679 ****
      authorization class in <tt>system/classes/authentication</tt>. If you only
      want to allow LDAP but not LiveJournal users (or vice versa), simply
!     remove the class file for the unwanted service(s).</td></tr>
  <tr>
    <td valign="top"><a name="desc_aftersave_user">aftersave_user</a></td>
!   <td valign="top"><code>false</code></td>
!   <td valign="top">(After Saving User)</td></tr>
  </table>
  
--- 683,698 ----
      authorization class in <tt>system/classes/authentication</tt>. If you only
      want to allow LDAP but not LiveJournal users (or vice versa), simply
!     remove the class file for the unwanted service(s).<br>
!     See <a href="http://www.geeklog.net/article.php/remote-authentication">Remote Authentication in Geeklog</a> for more information.</td></tr>
  <tr>
    <td valign="top"><a name="desc_aftersave_user">aftersave_user</a></td>
!   <td valign="top"><code>'item'</code></td>
!   <td valign="top">Which page to go to after a user has been saved:
!     <ul>
!     <li>'item': display the user's profile</li>
!     <li>'list': show admin's list of users (default)</li>
!     <li>'home': display the site's homepage</li>
!     <li>'admin': go to the "Admin Home" page, i.e. Command &amp; Control</li>
!     </ul></td></tr>
  </table>
  
***************
*** 824,828 ****
    <td valign="top"><a name="desc_wikitext_editor">wikitext_editor</a></td>
    <td valign="top">false</td>
!   <td valign="top">(Wikitext Editor)</td></tr>
  </table>
  
--- 843,849 ----
    <td valign="top"><a name="desc_wikitext_editor">wikitext_editor</a></td>
    <td valign="top">false</td>
!   <td valign="top">Allow using wiki syntax in stories. This adds a third
!     option, "Wiki-style format", to the Post Mode dropdown in the story editor
!     (implemented using the <a href="http://pear.php.net/package/Text_Wiki">PEAR::Text_Wiki</a> package).</td></tr>
  </table>
  
***************
*** 1050,1058 ****
    <td valign="top"><a name="desc_language_files">language_files</a></td>
    <td valign="top"><i>(commented out)</i></td>
!   <td valign="top">(Language Files)</td></tr>
  <tr>
    <td valign="top"><a name="desc_languages">languages</a></td>
    <td valign="top"><i>(commented out)</i></td>
!   <td valign="top">(Languages)</td></tr>
  </table>
  
--- 1071,1082 ----
    <td valign="top"><a name="desc_language_files">language_files</a></td>
    <td valign="top"><i>(commented out)</i></td>
!   <td valign="top">For multi-lingual setups only: A list mapping language
!     shortcuts ('en', 'de', etc.) to the Geeklog language files to use.</td></tr>
  <tr>
    <td valign="top"><a name="desc_languages">languages</a></td>
    <td valign="top"><i>(commented out)</i></td>
!   <td valign="top">For multi-lingual setups only: A list mapping language
!     shortcuts ('en', 'de', etc.) to the language's native name ("English",
!     "Deutsch", etc.).</td></tr>
  </table>
  
***************
*** 1336,1339 ****
--- 1360,1388 ----
  <code>$_CONF['ip_lookup']</code> should hold the complete URL to the lookup service, with a '<code>*</code>' marking the place where the IP address should go. It's also possible to use Tom Willet's <a href="http://sourceforge.net/project/showfiles.php?group_id=68255&amp;package_id=95743">NetTools</a> package, in which case the correct setting would be <code>$_CONF['ip_lookup'] = $_CONF['site_url'] . '/nettools/whois.php?domain=*';</code></td></tr>
  </table>
+ 
+ <h3><a name="misc_ip_webservices">Miscellaneous: Webservices</a></h3>
+ 
+ <table border="1" width="100%">
+ <tr><th width="8%">Variable</th>
+     <th width="29%">Default Value</th>
+     <th width="63%">Description</th></tr>
+ <tr>
+   <td valign="top"><a name="desc_disable_webservices">disable_webservices</a></td>
+   <td valign="top">false</td>
+   <td valign="top">Set this to <code>true</code> to disable the webservices.</td></tr>
+ <tr>
+   <td valign="top"><a name="desc_restrict_webservices">restrict_webservices</a></td>
+   <td valign="top">false</td>
+   <td valign="top">Set this to <code>true</code> to restrict webservices usage
+     to users with the <tt>webservices.atompub</tt> permission (e.g. those in
+     the predefined "Webservices Users" group).</td></tr>
+ <tr>
+   <td valign="top"><a name="desc_atom_max_stories">atom_max_stories</a></td>
+   <td valign="top">10</td>
+   <td valign="top">Max. number of stories returned when an Atom feed is
+     requested through the webservices API.</td></tr>
+ </table>
+ 
+ <p>Also see <a href="http://wiki.geeklog.net/wiki/index.php/Using_the_Webservices">Using the Webservices</a> in the Geeklog Wiki.</p>
  
  



From mjervis at qs1489.pair.com  Sat May  3 11:09:15 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Sat, 03 May 2008 15:09:15 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages/templates/admin
	editor.thtml, 1.19, 1.20 editor_advanced.thtml, 1.11, 1.12
Message-ID: <20080503150915.963A410FE12@qs1489.pair.com>

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

Modified Files:
	editor.thtml editor_advanced.thtml 
Log Message:
Static pages, moderation, configration - Security hardenning.

Index: editor_advanced.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/templates/admin/editor_advanced.thtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** editor_advanced.thtml	25 Nov 2007 06:58:15 -0000	1.11
--- editor_advanced.thtml	3 May 2008 15:09:13 -0000	1.12
***************
*** 164,167 ****
--- 164,168 ----
                    {delete_option}
                    <input type="hidden" name="sp_old_id" value="{sp_old_id}"{xhtml}>
+                   <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
                </td>
            </tr>

Index: editor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/templates/admin/editor.thtml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** editor.thtml	25 Nov 2007 06:58:15 -0000	1.19
--- editor.thtml	3 May 2008 15:09:13 -0000	1.20
***************
*** 133,136 ****
--- 133,137 ----
                    {delete_option}
                    <input type="hidden" name="sp_old_id" value="{sp_old_id}"{xhtml}>
+                   <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
                </td>
            </tr>



From mjervis at qs1489.pair.com  Sat May  3 11:09:15 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Sat, 03 May 2008 15:09:15 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/plugins/staticpages
	index.php, 1.91, 1.92
Message-ID: <20080503150915.B241310FE15@qs1489.pair.com>

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

Modified Files:
	index.php 
Log Message:
Static pages, moderation, configration - Security hardenning.

Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/plugins/staticpages/index.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** index.php	15 Mar 2008 20:37:34 -0000	1.91
--- index.php	3 May 2008 15:09:13 -0000	1.92
***************
*** 371,374 ****
--- 371,376 ----
                  COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer')));
          $sp_template->set_var( 'xhtml', XHTML );
+         $sp_template->set_var( 'gltoken_name', CSRF_TOKEN );
+         $sp_template->set_var( 'gltoken', SEC_createToken() );
          $retval .= $sp_template->parse('output','form');
      }
***************
*** 552,556 ****
  $display = '';
  
! if (($mode == $LANG_ADMIN['delete']) && !empty ($LANG_ADMIN['delete'])) {
      if (empty ($sp_id) || (is_numeric ($sp_id) && ($sp_id == 0))) {
          COM_errorLog ('Attempted to delete static page sp_id=' . $sp_id);
--- 554,558 ----
  $display = '';
  
! if (($mode == $LANG_ADMIN['delete']) && !empty ($LANG_ADMIN['delete']) && SEC_checkToken()) {
      if (empty ($sp_id) || (is_numeric ($sp_id) && ($sp_id == 0))) {
          COM_errorLog ('Attempted to delete static page sp_id=' . $sp_id);
***************
*** 577,581 ****
          $display = COM_refresh ($_CONF['site_admin_url'] . '/index.php');
      }
! } else if (($mode == $LANG_ADMIN['save']) && !empty ($LANG_ADMIN['save'])) {
      if (!empty ($sp_id)) {
          if (!isset ($_POST['sp_onmenu'])) {
--- 579,583 ----
          $display = COM_refresh ($_CONF['site_admin_url'] . '/index.php');
      }
! } else if (($mode == $LANG_ADMIN['save']) && !empty ($LANG_ADMIN['save']) && SEC_checkToken()) {
      if (!empty ($sp_id)) {
          if (!isset ($_POST['sp_onmenu'])) {



From mjervis at qs1489.pair.com  Sat May  3 11:09:15 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Sat, 03 May 2008 15:09:15 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin configuration.php, 1.12,
	1.13 moderation.php, 1.119, 1.120
Message-ID: <20080503150915.A505310FE14@qs1489.pair.com>

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

Modified Files:
	configuration.php moderation.php 
Log Message:
Static pages, moderation, configration - Security hardenning.

Index: moderation.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/moderation.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** moderation.php	19 Apr 2008 12:13:18 -0000	1.119
--- moderation.php	3 May 2008 15:09:13 -0000	1.120
***************
*** 79,83 ****
  *
  */
! function commandcontrol()
  {
      global $_CONF, $_TABLES, $LANG01, $LANG29, $_IMAGE_TYPE, $_DB_dbms;
--- 79,83 ----
  *
  */
! function commandcontrol($token)
  {
      global $_CONF, $_TABLES, $LANG01, $LANG29, $_IMAGE_TYPE, $_DB_dbms;
***************
*** 212,216 ****
  
      if (SEC_hasRights('story.moderate')) {
!         $retval .= itemlist('story');
      }
  
--- 212,216 ----
  
      if (SEC_hasRights('story.moderate')) {
!         $retval .= itemlist('story', $token);
      }
  
***************
*** 226,230 ****
      }
  
!     $retval .= PLG_showModerationList();
  
      return $retval;
--- 226,230 ----
      }
  
!     $retval .= PLG_showModerationList($token);
  
      return $retval;
***************
*** 239,243 ****
  *
  */
! function itemlist($type)
  {
      global $_CONF, $_TABLES, $LANG29, $LANG_ADMIN;
--- 239,243 ----
  *
  */
! function itemlist($type, $token)
  {
      global $_CONF, $_TABLES, $LANG29, $LANG_ADMIN;
***************
*** 314,317 ****
--- 314,318 ----
      if ($nrows > 0) {
          $form_arr['bottom'] = '<input type="hidden" name="type" value="' . $type . '"' . XHTML . '>' . LB
+                 . '<input type="hidden" name="' . CSRF_TOKEN . '" value="' . $token . '"'. XHTML . '>' . LB
                  . '<input type="hidden" name="mode" value="moderation"' . XHTML . '>' . LB
                  . '<input type="hidden" name="count" value="' . $nrows . '"' . XHTML . '>'
***************
*** 569,573 ****
      }
  
!     $retval .= commandcontrol();
  
      return $retval;
--- 570,574 ----
      }
  
!     $retval .= commandcontrol(SEC_createToken());
  
      return $retval;
***************
*** 634,638 ****
      }
  
!     $retval .= commandcontrol();
  
      return $retval;
--- 635,639 ----
      }
  
!     $retval .= commandcontrol(SEC_createToken());
  
      return $retval;
***************
*** 669,673 ****
  }
  
! if (isset ($_POST['mode']) && ($_POST['mode'] == 'moderation')) {
      $action = array();
      if (isset($_POST['action'])) {
--- 670,674 ----
  }
  
! if (isset ($_POST['mode']) && ($_POST['mode'] == 'moderation') && SEC_checkToken()) {
      $action = array();
      if (isset($_POST['action'])) {
***************
*** 683,687 ****
  } else {
      $display .= security_check_reminder();
!     $display .= commandcontrol();
  }
  
--- 684,688 ----
  } else {
      $display .= security_check_reminder();
!     $display .= commandcontrol(SEC_createToken());
  }
  

Index: configuration.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/configuration.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** configuration.php	21 Mar 2008 15:38:05 -0000	1.12
--- configuration.php	3 May 2008 15:09:13 -0000	1.13
***************
*** 88,94 ****
  }
  
  
  // MAIN
! if (array_key_exists('set_action', $_POST)){
      if (SEC_inGroup('Root')) {
          if ($_POST['set_action'] == 'restore') {
--- 88,95 ----
  }
  
+ $tokenstate = SEC_checkToken();
  
  // MAIN
! if (array_key_exists('set_action', $_POST) && $tokenstate){
      if (SEC_inGroup('Root')) {
          if ($_POST['set_action'] == 'restore') {
***************
*** 100,104 ****
  }
  
! if (array_key_exists('form_submit', $_POST)) {
      $result = null;
      if (! array_key_exists('form_reset', $_POST)) {
--- 101,105 ----
  }
  
! if (array_key_exists('form_submit', $_POST) && $tokenstate) {
      $result = null;
      if (! array_key_exists('form_reset', $_POST)) {



From mjervis at qs1489.pair.com  Sat May  3 11:09:15 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Sat, 03 May 2008 15:09:15 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs theme.html,1.76,1.77
Message-ID: <20080503150915.C22E610FE16@qs1489.pair.com>

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

Modified Files:
	theme.html 
Log Message:
Static pages, moderation, configration - Security hardenning.

Index: theme.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** theme.html	1 May 2008 19:43:42 -0000	1.76
--- theme.html	3 May 2008 15:09:13 -0000	1.77
***************
*** 212,215 ****
--- 212,221 ----
      <li>admin/story/storyeditor.thtml</li>
      <li>admin/story/storyeditor_advanced.thtml</li>
+     <li>admin/config/configuration.thtml (new theme file for 1.5)</li>
+ </ul>
+ <p>Some plugin specific templates have also been changed, you may also need to check:</p>
+ <ul>
+   <li>plugins/staticpages/templates/admin/editor.thtml</li>
+   <li>plugins/staticpages/templates/admin/editor_advanced.thtml</li>
  </ul>
  



From mjervis at qs1489.pair.com  Sat May  3 11:09:15 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Sat, 03 May 2008 15:09:15 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.38,
	1.39
Message-ID: <20080503150915.DCCFA10FE18@qs1489.pair.com>

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

Modified Files:
	config.class.php 
Log Message:
Static pages, moderation, configration - Security hardenning.

Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** config.class.php	2 May 2008 19:30:11 -0000	1.38
--- config.class.php	3 May 2008 15:09:13 -0000	1.39
***************
*** 426,429 ****
--- 426,431 ----
          $t->set_var('layout_url', $_CONF['layout_url']);
          $t->set_var('xhtml', XHTML);
+         $t->set_var('gltoken_name', CSRF_TOKEN);
+         $t->set_var('gltoken', SEC_createToken());
  
          $t->set_var('lang_save_changes', $LANG_CONFIG['save_changes']);



From mjervis at qs1489.pair.com  Sat May  3 11:09:15 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Sat, 03 May 2008 15:09:15 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/config
	configuration.thtml, 1.11, 1.12
Message-ID: <20080503150915.CDF6710FE17@qs1489.pair.com>

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

Modified Files:
	configuration.thtml 
Log Message:
Static pages, moderation, configration - Security hardenning.

Index: configuration.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/config/configuration.thtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configuration.thtml	10 Feb 2008 13:08:06 -0000	1.11
--- configuration.thtml	3 May 2008 15:09:13 -0000	1.12
***************
*** 4,7 ****
--- 4,8 ----
  <input type="hidden" value="{open_group}" name="conf_group"{xhtml}>
  <input type="hidden" value="" name="subgroup"{xhtml}>
+ <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
  </form>
  <table>
***************
*** 19,22 ****
--- 20,24 ----
              <input type="hidden" name="conf_group" value="{open_group}"{xhtml}>
              <input type="hidden" name="sub_group" value="{open_sg}"{xhtml}>
+             <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
  
              <div id="ce_{subgroup_name}">



From mjervis at qs1489.pair.com  Sat May  3 11:09:15 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Sat, 03 May 2008 15:09:15 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-plugins.php,1.143,1.144
Message-ID: <20080503150915.EDA5E10FE19@qs1489.pair.com>

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

Modified Files:
	lib-plugins.php 
Log Message:
Static pages, moderation, configration - Security hardenning.

Index: lib-plugins.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-plugins.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** lib-plugins.php	19 Apr 2008 16:44:39 -0000	1.143
--- lib-plugins.php	3 May 2008 15:09:13 -0000	1.144
***************
*** 998,1002 ****
  *
  */
! function PLG_showModerationList()
  {
      global $_PLUGINS;
--- 998,1002 ----
  *
  */
! function PLG_showModerationList($token)
  {
      global $_PLUGINS;
***************
*** 1005,1009 ****
  
      foreach ($_PLUGINS as $pi_name) {
!         $retval .= itemlist($pi_name);
      }
  
--- 1005,1009 ----
  
      foreach ($_PLUGINS as $pi_name) {
!         $retval .= itemlist($pi_name, $token);
      }
  



From mjervis at qs1489.pair.com  Sat May  3 15:04:10 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Sat, 03 May 2008 19:04:10 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes story.class.php, 1.25, 1.26
Message-ID: <20080503190410.4CB4710FE15@qs1489.pair.com>

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

Modified Files:
	story.class.php 
Log Message:
Fixes to introduced case flattening issue when fixing multi-[code]/[raw] block handling.

Index: story.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/story.class.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** story.class.php	1 May 2008 19:43:42 -0000	1.25
--- story.class.php	3 May 2008 19:04:08 -0000	1.26
***************
*** 1508,1512 ****
                  while( $start_pos !== false ) {
                      /* Copy in to start to out */
!                     $out .= MBYTE_substr($inlower, 0, $start_pos);
                      /* Find end */
                      $end_pos = MBYTE_strpos($inlower, '[/raw]');
--- 1508,1512 ----
                  while( $start_pos !== false ) {
                      /* Copy in to start to out */
!                     $out .= MBYTE_substr($buffer, 0, $start_pos);
                      /* Find end */
                      $end_pos = MBYTE_strpos($inlower, '[/raw]');
***************
*** 1542,1546 ****
                  while( $start_pos !== false ) {
                      /* Copy in to start to out */
!                     $out .= MBYTE_substr($inlower, 0, $start_pos);
                      /* Find end */
                      $end_pos = MBYTE_strpos($inlower, '[/code]');
--- 1542,1546 ----
                  while( $start_pos !== false ) {
                      /* Copy in to start to out */
!                     $out .= MBYTE_substr($buffer, 0, $start_pos);
                      /* Find end */
                      $end_pos = MBYTE_strpos($inlower, '[/code]');



From dhaun at qs1489.pair.com  Sat May  3 16:02:00 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 03 May 2008 20:02:00 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs theme.html,1.77,1.78
Message-ID: <20080503200200.E898010FE12@qs1489.pair.com>

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

Modified Files:
	theme.html 
Log Message:
Fixed path to the submitstory templates


Index: theme.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** theme.html	3 May 2008 15:09:13 -0000	1.77
--- theme.html	3 May 2008 20:01:58 -0000	1.78
***************
*** 172,177 ****
--- 172,180 ----
  lib-custom.php to output any HTML you like.</p>
  
+ 
  <h2><a name="changes">Theme changes in Geeklog 1.5.0</a></h2>
+ 
  <h3><a name="xhtml">XHTML support</a></h3>
+ 
  <p>Geeklog now supports XHTML compliant themes. These themes should define the
  following constant in their <tt>functions.php</tt> file:</p>
***************
*** 187,196 ****
  
  <h3>"Contribute" - User submitted stories</h3>
  <p>Geeklog 1.5.0 supports the ability for users to specify story intro text
    and body text seperately rather than just the intro text. This can be
  turned on and off by changing the templates. The files:</p>
  <ul>
!     <li>professional/submitstory.thtml</li>
!     <li>professional/submitstory_advanced.thtml</li>
  </ul>
  <p>Contain table rows containing the bodytext inputs. Simply removing these
--- 190,200 ----
  
  <h3>"Contribute" - User submitted stories</h3>
+ 
  <p>Geeklog 1.5.0 supports the ability for users to specify story intro text
    and body text seperately rather than just the intro text. This can be
  turned on and off by changing the templates. The files:</p>
  <ul>
!     <li>submit/submitstory.thtml</li>
!     <li>submit/submitstory_advanced.thtml</li>
  </ul>
  <p>Contain table rows containing the bodytext inputs. Simply removing these
***************
*** 198,201 ****
--- 202,206 ----
  
  <h3>Admin-Menu, Topic-List &amp; User-Menus</h3>
+ 
  <p>All the above mentioned items are now lists, using <code>ul</code> and
  <code>li</code> tags. The <code>ul</code> is inserted by the core code, the
***************
*** 203,206 ****
--- 208,212 ----
  
  <h3>Security Changes</h3>
+ 
  <p>Many forms, particularly in the admin section of the site need a new hidden
  form field in order for saving the form/processing the action to work. Add:</p>



From mjervis at qs1489.pair.com  Sun May  4 02:57:37 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Sun, 04 May 2008 06:57:37 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes kses.class.php,1.4,1.5
Message-ID: <20080504065737.99C1710FE12@qs1489.pair.com>

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

Modified Files:
	kses.class.php 
Log Message:
KSES patch.

Index: kses.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/kses.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kses.class.php	11 Jan 2007 20:40:41 -0000	1.4
--- kses.class.php	4 May 2008 06:57:35 -0000	1.5
***************
*** 942,951 ****
  			function _bad_protocol_once($string)
  			{
! 				return preg_replace(
! 					'/^((&[^;]*;|[\sA-Za-z0-9])*)'.
! 					'(:|&#58;|&#[Xx]3[Aa];)\s*/e',
! 					'\$this->_bad_protocol_once2("\\1")',
! 					$string
! 				);
  			}
  
--- 942,951 ----
  			function _bad_protocol_once($string)
  			{
!                  $string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
!                  if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
!                  {
!                    $string = $this->_bad_protocol_once2($string2[0]).trim($string2[1]);
!                  }
!                  return $string;
  			}
  



From mjervis at qs1489.pair.com  Sun May  4 03:32:55 2008
From: mjervis at qs1489.pair.com (Michael Jervis)
Date: Sun, 04 May 2008 07:32:55 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin moderation.php, 1.120,
	1.121
Message-ID: <20080504073255.1A39810FE12@qs1489.pair.com>

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

Modified Files:
	moderation.php 
Log Message:
Templating bug (0000617 / jmucchiello)

Index: moderation.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/moderation.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** moderation.php	3 May 2008 15:09:13 -0000	1.120
--- moderation.php	4 May 2008 07:32:53 -0000	1.121
***************
*** 207,211 ****
      }
  
!     $retval .= $admin_templates->parse('output','cc');
  
      $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
--- 207,211 ----
      }
  
!     $retval .= $admin_templates->finish($admin_templates->parse('output','cc'));
  
      $retval .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));



From dhaun at qs1489.pair.com  Sun May  4 05:16:35 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 04 May 2008 09:16:35 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/calendar install_defaults.php, 1.3,
	1.4
Message-ID: <20080504091635.6D3F110FE15@qs1489.pair.com>

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

Modified Files:
	install_defaults.php 
Log Message:
Fixed plugin updates: Need to merge the DEFAULT config with the old CONF so that we pick up new entries


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/install_defaults.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install_defaults.php	2 May 2008 12:12:05 -0000	1.3
--- install_defaults.php	4 May 2008 09:16:33 -0000	1.4
***************
*** 117,121 ****
  
      if (is_array($_CA_CONF) && (count($_CA_CONF) > 1)) {
!         $_CA_DEFAULT = $_CA_CONF;
      }
  
--- 117,121 ----
  
      if (is_array($_CA_CONF) && (count($_CA_CONF) > 1)) {
!         $_CA_DEFAULT = array_merge($_CA_DEFAULT, $_CA_CONF);
      }
  



From dhaun at qs1489.pair.com  Sun May  4 05:16:35 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 04 May 2008 09:16:35 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links install_defaults.php, 1.3,
	1.4
Message-ID: <20080504091635.7B38010FE16@qs1489.pair.com>

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

Modified Files:
	install_defaults.php 
Log Message:
Fixed plugin updates: Need to merge the DEFAULT config with the old CONF so that we pick up new entries


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/install_defaults.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install_defaults.php	2 May 2008 12:12:05 -0000	1.3
--- install_defaults.php	4 May 2008 09:16:33 -0000	1.4
***************
*** 167,171 ****
  
      if (is_array($_LI_CONF) && (count($_LI_CONF) > 1)) {
!         $_LI_DEFAULT = $_LI_CONF;
      }
  
--- 167,171 ----
  
      if (is_array($_LI_CONF) && (count($_LI_CONF) > 1)) {
!         $_LI_DEFAULT = array_merge($_LI_DEFAULT, $_LI_CONF);
      }
  



From dhaun at qs1489.pair.com  Sun May  4 05:16:35 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 04 May 2008 09:16:35 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls install_defaults.php, 1.2,
	1.3
Message-ID: <20080504091635.8ADF910FE17@qs1489.pair.com>

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

Modified Files:
	install_defaults.php 
Log Message:
Fixed plugin updates: Need to merge the DEFAULT config with the old CONF so that we pick up new entries


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/install_defaults.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install_defaults.php	21 Mar 2008 17:09:26 -0000	1.2
--- install_defaults.php	4 May 2008 09:16:33 -0000	1.3
***************
*** 105,109 ****
  
      if (is_array($_PO_CONF) && (count($_PO_CONF) > 1)) {
!         $_PO_DEFAULT = $_PO_CONF;
      }
  
--- 105,109 ----
  
      if (is_array($_PO_CONF) && (count($_PO_CONF) > 1)) {
!         $_PO_DEFAULT = array_merge($_PO_DEFAULT, $_PO_CONF);
      }
  



From dhaun at qs1489.pair.com  Sun May  4 05:16:35 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 04 May 2008 09:16:35 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages install_defaults.php,
	1.5, 1.6
Message-ID: <20080504091635.A689510FE19@qs1489.pair.com>

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

Modified Files:
	install_defaults.php 
Log Message:
Fixed plugin updates: Need to merge the DEFAULT config with the old CONF so that we pick up new entries


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/install_defaults.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** install_defaults.php	21 Mar 2008 17:09:26 -0000	1.5
--- install_defaults.php	4 May 2008 09:16:33 -0000	1.6
***************
*** 122,126 ****
  
      if (is_array($_SP_CONF) && (count($_SP_CONF) > 1)) {
!         $_SP_DEFAULT = $_SP_CONF;
      }
  
--- 122,126 ----
  
      if (is_array($_SP_CONF) && (count($_SP_CONF) > 1)) {
!         $_SP_DEFAULT = array_merge($_SP_DEFAULT, $_SP_CONF);
      }
  



From dhaun at qs1489.pair.com  Sun May  4 05:16:35 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 04 May 2008 09:16:35 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/spamx install_defaults.php, 1.2,
	1.3
Message-ID: <20080504091635.958B510FE18@qs1489.pair.com>

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

Modified Files:
	install_defaults.php 
Log Message:
Fixed plugin updates: Need to merge the DEFAULT config with the old CONF so that we pick up new entries


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/install_defaults.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install_defaults.php	10 Feb 2008 17:09:37 -0000	1.2
--- install_defaults.php	4 May 2008 09:16:33 -0000	1.3
***************
*** 81,85 ****
  
      if (is_array($_SPX_CONF) && (count($_SPX_CONF) > 1)) {
!         $_SPX_DEFAULT = $_SPX_CONF;
      }
  
--- 81,85 ----
  
      if (is_array($_SPX_CONF) && (count($_SPX_CONF) > 1)) {
!         $_SPX_DEFAULT = array_merge($_SPX_DEFAULT, $_SPX_CONF);
      }
  



From dhaun at qs1489.pair.com  Sun May  4 05:16:35 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 04 May 2008 09:16:35 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links install_defaults.php, 1.3,
	1.4
Message-ID: <20080504091635.7B38010FE16@qs1489.pair.com>

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

Modified Files:
	install_defaults.php 
Log Message:
Fixed plugin updates: Need to merge the DEFAULT config with the old CONF so that we pick up new entries


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/install_defaults.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install_defaults.php	2 May 2008 12:12:05 -0000	1.3
--- install_defaults.php	4 May 2008 09:16:33 -0000	1.4
***************
*** 167,171 ****
  
      if (is_array($_LI_CONF) && (count($_LI_CONF) > 1)) {
!         $_LI_DEFAULT = $_LI_CONF;
      }
  
--- 167,171 ----
  
      if (is_array($_LI_CONF) && (count($_LI_CONF) > 1)) {
!         $_LI_DEFAULT = array_merge($_LI_DEFAULT, $_LI_CONF);
      }
  



From dhaun at qs1489.pair.com  Sun May  4 05:16:35 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 04 May 2008 09:16:35 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls install_defaults.php, 1.2,
	1.3
Message-ID: <20080504091635.8ADF910FE17@qs1489.pair.com>

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

Modified Files:
	install_defaults.php 
Log Message:
Fixed plugin updates: Need to merge the DEFAULT config with the old CONF so that we pick up new entries


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/install_defaults.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** install_defaults.php	21 Mar 2008 17:09:26 -0000	1.2
--- install_defaults.php	4 May 2008 09:16:33 -0000	1.3
***************
*** 105,109 ****
  
      if (is_array($_PO_CONF) && (count($_PO_CONF) > 1)) {
!         $_PO_DEFAULT = $_PO_CONF;
      }
  
--- 105,109 ----
  
      if (is_array($_PO_CONF) && (count($_PO_CONF) > 1)) {
!         $_PO_DEFAULT = array_merge($_PO_DEFAULT, $_PO_CONF);
      }
  



From dhaun at qs1489.pair.com  Sun May  4 05:26:39 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 04 May 2008 09:26:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs install.html,1.52,1.53
Message-ID: <20080504092639.5F03D10FE12@qs1489.pair.com>

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

Modified Files:
	install.html 
Log Message:
When upgrading, don't forgot to put the config.php files back into place so the install script can use them to pre-populate the Configuration.


Index: install.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/install.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** install.html	1 May 2008 17:23:41 -0000	1.52
--- install.html	4 May 2008 09:26:37 -0000	1.53
***************
*** 14,18 ****
  <ul>
    <li><a href="#glossary">Glossary</a></li>
!   <li><a href="#installation_requirements">Installation Requirements</a></li>
      <ul>
        <li><a href="#preinstall">Required Software</a></li>
--- 14,18 ----
  <ul>
    <li><a href="#glossary">Glossary</a></li>
!   <li><a href="#installation_requirements">Installation Requirements</a>
      <ul>
        <li><a href="#preinstall">Required Software</a></li>
***************
*** 113,116 ****
--- 113,119 ----
          <li>
              <p>Place the contents of <code>Geeklog-1.x/</code> into the same directory your old installation was located. For instance, if your old Geeklog was in <code>/usr/home/www/geeklog/</code>, then your new installation should also be in <code>/usr/home/www/geeklog/</code>.</p>
+         </li>
+         <li>
+             <p><strong>When upgrading from Geeklog 1.4.1 or earlier</strong>: Put the <tt>config.php</tt> files from your old install back into their place now (the main <tt>config.php</tt> and those for the plugins). The install script will read these files during the upgrade to pre-populate the new Configuration admin panel with your settings. If you skip this step, you will end up with default settings for Geeklog and the pre-installed plugins.</p>
          </li>
          <li>



From dhaun at qs1489.pair.com  Sun May  4 05:32:14 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 04 May 2008 09:32:14 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs support.html,1.24,1.25
Message-ID: <20080504093214.F005E10FE12@qs1489.pair.com>

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

Modified Files:
	support.html 
Log Message:
Fixed validation error (& -> &amp;)


Index: support.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/support.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** support.html	1 May 2008 17:23:41 -0000	1.24
--- support.html	4 May 2008 09:32:12 -0000	1.25
***************
*** 33,37 ****
  <h3>Mailing Lists</h3>
  
! <p>If you prefer email, there are also several <a href="http://www.geeklog.net/faqman/index.php?op=view&t=15">mailing lists</a> that you can use. Questions regarding installing and running Geeklog are best posted on the <a href="http://lists.geeklog.net/mailman/listinfo/geeklog-users">geeklog-users</a> mailing list.</p>
  
  <p><strong>Note:</strong> Please note that due to the ever-increasing amount of spam, you have to subscribe to the mailing lists before you can post there. <strong>Posts by non-subscribers are silently discarded</strong>, so make sure to subscribe first.</p>
--- 33,37 ----
  <h3>Mailing Lists</h3>
  
! <p>If you prefer email, there are also several <a href="http://www.geeklog.net/faqman/index.php?op=view&amp;t=15">mailing lists</a> that you can use. Questions regarding installing and running Geeklog are best posted on the <a href="http://lists.geeklog.net/mailman/listinfo/geeklog-users">geeklog-users</a> mailing list.</p>
  
  <p><strong>Note:</strong> Please note that due to the ever-increasing amount of spam, you have to subscribe to the mailing lists before you can post there. <strong>Posts by non-subscribers are silently discarded</strong>, so make sure to subscribe first.</p>



From blaine at qs1489.pair.com  Sun May  4 17:43:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sun, 04 May 2008 21:43:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.692,1.693
Message-ID: <20080504214301.21F8510FE12@qs1489.pair.com>

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

Modified Files:
	lib-common.php 
Log Message:
Moved the call to PLG_templateSetVars to before the parse of the left and right block templates to support CTL and plugins that want to set template vars in the left and right block related templates.

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.692
retrieving revision 1.693
diff -C2 -d -r1.692 -r1.693
*** lib-common.php	1 May 2008 15:43:16 -0000	1.692
--- lib-common.php	4 May 2008 21:42:59 -0000	1.693
***************
*** 1112,1115 ****
--- 1112,1118 ----
      }
  
+     // Call to plugins to set template variables in the header
+     PLG_templateSetVars( 'header', $header );
+ 
      if( $_CONF['left_blocks_in_footer'] == 1 )
      {
***************
*** 1216,1222 ****
      $header->set_var( 'plg_headercode', $headercode . PLG_getHeaderCode() );
  
-     // Call to plugins to set template variables in the header
-     PLG_templateSetVars( 'header', $header );
- 
      // The following lines allow users to embed PHP in their templates.  This
      // is almost a contradition to the reasons for using templates but this may
--- 1219,1222 ----
***************
*** 2952,2956 ****
      }
      while( $start_pos !== false );
!     
      // handle [raw] ... [/raw]
      do
--- 2952,2956 ----
      }
      while( $start_pos !== false );
! 
      // handle [raw] ... [/raw]
      do



From blaine at qs1489.pair.com  Sun May  4 17:50:13 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Sun, 04 May 2008 21:50:13 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.693,1.694
Message-ID: <20080504215013.C8FBD10FE12@qs1489.pair.com>

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

Modified Files:
	lib-common.php 
Log Message:
Change to code in COM_startBlock() to use COM_sanitizeID to set the name for the {blockid} template variable.

Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.693
retrieving revision 1.694
diff -C2 -d -r1.693 -r1.694
*** lib-common.php	4 May 2008 21:42:59 -0000	1.693
--- lib-common.php	4 May 2008 21:50:11 -0000	1.694
***************
*** 1487,1491 ****
      if (!isset($GLOBALS['siteblocks'])) $GLOBALS['siteblocks'] = array();
      $blockid = stripslashes ($title);
!     $blockid = strtr($blockid, "!@#$%^&*()'\"\\/?~`.,;: ", "________________________");
      // Check if there is already a block of the same name
      if (in_array($blockid,$GLOBALS['siteblocks'])) {
--- 1487,1491 ----
      if (!isset($GLOBALS['siteblocks'])) $GLOBALS['siteblocks'] = array();
      $blockid = stripslashes ($title);
!     $blockid = COM_sanitizeID($title);
      // Check if there is already a block of the same name
      if (in_array($blockid,$GLOBALS['siteblocks'])) {



From blaine at qs1489.pair.com  Sun May  4 20:30:39 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:30:39 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin mail.php, 1.34,
	1.35 user.php, 1.201, 1.202
Message-ID: <20080505003039.CE71B10FE12@qs1489.pair.com>

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

Modified Files:
	mail.php user.php 
Log Message:
Found a function name conflict 'display_form' so the names have been changed to better define their use.

Index: mail.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/mail.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** mail.php	25 Nov 2007 06:58:55 -0000	1.34
--- mail.php	5 May 2008 00:30:37 -0000	1.35
***************
*** 38,42 ****
  $display = '';
  
! // Make sure user has access to this page  
  if (!SEC_inGroup ('Mail Admin') && !SEC_hasrights ('user.mail')) {
      $retval .= COM_siteHeader ('menu', $MESSAGE[30]);
--- 38,42 ----
  $display = '';
  
! // Make sure user has access to this page
  if (!SEC_inGroup ('Mail Admin') && !SEC_hasrights ('user.mail')) {
      $retval .= COM_siteHeader ('menu', $MESSAGE[30]);
***************
*** 58,62 ****
  *
  */
! function display_form ()
  {
      global $_CONF, $_TABLES, $_USER, $LANG31;
--- 58,62 ----
  *
  */
! function display_mailform ()
  {
      global $_CONF, $_TABLES, $_USER, $LANG31;
***************
*** 123,127 ****
  {
      global $_CONF, $_TABLES, $LANG31;
!     
      require_once($_CONF['path_system'] . 'lib-user.php');
  
--- 123,127 ----
  {
      global $_CONF, $_TABLES, $LANG31;
! 
      require_once($_CONF['path_system'] . 'lib-user.php');
  
***************
*** 147,156 ****
  
      // If you want to send html mail
!     if (isset ($vars['html'])) { 
          $html = true;
      } else {
          $html = false;
      }
!     
      $groupList = implode (',', USER_getChildGroups($vars['to_group']));
  
--- 147,156 ----
  
      // If you want to send html mail
!     if (isset ($vars['html'])) {
          $html = true;
      } else {
          $html = false;
      }
! 
      $groupList = implode (',', USER_getChildGroups($vars['to_group']));
  
***************
*** 229,233 ****
      $display .= send_messages ($_POST);
  } else {
!     $display .= display_form ();
  }
  
--- 229,233 ----
      $display .= send_messages ($_POST);
  } else {
!     $display .= display_mailform ();
  }
  

Index: user.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.201
retrieving revision 1.202
diff -C2 -d -r1.201 -r1.202
*** user.php	24 Feb 2008 19:43:53 -0000	1.201
--- user.php	5 May 2008 00:30:37 -0000	1.202
***************
*** 810,814 ****
      );
      $listoptions = array('chkdelete' => true, 'chkfield' => 'uid');
!     
      $menu_arr = array (
          array('url' => $_CONF['site_admin_url'] . '/user.php',
--- 810,814 ----
      );
      $listoptions = array('chkdelete' => true, 'chkfield' => 'uid');
! 
      $menu_arr = array (
          array('url' => $_CONF['site_admin_url'] . '/user.php',
***************
*** 1091,1095 ****
  *
  */
! function display_form ()
  {
      global $_CONF, $LANG28;
--- 1091,1095 ----
  *
  */
! function display_batchAddform ()
  {
      global $_CONF, $LANG28;
***************
*** 1201,1205 ****
                          COM_getBlockTemplate ('_admin_block', 'header'));
      $display .= $LANG28[25] . '<br' . XHTML . '><br' . XHTML . '>';
!     $display .= display_form();
      $display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
      $display .= COM_siteFooter();
--- 1201,1205 ----
                          COM_getBlockTemplate ('_admin_block', 'header'));
      $display .= $LANG28[25] . '<br' . XHTML . '><br' . XHTML . '>';
!     $display .= display_batchAddform();
      $display .= COM_endBlock (COM_getBlockTemplate ('_admin_block', 'footer'));
      $display .= COM_siteFooter();



From blaine at qs1489.pair.com  Sun May  4 20:32:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:32:01 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_about/sponsors
	- New directory
Message-ID: <20080505003201.06BE910FE12@qs1489.pair.com>

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

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




From blaine at qs1489.pair.com  Sun May  4 20:35:27 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:27 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses
	fck_othercommands.js, 1.6, 1.7 fckblockquotecommand.js, 1.1,
	1.2 fckcorestylecommand.js, 1.1, 1.2 fckfitwindow.js, 1.3,
	1.4 fckindentcommands.js, 1.1, 1.2 fckjustifycommands.js, 1.1,
	1.2 fcklistcommands.js, 1.1, 1.2 fcknamedcommand.js, 1.5,
	1.6 fckpasteplaintextcommand.js, 1.5,
	1.6 fckpastewordcommand.js, 1.6, 1.7 fckremoveformatcommand.js,
	1.1, 1.2 fckshowblocks.js, 1.1,
	1.2 fckspellcheckcommand_gecko.js, 1.4,
	1.5 fckspellcheckcommand_ie.js, 1.4, 1.5 fckstylecommand.js,
	1.5, 1.6 fcktablecommand.js, 1.6, 1.7 fcktextcolorcommand.js,
	1.5, 1.6
Message-ID: <20080505003527.1E0F510FE17@qs1489.pair.com>

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

Modified 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:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fcktablecommand.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fcktablecommand.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fcktablecommand.js	9 Feb 2008 12:53:57 -0000	1.6
--- fcktablecommand.js	5 May 2008 00:35:23 -0000	1.7
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 36,40 ****
  		switch ( this.Name )
  		{
! 			case 'TableMergeRight' : 
  				return FCKTableHandler.MergeRight() ;
  			case 'TableMergeDown' :
--- 36,40 ----
  		switch ( this.Name )
  		{
! 			case 'TableMergeRight' :
  				return FCKTableHandler.MergeRight() ;
  			case 'TableMergeDown' :
***************
*** 89,93 ****
  					return FCK_TRISTATE_DISABLED ;
  			case 'TableMergeCells' :
! 				if ( FCKTableHandler.CheckIsSelectionRectangular() 
  						&& FCKTableHandler.GetSelectedCells().length > 1 )
  					return FCK_TRISTATE_OFF ;
--- 89,93 ----
  					return FCK_TRISTATE_DISABLED ;
  			case 'TableMergeCells' :
! 				if ( FCKTableHandler.CheckIsSelectionRectangular()
  						&& FCKTableHandler.GetSelectedCells().length > 1 )
  					return FCK_TRISTATE_OFF ;
***************
*** 103,106 ****
  	}
  	else
! 		return FCK_TRISTATE_DISABLED; 
  }
--- 103,106 ----
  	}
  	else
! 		return FCK_TRISTATE_DISABLED;
  }

Index: fckpastewordcommand.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fckpastewordcommand.js	9 Feb 2008 12:53:57 -0000	1.6
--- fckpastewordcommand.js	5 May 2008 00:35:23 -0000	1.7
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 34,38 ****
  FCKPasteWordCommand.prototype.GetState = function()
  {
! 	if ( FCKConfig.ForcePasteAsPlainText )
  		return FCK_TRISTATE_DISABLED ;
  	else
--- 34,38 ----
  FCKPasteWordCommand.prototype.GetState = function()
  {
! 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || FCKConfig.ForcePasteAsPlainText )
  		return FCK_TRISTATE_DISABLED ;
  	else

Index: fckindentcommands.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckindentcommands.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckindentcommands.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckindentcommands.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 58,63 ****
  		// If we're in a list, then the indent/outdent operations would be done on the list nodes.
  		// Otherwise, apply the operation on the nearest block nodes.
! 		var nearestListBlock = FCKDomTools.GetCommonParentNode( range.StartNode || range.StartContainer , 
! 				range.EndNode || range.EndContainer, 
  				['ul', 'ol'] ) ;
  		if ( nearestListBlock )
--- 58,63 ----
  		// If we're in a list, then the indent/outdent operations would be done on the list nodes.
  		// Otherwise, apply the operation on the nearest block nodes.
! 		var nearestListBlock = FCKDomTools.GetCommonParentNode( range.StartNode || range.StartContainer ,
! 				range.EndNode || range.EndContainer,
  				['ul', 'ol'] ) ;
  		if ( nearestListBlock )
***************
*** 134,137 ****
--- 134,139 ----
  	{
  		var iterator = new FCKDomRangeIterator( range ) ;
+ 		iterator.EnforceRealBlocks = true ;
+ 
  		range.Expand( 'block_contents' ) ;
  		var commonParents = FCKDomTools.GetCommonParents( range.StartContainer, range.EndContainer ) ;

Index: fckcorestylecommand.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckcorestylecommand.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckcorestylecommand.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 50,53 ****
--- 50,55 ----
  	GetState : function()
  	{
+ 		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 			return FCK_TRISTATE_DISABLED ;
  		return this.IsActive ? FCK_TRISTATE_ON : FCK_TRISTATE_OFF ;
  	},

Index: fckfitwindow.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckfitwindow.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckfitwindow.js	9 Feb 2008 12:53:57 -0000	1.3
--- fckfitwindow.js	5 May 2008 00:35:23 -0000	1.4
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 156,160 ****
  	//also lost, even if you comment the following line (MakeEditable).
  	// if ( FCKBrowserInfo.IsGecko10 )	// Initially I thought it was a FF 1.0 only problem.
! 	if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) 
  		FCK.EditingArea.MakeEditable() ;
  
--- 156,160 ----
  	//also lost, even if you comment the following line (MakeEditable).
  	// if ( FCKBrowserInfo.IsGecko10 )	// Initially I thought it was a FF 1.0 only problem.
! 	if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
  		FCK.EditingArea.MakeEditable() ;
  

Index: fckspellcheckcommand_ie.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckspellcheckcommand_ie.js	9 Feb 2008 12:53:57 -0000	1.4
--- fckspellcheckcommand_ie.js	5 May 2008 00:35:23 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 64,67 ****
  FCKSpellCheckCommand.prototype.GetState = function()
  {
  	return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
! }
\ No newline at end of file
--- 64,69 ----
  FCKSpellCheckCommand.prototype.GetState = function()
  {
+ 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 		return FCK_TRISTATE_DISABLED ;
  	return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
! }

Index: fcknamedcommand.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fcknamedcommand.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fcknamedcommand.js	9 Feb 2008 12:53:57 -0000	1.5
--- fcknamedcommand.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 34,37 ****
--- 34,39 ----
  FCKNamedCommand.prototype.GetState = function()
  {
+ 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 		return FCK_TRISTATE_DISABLED ;
  	return FCK.GetNamedCommandState( this.Name ) ;
  }

Index: fckjustifycommands.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckjustifycommands.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckjustifycommands.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckjustifycommands.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 40,50 ****
  			{
  				case 'left' :
! 					return classes[0] ;
  				case 'center' :
! 					return classes[1] ;
  				case 'right' :
! 					return classes[2] ;
  				case 'justify' :
! 					return classes[3] ;
  			}
  		}
--- 40,50 ----
  			{
  				case 'left' :
! 					return classes[0] || null ;
  				case 'center' :
! 					return classes[1] || null ;
  				case 'right' :
! 					return classes[2] || null ;
  				case 'justify' :
! 					return classes[3] || null ;
  			}
  		}
***************
*** 100,104 ****
  		// change the DOM tree and break selections.
  		var bookmark = range.CreateBookmark() ;
! 		
  		var cssClassName = this._CssClassName ;
  
--- 100,104 ----
  		// change the DOM tree and break selections.
  		var bookmark = range.CreateBookmark() ;
! 
  		var cssClassName = this._CssClassName ;
  

Index: fckstylecommand.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckstylecommand.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fckstylecommand.js	9 Feb 2008 12:53:57 -0000	1.5
--- fckstylecommand.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 28,32 ****
  {
  	Name : 'Style',
! 	
  	Execute : function( styleName, styleComboItem )
  	{
--- 28,32 ----
  {
  	Name : 'Style',
! 
  	Execute : function( styleName, styleComboItem )
  	{
***************
*** 46,50 ****
  	GetState : function()
  	{
! 		if ( !FCK.EditorDocument )
  			return FCK_TRISTATE_DISABLED ;
  
--- 46,50 ----
  	GetState : function()
  	{
! 		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || !FCK.EditorDocument )
  			return FCK_TRISTATE_DISABLED ;
  

Index: fckblockquotecommand.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckblockquotecommand.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckblockquotecommand.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 26,30 ****
  }
  
! FCKBlockQuoteCommand.prototype = 
  {
  	Execute : function()
--- 26,30 ----
  }
  
! FCKBlockQuoteCommand.prototype =
  {
  	Execute : function()
***************
*** 46,53 ****
  			var bStart	= range.GetBookmarkNode( bookmark, true ) ;
  			var bEnd	= range.GetBookmarkNode( bookmark, false ) ;
! 			
  			var cursor ;
! 			
! 			if ( bStart 
  					&& bStart.parentNode.nodeName.IEquals( 'blockquote' )
  					&& !bStart.previousSibling )
--- 46,53 ----
  			var bStart	= range.GetBookmarkNode( bookmark, true ) ;
  			var bEnd	= range.GetBookmarkNode( bookmark, false ) ;
! 
  			var cursor ;
! 
! 			if ( bStart
  					&& bStart.parentNode.nodeName.IEquals( 'blockquote' )
  					&& !bStart.previousSibling )
***************
*** 61,65 ****
  			}
  
! 			if ( bEnd 
  					&& bEnd.parentNode.nodeName.IEquals( 'blockquote' )
  					&& !bEnd.previousSibling )
--- 61,65 ----
  			}
  
! 			if ( bEnd
  					&& bEnd.parentNode.nodeName.IEquals( 'blockquote' )
  					&& !bEnd.previousSibling )
***************
*** 127,131 ****
  				if ( block.nodeName.IEquals( 'blockquote' ) )
  				{
! 					var docFrag = block.ownerDocument.createDocumentFragment() ;
  					while ( block.firstChild )
  					{
--- 127,131 ----
  				if ( block.nodeName.IEquals( 'blockquote' ) )
  				{
! 					var docFrag = FCKTools.GetElementDocument( block ).createDocumentFragment() ;
  					while ( block.firstChild )
  					{
***************
*** 204,218 ****
  					if ( node.nodeName.IEquals( 'div' ) )
  					{
! 						var docFrag = node.ownerDocument.createDocumentFragment() ;
! 						var needBeginBr = firstTime && node.previousSibling && 
  							!FCKListsLib.BlockBoundaries[node.previousSibling.nodeName.toLowerCase()] ;
  						if ( firstTime && needBeginBr )
! 							docFrag.appendChild( node.ownerDocument.createElement( 'br' ) ) ;
! 						var needEndBr = node.nextSibling && 
  							!FCKListsLib.BlockBoundaries[node.nextSibling.nodeName.toLowerCase()] ;
  						while ( node.firstChild )
  							docFrag.appendChild( node.removeChild( node.firstChild ) ) ;
  						if ( needEndBr )
! 							docFrag.appendChild( node.ownerDocument.createElement( 'br' ) ) ;
  						node.parentNode.replaceChild( docFrag, node ) ;
  						firstTime = false ;
--- 204,218 ----
  					if ( node.nodeName.IEquals( 'div' ) )
  					{
! 						var docFrag = FCKTools.GetElementDocument( node ).createDocumentFragment() ;
! 						var needBeginBr = firstTime && node.previousSibling &&
  							!FCKListsLib.BlockBoundaries[node.previousSibling.nodeName.toLowerCase()] ;
  						if ( firstTime && needBeginBr )
! 							docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
! 						var needEndBr = node.nextSibling &&
  							!FCKListsLib.BlockBoundaries[node.nextSibling.nodeName.toLowerCase()] ;
  						while ( node.firstChild )
  							docFrag.appendChild( node.removeChild( node.firstChild ) ) ;
  						if ( needEndBr )
! 							docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ;
  						node.parentNode.replaceChild( docFrag, node ) ;
  						firstTime = false ;

Index: fckspellcheckcommand_gecko.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckspellcheckcommand_gecko.js	9 Feb 2008 12:53:57 -0000	1.4
--- fckspellcheckcommand_gecko.js	5 May 2008 00:35:23 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 36,39 ****
  FCKSpellCheckCommand.prototype.GetState = function()
  {
  	return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
! }
\ No newline at end of file
--- 36,41 ----
  FCKSpellCheckCommand.prototype.GetState = function()
  {
+ 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 		return FCK_TRISTATE_DISABLED ;
  	return this.IsEnabled ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
! }

Index: fckpasteplaintextcommand.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fckpasteplaintextcommand.js	9 Feb 2008 12:53:57 -0000	1.5
--- fckpasteplaintextcommand.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 35,38 ****
--- 35,40 ----
  FCKPastePlainTextCommand.prototype.GetState = function()
  {
+ 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 		return FCK_TRISTATE_DISABLED ;
  	return FCK.GetNamedCommandState( 'Paste' ) ;
  }

Index: fckshowblocks.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckshowblocks.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckshowblocks.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckshowblocks.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fckremoveformatcommand.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckremoveformatcommand.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckremoveformatcommand.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 43,45 ****
  		return FCK.EditorWindow ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
  	}
!  };
\ No newline at end of file
--- 43,45 ----
  		return FCK.EditorWindow ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
  	}
!  };

Index: fcklistcommands.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fcklistcommands.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fcklistcommands.js	9 Feb 2008 12:53:57 -0000	1.1
--- fcklistcommands.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 146,150 ****
  				{
  					rangeQueue = [] ;
! 					var selectionObject = FCK.EditorWindow.getSelection() ;
  					if ( selectionObject && listGroups.length == 0 )
  						rangeQueue.push( selectionObject.getRangeAt( 0 ) ) ;
--- 146,150 ----
  				{
  					rangeQueue = [] ;
! 					var selectionObject = FCKSelection.GetSelection() ;
  					if ( selectionObject && listGroups.length == 0 )
  						rangeQueue.push( selectionObject.getRangeAt( 0 ) ) ;
***************
*** 253,257 ****
  			FCKDomTools.SetElementMarker( markerObj, itemNode, '_FCK_ListItem_Processed', true ) ;
  		}
! 		var fakeParent = groupObj.root.ownerDocument.createElement( this.TagName ) ;
  		for ( var i = 0 ; i < selectedListItems.length ; i++ )
  		{
--- 253,257 ----
  			FCKDomTools.SetElementMarker( markerObj, itemNode, '_FCK_ListItem_Processed', true ) ;
  		}
! 		var fakeParent = FCKTools.GetElementDocument( groupObj.root ).createElement( this.TagName ) ;
  		for ( var i = 0 ; i < selectedListItems.length ; i++ )
  		{
***************
*** 271,275 ****
  	{
  		var contents = groupObj.contents ;
! 		var doc = groupObj.root.ownerDocument ;
  		var listContents = [] ;
  
--- 271,275 ----
  	{
  		var contents = groupObj.contents ;
! 		var doc = FCKTools.GetElementDocument( groupObj.root ) ;
  		var listContents = [] ;
  

Index: fck_othercommands.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fck_othercommands.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_othercommands.js	9 Feb 2008 12:53:57 -0000	1.6
--- fck_othercommands.js	5 May 2008 00:35:23 -0000	1.7
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 24,28 ****
  
  // ### General Dialog Box Commands.
! var FCKDialogCommand = function( name, title, url, width, height, getStateFunction, getStateParam )
  {
  	this.Name	= name ;
--- 24,28 ----
  
  // ### General Dialog Box Commands.
! var FCKDialogCommand = function( name, title, url, width, height, getStateFunction, getStateParam, customValue )
  {
  	this.Name	= name ;
***************
*** 31,34 ****
--- 31,35 ----
  	this.Width	= width ;
  	this.Height	= height ;
+ 	this.CustomValue = customValue ;
  
  	this.GetStateFunction	= getStateFunction ;
***************
*** 40,44 ****
  FCKDialogCommand.prototype.Execute = function()
  {
! 	FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, null, null, this.Resizable ) ;
  }
  
--- 41,45 ----
  FCKDialogCommand.prototype.Execute = function()
  {
! 	FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, this.CustomValue, null, this.Resizable ) ;
  }
  
***************
*** 48,52 ****
  		return this.GetStateFunction( this.GetStateParam ) ;
  	else
! 		return FCK_TRISTATE_OFF ;
  }
  
--- 49,53 ----
  		return this.GetStateFunction( this.GetStateParam ) ;
  	else
! 		return FCK.EditMode == FCK_EDITMODE_WYSIWYG ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
  }
  
***************
*** 72,81 ****
  {}
  
! FCKFormatBlockCommand.prototype = 
  {
  	Name : 'FormatBlock',
! 	
  	Execute : FCKStyleCommand.prototype.Execute,
! 	
  	GetState : function()
  	{
--- 73,82 ----
  {}
  
! FCKFormatBlockCommand.prototype =
  {
  	Name : 'FormatBlock',
! 
  	Execute : FCKStyleCommand.prototype.Execute,
! 
  	GetState : function()
  	{
***************
*** 89,93 ****
  {}
  
! FCKFontNameCommand.prototype = 
  {
  	Name		: 'FontName',
--- 90,94 ----
  {}
  
! FCKFontNameCommand.prototype =
  {
  	Name		: 'FontName',
***************
*** 100,104 ****
  {}
  
! FCKFontSizeCommand.prototype = 
  {
  	Name		: 'FontSize',
--- 101,105 ----
  {}
  
! FCKFontSizeCommand.prototype =
  {
  	Name		: 'FontSize',
***************
*** 210,213 ****
--- 211,216 ----
  FCKUndoCommand.prototype.GetState = function()
  {
+ 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 		return FCK_TRISTATE_DISABLED ;
  	return ( FCKUndo.CheckUndoState() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
  }
***************
*** 226,229 ****
--- 229,234 ----
  FCKRedoCommand.prototype.GetState = function()
  {
+ 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 		return FCK_TRISTATE_DISABLED ;
  	return ( FCKUndo.CheckRedoState() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
  }
***************
*** 253,260 ****
  	oRange.MoveToSelection() ;
  	var oSplitInfo = oRange.SplitBlock() ;
! 	if ( oSplitInfo.NextBlock )
! 		oSplitInfo.NextBlock.parentNode.insertBefore( oFakeImage, oSplitInfo.NextBlock ) ;
! 	else
! 		oSplitInfo.PreviousBlock.parentNode.insertBefore( oFakeImage, oSplitInfo.PreviousBlock.nextSibling ) ;
  
  	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
--- 258,262 ----
  	oRange.MoveToSelection() ;
  	var oSplitInfo = oRange.SplitBlock() ;
! 	oRange.InsertNode( oFakeImage ) ;
  
  	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
***************
*** 263,266 ****
--- 265,270 ----
  FCKPageBreakCommand.prototype.GetState = function()
  {
+ 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 		return FCK_TRISTATE_DISABLED ;
  	return 0 ; // FCK_TRISTATE_OFF
  }
***************
*** 286,290 ****
  		return ;
  	}
! 	
  	FCK.ExecuteNamedCommand( this.Name ) ;
  }
--- 290,294 ----
  		return ;
  	}
! 
  	FCK.ExecuteNamedCommand( this.Name ) ;
  }
***************
*** 292,295 ****
--- 296,301 ----
  FCKUnlinkCommand.prototype.GetState = function()
  {
+ 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 		return FCK_TRISTATE_DISABLED ;
  	var state = FCK.GetNamedCommandState( this.Name ) ;
  
***************
*** 337,340 ****
--- 343,348 ----
  FCKSelectAllCommand.prototype.GetState = function()
  {
+ 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 		return FCK_TRISTATE_DISABLED ;
  	return FCK_TRISTATE_OFF ;
  }
***************
*** 358,361 ****
--- 366,371 ----
  	GetState : function()
  	{
+ 		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 			return FCK_TRISTATE_DISABLED ;
  		return FCK.GetNamedCommandState( 'Paste' ) ;
  	}
***************
*** 378,402 ****
  	GetState : function()
  	{
  		return FCK.GetNamedCommandState( 'InsertHorizontalRule' ) ;
  	}
  } ;
  
! // FCKCopyCommand
! var FCKCopyCommand = function()
  {
! 	this.Name = 'Copy' ;
  }
  
! FCKCopyCommand.prototype = 
  {
  	Execute : function()
  	{
! 		FCK.ExecuteNamedCommand( this.Name ) ;
  	},
  
  	GetState : function()
  	{
! 		// Strangely, the cut command happens to have the correct states for both Copy and Cut in all browsers.
! 		return FCK.GetNamedCommandState( 'Cut' ) ;
  	}
  };
--- 388,448 ----
  	GetState : function()
  	{
+ 		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 			return FCK_TRISTATE_DISABLED ;
  		return FCK.GetNamedCommandState( 'InsertHorizontalRule' ) ;
  	}
  } ;
  
! // FCKCutCopyCommand
! var FCKCutCopyCommand = function( isCut )
  {
! 	this.Name = isCut ? 'Cut' : 'Copy' ;
  }
  
! FCKCutCopyCommand.prototype =
  {
  	Execute : function()
  	{
! 		var enabled = false ;
! 
! 		if ( FCKBrowserInfo.IsIE )
! 		{
! 			// The following seems to be the only reliable way to detect that
! 			// cut/copy is enabled in IE. It will fire the oncut/oncopy event
! 			// only if the security settings enabled the command to execute.
! 
! 			var onEvent = function()
! 			{
! 				enabled = true ;
! 			} ;
! 
! 			var eventName = 'on' + this.Name.toLowerCase() ;
! 
! 			FCK.EditorDocument.body.attachEvent( eventName, onEvent ) ;
! 			FCK.ExecuteNamedCommand( this.Name ) ;
! 			FCK.EditorDocument.body.detachEvent( eventName, onEvent ) ;
! 		}
! 		else
! 		{
! 			try
! 			{
! 				// Other browsers throw an error if the command is disabled.
! 				FCK.ExecuteNamedCommand( this.Name ) ;
! 				enabled = true ;
! 			}
! 			catch(e){}
! 		}
! 
! 		if ( !enabled )
! 			alert( FCKLang[ 'PasteError' + this.Name ] ) ;
  	},
  
  	GetState : function()
  	{
! 		// Strangely, the Cut command happens to have the correct states for
! 		// both Copy and Cut in all browsers.
! 		return FCK.EditMode != FCK_EDITMODE_WYSIWYG ?
! 				FCK_TRISTATE_DISABLED :
! 				FCK.GetNamedCommandState( 'Cut' ) ;
  	}
  };
***************
*** 407,411 ****
  }
  
! FCKAnchorDeleteCommand.prototype = 
  {
  	Execute : function()
--- 453,457 ----
  }
  
! FCKAnchorDeleteCommand.prototype =
  {
  	Execute : function()
***************
*** 466,469 ****
--- 512,517 ----
  	GetState : function()
  	{
+ 		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 			return FCK_TRISTATE_DISABLED ;
  		return FCK.GetNamedCommandState( 'Unlink') ;
  	}

Index: fcktextcolorcommand.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fcktextcolorcommand.js	9 Feb 2008 12:53:57 -0000	1.5
--- fcktextcolorcommand.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 40,46 ****
  
  	this._Panel = new FCKPanel( oWindow ) ;
! 	this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
  	this._Panel.MainNode.className = 'FCK_Panel' ;
  	this._CreatePanelBody( this._Panel.Document, this._Panel.MainNode ) ;
  
  	FCKTools.DisableSelection( this._Panel.Document.body ) ;
--- 40,47 ----
  
  	this._Panel = new FCKPanel( oWindow ) ;
! 	this._Panel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
  	this._Panel.MainNode.className = 'FCK_Panel' ;
  	this._CreatePanelBody( this._Panel.Document, this._Panel.MainNode ) ;
+ 	FCK.ToolbarSet.ToolbarItems.GetItem( this.Name ).RegisterPanel( this._Panel ) ;
  
  	FCKTools.DisableSelection( this._Panel.Document.body ) ;
***************
*** 76,79 ****
--- 77,82 ----
  FCKTextColorCommand.prototype.GetState = function()
  {
+ 	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+ 		return FCK_TRISTATE_DISABLED ;
  	return FCK_TRISTATE_OFF ;
  }
***************
*** 107,111 ****
  	this.className = 'ColorDeselected' ;
  	command._Panel.Hide() ;
! 	FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, FCKTools.Hitch(command, 'SetColor') ) ;
  }
  
--- 110,115 ----
  	this.className = 'ColorDeselected' ;
  	command._Panel.Hide() ;
! 	FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320,
! 			FCKTools.Bind( command, command.SetColor ) ) ;
  }
  



From blaine at qs1489.pair.com  Sun May  4 20:35:27 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/_source
	fckconstants.js, 1.3, 1.4 fckeditorapi.js, 1.4,
	1.5 fckjscoreextensions.js, 1.3, 1.4 fckscriptloader.js, 1.1, 1.2
Message-ID: <20080505003528.26D9E10FE18@qs1489.pair.com>

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

Modified Files:
	fckconstants.js fckeditorapi.js fckjscoreextensions.js 
	fckscriptloader.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckscriptloader.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/fckscriptloader.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckscriptloader.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckscriptloader.js	5 May 2008 00:35:24 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 41,44 ****
--- 41,46 ----
  		return ;
  
+ 	FCKScriptLoader._LoadedScripts[ scriptName ] = true ;
+ 
  	var oScriptInfo = this._Scripts[ scriptName ] ;
  
***************
*** 66,71 ****
  			this._LoadScript( sBaseScriptName + '_gecko.js' ) ;
  	}
- 
- 	FCKScriptLoader._LoadedScripts[ scriptName ] = true ;
  }
  
--- 68,71 ----
***************
*** 111,115 ****
  FCKScriptLoader.AddScript( 'FCKConfig'			, 'internals/'	, ['FCKBrowserInfo','FCKConstants'] ) ;
  FCKScriptLoader.AddScript( 'FCKDebug'			, 'internals/'	, ['FCKConfig'] ) ;
! FCKScriptLoader.AddScript( 'FCKDomTools'		, 'internals/'	, ['FCKJSCoreExtensions','FCKBrowserInfo','FCKTools'], FCK_GENERIC ) ;
  FCKScriptLoader.AddScript( 'FCKListsLib'		, 'internals/' ) ;
  FCKScriptLoader.AddScript( 'FCKListHandler'		, 'internals/'	, ['FCKConfig', 'FCKDocumentFragment', 'FCKJSCoreExtensions','FCKDomTools'], FCK_GENERIC ) ;
--- 111,115 ----
  FCKScriptLoader.AddScript( 'FCKConfig'			, 'internals/'	, ['FCKBrowserInfo','FCKConstants'] ) ;
  FCKScriptLoader.AddScript( 'FCKDebug'			, 'internals/'	, ['FCKConfig'] ) ;
! FCKScriptLoader.AddScript( 'FCKDomTools'		, 'internals/'	, ['FCKJSCoreExtensions','FCKBrowserInfo','FCKTools','FCKDomRange'], FCK_GENERIC ) ;
  FCKScriptLoader.AddScript( 'FCKListsLib'		, 'internals/' ) ;
  FCKScriptLoader.AddScript( 'FCKListHandler'		, 'internals/'	, ['FCKConfig', 'FCKDocumentFragment', 'FCKJSCoreExtensions','FCKDomTools'], FCK_GENERIC ) ;

Index: fckjscoreextensions.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/fckjscoreextensions.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckjscoreextensions.js	9 Feb 2008 12:53:57 -0000	1.3
--- fckjscoreextensions.js	5 May 2008 00:35:24 -0000	1.4
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 139,146 ****
  	if ( typeof replacement == 'function' )
  	{
! 		return this.replace( regExp, 
! 			function() 
! 			{ 
! 				return replacement.apply( thisObj || this, arguments ) ; 
  			} ) ;
  	}
--- 139,146 ----
  	if ( typeof replacement == 'function' )
  	{
! 		return this.replace( regExp,
! 			function()
! 			{
! 				return replacement.apply( thisObj || this, arguments ) ;
  			} ) ;
  	}

Index: fckeditorapi.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/fckeditorapi.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckeditorapi.js	9 Feb 2008 12:53:57 -0000	1.4
--- fckeditorapi.js	5 May 2008 00:35:24 -0000	1.5
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 36,58 ****
  		// 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() ;' +
--- 36,58 ----
  		// 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 =
! 			'window.FCKeditorAPI = {' +
! 				'Version : "2.6",' +
! 				'VersionBuild : "18638",' +
! 				'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() ;' +
***************
*** 112,115 ****
--- 112,119 ----
  				eval.call( oParentWindow, sScript ) ;
  			}
+ 			else if( FCKBrowserInfo.IsAIR )
+ 			{
+ 				FCKAdobeAIR.FCKeditorAPI_Evaluate( oParentWindow, sScript ) ;
+ 			}
  			else if ( FCKBrowserInfo.IsSafari || FCKBrowserInfo.IsGecko19 )
  			{
***************
*** 126,133 ****
  
  		FCKeditorAPI = oParentWindow.FCKeditorAPI ;
  	}
  
  	// Add the current instance to the FCKeditorAPI's instances collection.
! 	FCKeditorAPI.__Instances[ FCK.Name ] = FCK ;
  }
  
--- 130,141 ----
  
  		FCKeditorAPI = oParentWindow.FCKeditorAPI ;
+ 
+ 		// The __Instances properly has been changed to the public Instances,
+ 		// but we should still have the "deprecated" version of it.
+ 		FCKeditorAPI.__Instances = FCKeditorAPI.Instances ;
  	}
  
  	// Add the current instance to the FCKeditorAPI's instances collection.
! 	FCKeditorAPI.Instances[ FCK.Name ] = FCK ;
  }
  
***************
*** 159,163 ****
  	if ( ! window.FCKUnloadFlag )
  		return ;
! 	delete FCKeditorAPI.__Instances[ FCK.Name ] ;
  }
  function FCKeditorAPI_ConfirmCleanup()
--- 167,171 ----
  	if ( ! window.FCKUnloadFlag )
  		return ;
! 	delete FCKeditorAPI.Instances[ FCK.Name ] ;
  }
  function FCKeditorAPI_ConfirmCleanup()
***************
*** 165,168 ****
  	window.FCKUnloadFlag = true ;
  }
! FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;	
  FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ;
--- 173,176 ----
  	window.FCKUnloadFlag = true ;
  }
! FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;
  FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ;

Index: fckconstants.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/fckconstants.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckconstants.js	9 Feb 2008 12:53:57 -0000	1.3
--- fckconstants.js	5 May 2008 00:35:24 -0000	1.4
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:27 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/common
	fck_dialog_common.css, 1.7, 1.8 fck_dialog_common.js, 1.5, 1.6
Message-ID: <20080505003528.3486C10FE1D@qs1489.pair.com>

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

Modified Files:
	fck_dialog_common.css fck_dialog_common.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_dialog_common.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/common/fck_dialog_common.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_dialog_common.js	9 Feb 2008 12:53:57 -0000	1.5
--- fck_dialog_common.js	5 May 2008 00:35:24 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 20,25 ****
--- 20,65 ----
   *
   * Useful functions used by almost all dialog window pages.
+  * Dialogs should link to this file as the very first script on the page.
   */
  
+ // Automatically detect the correct document.domain (#123).
+ (function()
+ {
+ 	var d = document.domain ;
+ 
+ 	while ( true )
+ 	{
+ 		// Test if we can access a parent property.
+ 		try
+ 		{
+ 			var test = window.parent.document.domain ;
+ 			break ;
+ 		}
+ 		catch( e ) {}
+ 
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+ 
+ 		if ( d.length == 0 )
+ 			break ;		// It was not able to detect the domain.
+ 
+ 		try
+ 		{
+ 			document.domain = d ;
+ 		}
+ 		catch (e)
+ 		{
+ 			break ;
+ 		}
+ 	}
+ })() ;
+ 
+ // Attention: FCKConfig must be available in the page.
+ function GetCommonDialogCss( prefix )
+ {
+ 	// CSS minified by http://iceyboard.no-ip.org/projects/css_compressor
+ 	return FCKConfig.BasePath + 'dialog/common/' + '|.ImagePreviewArea{border:#000 1px solid;overflow:auto;width:100%;height:170px;background-color:#fff}.FlashPreviewArea{border:#000 1px solid;padding:5px;overflow:auto;width:100%;height:170px;background-color:#fff}.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}' ;
+ }
+ 
  // Gets a element by its Id. Used for shorter coding.
  function GetE( elementId )
***************
*** 58,89 ****
  }
  
! var KeyIdentifierMap = 
  {
! 	End		: 35,
! 	Home	: 36,
! 	Left	: 37,
! 	Right	: 39,
! 	'U+00007F' : 46		// Delete
! } 
  
  // Functions used by text fields to accept numbers only.
! function IsDigit( e )
! {
! 	if ( !e )
! 		e = event ;
  
! 	var iCode = ( e.keyCode || e.charCode ) ;
! 	
! 	if ( !iCode && e.keyIdentifier && ( e.keyIdentifier in KeyIdentifierMap ) ) 
! 			iCode = KeyIdentifierMap[ e.keyIdentifier ] ;
  
! 	return (
! 			( iCode >= 48 && iCode <= 57 )		// Numbers
! 			|| (iCode >= 35 && iCode <= 40)		// Arrows, Home, End
! 			|| iCode == 8						// Backspace
! 			|| iCode == 46						// Delete
! 			|| iCode == 9						// Tab
! 	) ;
! }
  
  String.prototype.Trim = function()
--- 98,142 ----
  }
  
! function SelectField( elementId )
  {
! 	var element = GetE( elementId ) ;
! 	element.focus() ;
! 
! 	// element.select may not be available for some fields (like <select>).
! 	if ( element.select )
! 		element.select() ;
! }
  
  // Functions used by text fields to accept numbers only.
! var IsDigit = ( function()
! 	{
! 		var KeyIdentifierMap =
! 		{
! 			End			: 35,
! 			Home		: 36,
! 			Left		: 37,
! 			Right		: 39,
! 			'U+00007F'	: 46		// Delete
! 		} ;
  
! 		return function ( e )
! 			{
! 				if ( !e )
! 					e = event ;
  
! 				var iCode = ( e.keyCode || e.charCode ) ;
! 
! 				if ( !iCode && e.keyIdentifier && ( e.keyIdentifier in KeyIdentifierMap ) )
! 						iCode = KeyIdentifierMap[ e.keyIdentifier ] ;
! 
! 				return (
! 						( iCode >= 48 && iCode <= 57 )		// Numbers
! 						|| (iCode >= 35 && iCode <= 40)		// Arrows, Home, End
! 						|| iCode == 8						// Backspace
! 						|| iCode == 46						// Delete
! 						|| iCode == 9						// Tab
! 				) ;
! 			}
! 	} )() ;
  
  String.prototype.Trim = function()
***************
*** 163,165 ****
--- 216,338 ----
      else
  		window.open( url, 'FCKBrowseWindow', sOptions ) ;
+ }
+ 
+ /**
+  Utility function to create/update an element with a name attribute in IE, so it behaves properly when moved around
+  It also allows to change the name or other special attributes in an existing node
+ 	oEditor : instance of FCKeditor where the element will be created
+ 	oOriginal : current element being edited or null if it has to be created
+ 	nodeName : string with the name of the element to create
+ 	oAttributes : Hash object with the attributes that must be set at creation time in IE
+ 								Those attributes will be set also after the element has been
+ 								created for any other browser to avoid redudant code
+ */
+ function CreateNamedElement( oEditor, oOriginal, nodeName, oAttributes )
+ {
+ 	var oNewNode ;
+ 
+ 	// IE doesn't allow easily to change properties of an existing object,
+ 	// so remove the old and force the creation of a new one.
+ 	var oldNode = null ;
+ 	if ( oOriginal && oEditor.FCKBrowserInfo.IsIE )
+ 	{
+ 		// Force the creation only if some of the special attributes have changed:
+ 		var bChanged = false;
+ 		for( var attName in oAttributes )
+ 			bChanged |= ( oOriginal.getAttribute( attName, 2) != oAttributes[attName] ) ;
+ 
+ 		if ( bChanged )
+ 		{
+ 			oldNode = oOriginal ;
+ 			oOriginal = null ;
+ 		}
+ 	}
+ 
+ 	// If the node existed (and it's not IE), then we just have to update its attributes
+ 	if ( oOriginal )
+ 	{
+ 		oNewNode = oOriginal ;
+ 	}
+ 	else
+ 	{
+ 		// #676, IE doesn't play nice with the name or type attribute
+ 		if ( oEditor.FCKBrowserInfo.IsIE )
+ 		{
+ 			var sbHTML = [] ;
+ 			sbHTML.push( '<' + nodeName ) ;
+ 			for( var prop in oAttributes )
+ 			{
+ 				sbHTML.push( ' ' + prop + '="' + oAttributes[prop] + '"' ) ;
+ 			}
+ 			sbHTML.push( '>' ) ;
+ 			if ( !oEditor.FCKListsLib.EmptyElements[nodeName.toLowerCase()] )
+ 				sbHTML.push( '</' + nodeName + '>' ) ;
+ 
+ 			oNewNode = oEditor.FCK.EditorDocument.createElement( sbHTML.join('') ) ;
+ 			// Check if we are just changing the properties of an existing node: copy its properties
+ 			if ( oldNode )
+ 			{
+ 				CopyAttributes( oldNode, oNewNode, oAttributes ) ;
+ 				oEditor.FCKDomTools.MoveChildren( oldNode, oNewNode ) ;
+ 				oldNode.parentNode.removeChild( oldNode ) ;
+ 				oldNode = null ;
+ 
+ 				if ( oEditor.FCK.Selection.SelectionData )
+ 				{
+ 					// Trick to refresh the selection object and avoid error in
+ 					// fckdialog.html Selection.EnsureSelection
+ 					var oSel = oEditor.FCK.EditorDocument.selection ;
+ 					oEditor.FCK.Selection.SelectionData = oSel.createRange() ; // Now oSel.type will be 'None' reflecting the real situation
+ 				}
+ 			}
+ 			oNewNode = oEditor.FCK.InsertElement( oNewNode ) ;
+ 
+ 			// FCK.Selection.SelectionData is broken by now since we've
+ 			// deleted the previously selected element. So we need to reassign it.
+ 			if ( oEditor.FCK.Selection.SelectionData )
+ 			{
+ 				var range = oEditor.FCK.EditorDocument.body.createControlRange() ;
+ 				range.add( oNewNode ) ;
+ 				oEditor.FCK.Selection.SelectionData = range ;
+ 			}
+ 		}
+ 		else
+ 		{
+ 			oNewNode = oEditor.FCK.InsertElement( nodeName ) ;
+ 		}
+ 	}
+ 
+ 	// Set the basic attributes
+ 	for( var attName in oAttributes )
+ 		oNewNode.setAttribute( attName, oAttributes[attName], 0 ) ;	// 0 : Case Insensitive
+ 
+ 	return oNewNode ;
+ }
+ 
+ // Copy all the attributes from one node to the other, kinda like a clone
+ // But oSkipAttributes is an object with the attributes that must NOT be copied
+ function CopyAttributes( oSource, oDest, oSkipAttributes )
+ {
+ 	var aAttributes = oSource.attributes ;
+ 
+ 	for ( var n = 0 ; n < aAttributes.length ; n++ )
+ 	{
+ 		var oAttribute = aAttributes[n] ;
+ 
+ 		if ( oAttribute.specified )
+ 		{
+ 			var sAttName = oAttribute.nodeName ;
+ 			// We can set the type only once, so do it with the proper value, not copying it.
+ 			if ( sAttName in oSkipAttributes )
+ 				continue ;
+ 
+ 			var sAttValue = oSource.getAttribute( sAttName, 2 ) ;
+ 			if ( sAttValue == null )
+ 				sAttValue = oAttribute.nodeValue ;
+ 
+ 			oDest.setAttribute( sAttName, sAttValue, 0 ) ;	// 0 : Case Insensitive
+ 		}
+ 	}
+ 	// The style:
+ 	oDest.style.cssText = oSource.style.cssText ;
  }

Index: fck_dialog_common.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/common/fck_dialog_common.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** fck_dialog_common.css	9 Feb 2008 12:53:57 -0000	1.7
--- fck_dialog_common.css	5 May 2008 00:35:24 -0000	1.8
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 21,24 ****
--- 21,31 ----
   * This is the CSS file used for interface details in some dialog
   * windows.
+  */
+ 
+ /* #########
+  *  WARNING
+  * #########
+  * When changing this file, the minified version of it must be updated in the
+  * fck_dialog_common.js file (see GetCommonDialogCss).
   */
  



From blaine at qs1489.pair.com  Sun May  4 20:35:27 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:27 +0000
Subject: [geeklog-cvs]
 Geeklog-1.x/public_html/fckeditor/editor/_source/classes fckhtmliterator.js,
 NONE, 1.1 fckcontextmenu.js, 1.3, 1.4 fckdataprocessor.js, 1.1,
 1.2 fckdocumentfragment_gecko.js, 1.1, 1.2 fckdocumentfragment_ie.js, 1.1,
 1.2 fckdomrange.js, 1.1, 1.2 fckdomrange_gecko.js, 1.1,
 1.2 fckdomrange_ie.js, 1.1, 1.2 fckdomrangeiterator.js, 1.1,
 1.2 fckeditingarea.js, 1.4, 1.5 fckelementpath.js, 1.1, 1.2 fckenterkey.js,
 1.1, 1.2 fckevents.js, 1.5, 1.6 fckicon.js, 1.3, 1.4 fckiecleanup.js, 1.3,
 1.4 fckimagepreloader.js, 1.1, 1.2 fckkeystrokehandler.js, 1.1,
 1.2 fckmenublock.js, 1.4, 1.5 fckmenublockpanel.js, 1.3, 1.4 fckmenuitem.js,
 1.4, 1.5 fckpanel.js, 1.4, 1.5 fckplugin.js, 1.5, 1.6 fckspecialcombo.js,
 1.6, 1.7 fckstyle.js, 1.1, 1.2 fcktoolbar.js, 1.6,
 1.7 fcktoolbarbreak_gecko.js, 1.5, 1.6 fcktoolbarbreak_ie.js, 1.6,
 1.7 fcktoolbarbutton.js, 1.5, 1.6 fcktoolbarbuttonui.js, 1.4,
 1.5 fcktoolbarfontformatcombo.js, 1.5, 1.6 fcktoolbarfontscombo.js, 1.5,
 1.6 fcktoolbarfontsizecombo.js, 1.5, 1.6 fcktoolbarpanelbutton.js, 1.5,
 1.6 fcktoolbarspecialco mbo.js, 1.5, 1.6 fcktoolbarstylecombo.js, 1.5,
 1.6 fckw3crange.js, 1.1, 1.2 fckxml.js, 1.1, 1.2 fckxml_gecko.js, 1.5,
 1.6 fckxml_ie.js, 1.5, 1.6
Message-ID: <20080505003527.180B410FE15@qs1489.pair.com>

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

Modified 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 
Added Files:
	fckhtmliterator.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckmenuitem.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckmenuitem.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckmenuitem.js	9 Feb 2008 12:53:57 -0000	1.4
--- fckmenuitem.js	5 May 2008 00:35:23 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 22,26 ****
   */
  
! var FCKMenuItem = function( parentMenuBlock, name, label, iconPathOrStripInfoArray, isDisabled )
  {
  	this.Name		= name ;
--- 22,26 ----
   */
  
! var FCKMenuItem = function( parentMenuBlock, name, label, iconPathOrStripInfoArray, isDisabled, customData )
  {
  	this.Name		= name ;
***************
*** 33,36 ****
--- 33,37 ----
  	this.SubMenu.Parent		= parentMenuBlock ;
  	this.SubMenu.OnClick	= FCKTools.CreateEventListener( FCKMenuItem_SubMenu_OnClick, this ) ;
+ 	this.CustomData = customData ;
  
  	if ( FCK.IECleanup )
***************
*** 39,46 ****
  
  
! FCKMenuItem.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled )
  {
  	this.HasSubMenu = true ;
! 	return this.SubMenu.AddItem( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled ) ;
  }
  
--- 40,47 ----
  
  
! FCKMenuItem.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData )
  {
  	this.HasSubMenu = true ;
! 	return this.SubMenu.AddItem( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData ) ;
  }
  
***************
*** 158,160 ****
  {
  	this.MainElement = null ;
! }
\ No newline at end of file
--- 159,161 ----
  {
  	this.MainElement = null ;
! }

Index: fckmenublock.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckmenublock.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckmenublock.js	9 Feb 2008 12:53:57 -0000	1.4
--- fckmenublock.js	5 May 2008 00:35:23 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 33,39 ****
  }
  
! FCKMenuBlock.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled )
  {
! 	var oItem = new FCKMenuItem( this, name, label, iconPathOrStripInfoArrayOrIndex, isDisabled ) ;
  
  	oItem.OnClick		= FCKTools.CreateEventListener( FCKMenuBlock_Item_OnClick, this ) ;
--- 33,39 ----
  }
  
! FCKMenuBlock.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData )
  {
! 	var oItem = new FCKMenuItem( this, name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData ) ;
  
  	oItem.OnClick		= FCKTools.CreateEventListener( FCKMenuBlock_Item_OnClick, this ) ;
***************
*** 111,115 ****
  		{
  			menuBlock._Window.focus() ;
! 			
  			// Due to the event model provided by Opera, we need to set
  			// HasFocus here as the above focus() call will not fire the focus
--- 111,115 ----
  		{
  			menuBlock._Window.focus() ;
! 
  			// Due to the event model provided by Opera, we need to set
  			// HasFocus here as the above focus() call will not fire the focus
***************
*** 151,153 ****
  	eCell.className = 'MN_Separator' ;
  	eCell.appendChild( oDoc.createElement( 'DIV' ) ).className = 'MN_Separator_Line' ;
! }
\ No newline at end of file
--- 151,153 ----
  	eCell.className = 'MN_Separator' ;
  	eCell.appendChild( oDoc.createElement( 'DIV' ) ).className = 'MN_Separator_Line' ;
! }

Index: fckelementpath.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckelementpath.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckelementpath.js	9 Feb 2008 12:53:56 -0000	1.1
--- fckelementpath.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 39,42 ****
--- 39,44 ----
  
  			var sElementName = e.nodeName.toLowerCase() ;
+ 			if ( FCKBrowserInfo.IsIE && e.scopeName != 'HTML' )
+ 				sElementName = e.scopeName.toLowerCase() + ':' + sElementName ;
  
  			if ( !eBlockLimit )
***************
*** 75,88 ****
  {
  	var childNodes = element.childNodes ;
! 	
  	for ( var i = 0, count = childNodes.length ; i < count ; i++ )
  	{
  		var child = childNodes[i] ;
! 		
  		if ( child.nodeType == 1 && FCKListsLib.BlockElements[ child.nodeName.toLowerCase() ] )
  			return true ;
  	}
! 	
  	return false ;
  }
- 
--- 77,89 ----
  {
  	var childNodes = element.childNodes ;
! 
  	for ( var i = 0, count = childNodes.length ; i < count ; i++ )
  	{
  		var child = childNodes[i] ;
! 
  		if ( child.nodeType == 1 && FCKListsLib.BlockElements[ child.nodeName.toLowerCase() ] )
  			return true ;
  	}
! 
  	return false ;
  }

Index: fcktoolbarpanelbutton.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fcktoolbarpanelbutton.js	9 Feb 2008 12:53:57 -0000	1.5
--- fcktoolbarpanelbutton.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 49,52 ****
--- 49,60 ----
  
  	var oPanel = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName )._Panel ;
+ 	this.RegisterPanel( oPanel ) ;
+ }
+ 
+ FCKToolbarPanelButton.prototype.RegisterPanel = function( oPanel )
+ {
+ 	if ( oPanel._FCKToolbarPanelButton )
+ 		return ;
+ 
  	oPanel._FCKToolbarPanelButton = this ;
  
***************
*** 55,59 ****
  	eLineDiv.style.top = '0px' ;
  
! 	var eLine = this.LineImg = eLineDiv.appendChild( oPanel.Document.createElement( 'IMG' ) ) ;
  	eLine.className = 'TB_ConnectionLine' ;
  	eLine.style.position = 'absolute' ;
--- 63,67 ----
  	eLineDiv.style.top = '0px' ;
  
! 	var eLine = oPanel._FCKToolbarPanelButtonLineDiv = eLineDiv.appendChild( oPanel.Document.createElement( 'IMG' ) ) ;
  	eLine.className = 'TB_ConnectionLine' ;
  	eLine.style.position = 'absolute' ;
***************
*** 75,81 ****
  	oButton._UIButton.ChangeState( FCK_TRISTATE_ON ) ;
  
! 	oButton.LineImg.style.width = ( e.offsetWidth - 2 ) + 'px' ;
  
! 	FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( oButton.CommandName ).Execute( 0, e.offsetHeight - 1, e ) ; // -1 to be over the border
  }
  
--- 83,92 ----
  	oButton._UIButton.ChangeState( FCK_TRISTATE_ON ) ;
  
! 	// oButton.LineImg.style.width = ( e.offsetWidth - 2 ) + 'px' ;
  
! 	var oCommand = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( oButton.CommandName ) ;
! 	var oPanel = oCommand._Panel ;
! 	oPanel._FCKToolbarPanelButtonLineDiv.style.width = ( e.offsetWidth - 2 ) + 'px' ;
! 	oCommand.Execute( 0, e.offsetHeight - 1, e ) ; // -1 to be over the border
  }
  

Index: fckw3crange.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckw3crange.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckw3crange.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckw3crange.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 262,278 ****
  			// If the start container has children and the offset is pointing
  			// to a child, then we should start from its previous sibling.
! 			if ( startNode.childNodes.length > 0 &&  startOffset <= startNode.childNodes.length - 1 )
  			{
! 				// If the offset points to the first node, we don't have a
! 				// sibling, so let's use the first one, but mark it for removal.
! 				if ( startOffset == 0 )
! 				{
! 					// Let's create a temporary node and mark it for removal.
! 					startNode = startNode.insertBefore( this._Document.createTextNode(''), startNode.firstChild ) ;
! 					removeStartNode = true ;
! 				}
! 				else
! 					startNode = startNode.childNodes[ startOffset ].previousSibling ;
  			}
  		}
  
--- 262,282 ----
  			// If the start container has children and the offset is pointing
  			// to a child, then we should start from its previous sibling.
! 
! 			// If the offset points to the first node, we don't have a
! 			// sibling, so let's use the first one, but mark it for removal.
! 			if ( startOffset == 0 )
  			{
! 				// Let's create a temporary node and mark it for removal.
! 				startNode = startNode.insertBefore( this._Document.createTextNode(''), startNode.firstChild ) ;
! 				removeStartNode = true ;
  			}
+ 			else if ( startOffset > startNode.childNodes.length - 1 )
+ 			{
+ 				// Let's create a temporary node and mark it for removal.
+ 				startNode = startNode.appendChild( this._Document.createTextNode('') ) ;
+ 				removeStartNode = true ;
+ 			}
+ 			else
+ 				startNode = startNode.childNodes[ startOffset ].previousSibling ;
  		}
  
***************
*** 420,424 ****
  			{
  				var endIndex = FCKDomTools.GetIndexOf( topEnd ) ;
! 				
  				// If the start node is to be removed, we must correct the
  				// index to reflect the removal.
--- 424,428 ----
  			{
  				var endIndex = FCKDomTools.GetIndexOf( topEnd ) ;
! 
  				// If the start node is to be removed, we must correct the
  				// index to reflect the removal.

Index: fckpanel.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckpanel.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckpanel.js	9 Feb 2008 12:53:57 -0000	1.4
--- fckpanel.js	5 May 2008 00:35:23 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 36,42 ****
--- 36,65 ----
  	{
  		// Create the Popup that will hold the panel.
+ 		// The popup has to be created before playing with domain hacks, see #1666.
  		this._Popup	= this._Window.createPopup() ;
+ 
+ 		// this._Window cannot be accessed while playing with domain hacks, but local variable is ok.
+ 		// See #1666.
+ 		var pDoc = this._Window.document ;
+ 
+ 		// This is a trick to IE6 (not IE7). The original domain must be set
+ 		// before creating the popup, so we are able to take a refence to the
+ 		// document inside of it, and the set the proper domain for it. (#123)
+ 		if ( FCK_IS_CUSTOM_DOMAIN && !FCKBrowserInfo.IsIE7 )
+ 		{
+ 			pDoc.domain = FCK_ORIGINAL_DOMAIN ;
+ 			document.domain = FCK_ORIGINAL_DOMAIN ;
+ 		}
+ 
  		oDocument = this.Document = this._Popup.document ;
  
+ 		// Set the proper domain inside the popup.
+ 		if ( FCK_IS_CUSTOM_DOMAIN )
+ 		{
+ 			oDocument.domain = FCK_RUNTIME_DOMAIN ;
+ 			pDoc.domain = FCK_RUNTIME_DOMAIN ;
+ 			document.domain = FCK_RUNTIME_DOMAIN ;
+ 		}
+ 
  		FCK.IECleanup.AddItem( this, FCKPanel_Cleanup ) ;
  	}
***************
*** 55,76 ****
  			} ) ;
  
! 		if ( this._Window == window.parent && window.frameElement )
! 		{
! 			var scrollPos = null ;
! 			if ( FCKBrowserInfo.IsGecko && FCK && FCK.EditorDocument )
! 				scrollPos = [ FCK.EditorDocument.body.scrollLeft, FCK.EditorDocument.body.scrollTop ] ;
! 			window.frameElement.parentNode.insertBefore( oIFrame, window.frameElement ) ;
! 			if ( scrollPos )
! 			{
! 				var restoreFunc = function()
! 				{
! 					FCK.EditorDocument.body.scrollLeft = scrollPos[0] ;
! 					FCK.EditorDocument.body.scrollTop = scrollPos[1] ;
! 				}
! 				setTimeout( restoreFunc, 500 ) ;
! 			}
! 		}
! 		else
! 			this._Window.document.body.appendChild( oIFrame ) ;
  
  		var oIFrameWindow = oIFrame.contentWindow ;
--- 78,82 ----
  			} ) ;
  
! 		this._Window.document.body.appendChild( oIFrame ) ;
  
  		var oIFrameWindow = oIFrame.contentWindow ;
***************
*** 88,91 ****
--- 94,100 ----
  		oDocument.close() ;
  
+ 		if( FCKBrowserInfo.IsAIR )
+ 			FCKAdobeAIR.Panel_Contructor( oDocument, window.document.location ) ;
+ 
  		FCKTools.AddEventListenerEx( oIFrameWindow, 'focus', FCKPanel_Window_OnFocus, this ) ;
  		FCKTools.AddEventListenerEx( oIFrameWindow, 'blur', FCKPanel_Window_OnBlur, this ) ;
***************
*** 175,181 ****
  		}
  
  		// Be sure we'll not have more than one Panel opened at the same time.
! 		if ( FCKPanel._OpenedPanel )
! 			FCKPanel._OpenedPanel.Hide() ;
  
  		FCKDomTools.SetElementStyles( eMainNode,
--- 184,201 ----
  		}
  
+ 		// Toggle the iframe scrolling attribute to prevent the panel
+ 		// scrollbars from disappearing in FF Mac. (#191)
+ 		if ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac )
+ 		{
+ 			this._IFrame.scrolling = '' ;
+ 			FCKTools.RunFunction( function(){ this._IFrame.scrolling = 'no'; }, this ) ;
+ 		}
+ 
  		// Be sure we'll not have more than one Panel opened at the same time.
! 		// Do not unlock focus manager here because we're displaying another floating panel
! 		// instead of returning the editor to a "no panel" state (Bug #1514).
! 		if ( FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel &&
! 				FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel != this )
! 			FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel.Hide( false, true ) ;
  
  		FCKDomTools.SetElementStyles( eMainNode,
***************
*** 206,210 ****
  
  		// Minus the offsets provided by any positioned parent element of the panel iframe.
! 		var positionedAncestor = FCKDomTools.GetPositionedAncestor( FCKTools.GetElementWindow( this._IFrame ), this._IFrame.parentNode ) ;
  		if ( positionedAncestor )
  		{
--- 226,230 ----
  
  		// Minus the offsets provided by any positioned parent element of the panel iframe.
! 		var positionedAncestor = FCKDomTools.GetPositionedAncestor( this._IFrame.parentNode ) ;
  		if ( positionedAncestor )
  		{
***************
*** 242,248 ****
  		}
  
- 		if ( x < 0 )
- 			 x = 0 ;
- 
  		// Set the context menu DIV in the specified location.
  		FCKDomTools.SetElementStyles( this._IFrame,
--- 262,265 ----
***************
*** 252,273 ****
  			} ) ;
  
- 		var iWidth	= iMainWidth ;
- 		var iHeight	= eMainNode.offsetHeight ;
- 
- 		this._IFrame.width	= iWidth ;
- 		this._IFrame.height = iHeight ;
- 
  		// Move the focus to the IFRAME so we catch the "onblur".
  		this._IFrame.contentWindow.focus() ;
  
! 		FCKPanel._OpenedPanel = this ;
! 	}
  
! 	this._IsOpened = true ;
  
  	FCKTools.RunFunction( this.OnShow, this ) ;
  }
  
! FCKPanel.prototype.Hide = function( ignoreOnHide )
  {
  	if ( this._Popup )
--- 269,293 ----
  			} ) ;
  
  		// Move the focus to the IFRAME so we catch the "onblur".
  		this._IFrame.contentWindow.focus() ;
+ 		this._IsOpened = true ;
  
! 		var me = this ;
! 		this._resizeTimer = setTimeout( function()
! 			{
! 				var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ;
! 				var iHeight = eMainNode.offsetHeight ;
! 				me._IFrame.width = iWidth ;
! 				me._IFrame.height = iHeight ;
  
! 			}, 0 ) ;
! 
! 		FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel = this ;
! 	}
  
  	FCKTools.RunFunction( this.OnShow, this ) ;
  }
  
! FCKPanel.prototype.Hide = function( ignoreOnHide, ignoreFocusManagerUnlock )
  {
  	if ( this._Popup )
***************
*** 279,283 ****
  
  		// Enable the editor to fire the "OnBlur".
! 		if ( typeof( FCKFocusManager ) != 'undefined' )
  			FCKFocusManager.Unlock() ;
  
--- 299,303 ----
  
  		// Enable the editor to fire the "OnBlur".
! 		if ( typeof( FCKFocusManager ) != 'undefined' && !ignoreFocusManagerUnlock )
  			FCKFocusManager.Unlock() ;
  
***************
*** 287,290 ****
--- 307,316 ----
  
  		this._IsOpened = false ;
+ 
+ 		if ( this._resizeTimer )
+ 		{
+ 			clearTimeout( this._resizeTimer ) ;
+ 			this._resizeTimer = null ;
+ 		}
  
  		if ( this.ParentPanel )

Index: fcktoolbarbutton.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbarbutton.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fcktoolbarbutton.js	9 Feb 2008 12:53:57 -0000	1.5
--- fcktoolbarbutton.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 49,60 ****
  FCKToolbarButton.prototype.RefreshState = function()
  {
  	// Gets the actual state.
  	var eState = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetState() ;
  
  	// If there are no state changes than do nothing and return.
! 	if ( eState == this._UIButton.State ) return ;
  
  	// Sets the actual state.
! 	this._UIButton.ChangeState( eState ) ;
  }
  
--- 49,65 ----
  FCKToolbarButton.prototype.RefreshState = function()
  {
+ 	var uiButton = this._UIButton ;
+ 
+ 	if ( !uiButton )
+ 		return ;
+ 
  	// Gets the actual state.
  	var eState = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetState() ;
  
  	// If there are no state changes than do nothing and return.
! 	if ( eState == uiButton.State ) return ;
  
  	// Sets the actual state.
! 	uiButton.ChangeState( eState ) ;
  }
  
***************
*** 74,76 ****
  	// Sets the actual state.
  	this._UIButton.ChangeState( FCK_TRISTATE_DISABLED ) ;
! }
\ No newline at end of file
--- 79,81 ----
  	// Sets the actual state.
  	this._UIButton.ChangeState( FCK_TRISTATE_DISABLED ) ;
! }

Index: fcktoolbarfontscombo.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fcktoolbarfontscombo.js	9 Feb 2008 12:53:57 -0000	1.5
--- fcktoolbarfontscombo.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fcktoolbarbreak_ie.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fcktoolbarbreak_ie.js	9 Feb 2008 12:53:57 -0000	1.6
--- fcktoolbarbreak_ie.js	5 May 2008 00:35:23 -0000	1.7
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fckenterkey.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckenterkey.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckenterkey.js	9 Feb 2008 12:53:56 -0000	1.1
--- fckenterkey.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 394,400 ****
  	var oRange = range || new FCKDomRange( this.Window ) ;
  
! 	var oSplitInfo = oRange.SplitBlock() ;
! 
! 	// FCKDebug.OutputObject( oSplitInfo ) ;
  
  	if ( oSplitInfo )
--- 394,398 ----
  	var oRange = range || new FCKDomRange( this.Window ) ;
  
! 	var oSplitInfo = oRange.SplitBlock( blockTag ) ;
  
  	if ( oSplitInfo )
***************
*** 407,414 ****
  		var bIsEndOfBlock	= oSplitInfo.WasEndOfBlock ;
  
  		// If we have both the previous and next blocks, it means that the
  		// boundaries were on separated blocks, or none of them where on the
  		// block limits (start/end).
! 		if ( !oSplitInfo.WasStartOfBlock && !oSplitInfo.WasEndOfBlock )
  		{
  			// If the next block is an <li> with another list tree as the first child
--- 405,428 ----
  		var bIsEndOfBlock	= oSplitInfo.WasEndOfBlock ;
  
+ 		// If there is one block under a list item, modify the split so that the list item gets split as well. (Bug #1647)
+ 		if ( eNextBlock )
+ 		{
+ 			if ( eNextBlock.parentNode.nodeName.IEquals( 'li' ) )
+ 			{
+ 				FCKDomTools.BreakParent( eNextBlock, eNextBlock.parentNode ) ;
+ 				FCKDomTools.MoveNode( eNextBlock, eNextBlock.nextSibling, true ) ;
+ 			}
+ 		}
+ 		else if ( ePreviousBlock && ePreviousBlock.parentNode.nodeName.IEquals( 'li' ) )
+ 		{
+ 			FCKDomTools.BreakParent( ePreviousBlock, ePreviousBlock.parentNode ) ;
+ 			oRange.MoveToElementEditStart( ePreviousBlock.nextSibling );
+ 			FCKDomTools.MoveNode( ePreviousBlock, ePreviousBlock.previousSibling ) ;
+ 		}
+ 
  		// If we have both the previous and next blocks, it means that the
  		// boundaries were on separated blocks, or none of them where on the
  		// block limits (start/end).
! 		if ( !bIsStartOfBlock && !bIsEndOfBlock )
  		{
  			// If the next block is an <li> with another list tree as the first child
***************
*** 416,420 ****
  			if ( eNextBlock.nodeName.IEquals( 'li' ) && eNextBlock.firstChild
  					&& eNextBlock.firstChild.nodeName.IEquals( ['ul', 'ol'] ) )
! 				eNextBlock.insertBefore( eNextBlock.ownerDocument.createTextNode( '\xa0' ), eNextBlock.firstChild ) ;
  			// Move the selection to the end block.
  			if ( eNextBlock )
--- 430,434 ----
  			if ( eNextBlock.nodeName.IEquals( 'li' ) && eNextBlock.firstChild
  					&& eNextBlock.firstChild.nodeName.IEquals( ['ul', 'ol'] ) )
! 				eNextBlock.insertBefore( FCKTools.GetElementDocument( eNextBlock ).createTextNode( '\xa0' ), eNextBlock.firstChild ) ;
  			// Move the selection to the end block.
  			if ( eNextBlock )
***************
*** 463,467 ****
  					if ( element == elementPath.Block || element == elementPath.BlockLimit )
  						break ;
! 					
  					if ( FCKListsLib.InlineChildReqElements[ element.nodeName.toLowerCase() ] )
  					{
--- 477,481 ----
  					if ( element == elementPath.Block || element == elementPath.BlockLimit )
  						break ;
! 
  					if ( FCKListsLib.InlineChildReqElements[ element.nodeName.toLowerCase() ] )
  					{
***************
*** 483,487 ****
  			{
  				// Move the selection to the new block.
! 				oRange.MoveToNodeContents( eNewBlock ) ;
  				oRange.Select() ;
  			}
--- 497,501 ----
  			{
  				// Move the selection to the new block.
! 				oRange.MoveToElementEditStart( eNewBlock ) ;
  				oRange.Select() ;
  			}

Index: fckspecialcombo.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckspecialcombo.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fckspecialcombo.js	9 Feb 2008 12:53:57 -0000	1.6
--- fckspecialcombo.js	5 May 2008 00:35:23 -0000	1.7
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 38,42 ****
  
  	this._Panel = new FCKPanel( parentWindow || window ) ;
! 	this._Panel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
  	this._PanelBox = this._Panel.MainNode.appendChild( this._Panel.Document.createElement( 'DIV' ) ) ;
  	this._PanelBox.className = 'SC_Panel' ;
--- 38,42 ----
  
  	this._Panel = new FCKPanel( parentWindow || window ) ;
! 	this._Panel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
  	this._PanelBox = this._Panel.MainNode.appendChild( this._Panel.Document.createElement( 'DIV' ) ) ;
  	this._PanelBox.className = 'SC_Panel' ;
***************
*** 83,87 ****
  	if ( this.Items )
  		this.Items = {} ;
! 	
  	var itemsholder = this._ItemsHolderEl ;
  	while ( itemsholder.firstChild )
--- 83,87 ----
  	if ( this.Items )
  		this.Items = {} ;
! 
  	var itemsholder = this._ItemsHolderEl ;
  	while ( itemsholder.firstChild )

Index: fckdomrange_gecko.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckdomrange_gecko.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckdomrange_gecko.js	9 Feb 2008 12:53:56 -0000	1.1
--- fckdomrange_gecko.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 102,104 ****
  	selection.removeAllRanges() ;
  	selection.addRange( domRange ) ;
! }
\ No newline at end of file
--- 102,104 ----
  	selection.removeAllRanges() ;
  	selection.addRange( domRange ) ;
! }

Index: fckcontextmenu.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckcontextmenu.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckcontextmenu.js	9 Feb 2008 12:53:56 -0000	1.3
--- fckcontextmenu.js	5 May 2008 00:35:23 -0000	1.4
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 27,31 ****
  
  	var oPanel = this._Panel = new FCKPanel( parentWindow ) ;
! 	oPanel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
  	oPanel.IsContextMenu = true ;
  
--- 27,31 ----
  
  	var oPanel = this._Panel = new FCKPanel( parentWindow ) ;
! 	oPanel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
  	oPanel.IsContextMenu = true ;
  
***************
*** 57,63 ****
  }
  
! FCKContextMenu.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled )
  {
! 	var oItem = this._MenuBlock.AddItem( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled) ;
  	this._Redraw = true ;
  	return oItem ;
--- 57,67 ----
  }
  
! /**
!  The customData parameter is just a value that will be send to the command that is executed,
!  so it's possible to reuse the same command for several items just by assigning different data for each one.
! */
! FCKContextMenu.prototype.AddItem = function( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData )
  {
! 	var oItem = this._MenuBlock.AddItem( name, label, iconPathOrStripInfoArrayOrIndex, isDisabled, customData ) ;
  	this._Redraw = true ;
  	return oItem ;
***************
*** 123,127 ****
  			if( !overrideButton )
  			{
! 				var doc = e.target.ownerDocument ;
  				overrideButton = FCKContextMenu_OverrideButton = doc.createElement('input') ;
  				overrideButton.type = 'button' ;
--- 127,131 ----
  			if( !overrideButton )
  			{
! 				var doc = FCKTools.GetElementDocument( e.target ) ;
  				overrideButton = FCKContextMenu_OverrideButton = doc.createElement('input') ;
  				overrideButton.type = 'button' ;
***************
*** 131,136 ****
  			}
  
! 			overrideButton.style.cssText = 'position:absolute;top:' + ( e.clientY - 2 ) + 
! 				'px;left:' + ( e.clientX - 2 ) + 
  				'px;width:5px;height:5px;opacity:0.01' ;
  		}
--- 135,140 ----
  			}
  
! 			overrideButton.style.cssText = 'position:absolute;top:' + ( e.clientY - 2 ) +
! 				'px;left:' + ( e.clientX - 2 ) +
  				'px;width:5px;height:5px;opacity:0.01' ;
  		}
***************
*** 156,159 ****
--- 160,164 ----
  		}
  	}
+ 	return true ;
  }
  
***************
*** 176,180 ****
  		fckContextMenu._Redraw = false ;
  	}
! 	
  	// This will avoid that the content of the context menu can be dragged in IE
  	// as the content of the panel is recreated we need to do it every time
--- 181,185 ----
  		fckContextMenu._Redraw = false ;
  	}
! 
  	// This will avoid that the content of the context menu can be dragged in IE
  	// as the content of the panel is recreated we need to do it every time

Index: fcktoolbarfontsizecombo.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fcktoolbarfontsizecombo.js	9 Feb 2008 12:53:57 -0000	1.5
--- fcktoolbarfontsizecombo.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fcktoolbar.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbar.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fcktoolbar.js	9 Feb 2008 12:53:57 -0000	1.6
--- fcktoolbar.js	5 May 2008 00:35:23 -0000	1.7
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 101,103 ****
  {
  	FCKTools.AppendElement( parentElement, 'div' ).className = 'TB_Separator' ;
! }
\ No newline at end of file
--- 101,103 ----
  {
  	FCKTools.AppendElement( parentElement, 'div' ).className = 'TB_Separator' ;
! }

Index: fckiecleanup.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckiecleanup.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckiecleanup.js	9 Feb 2008 12:53:56 -0000	1.3
--- fckiecleanup.js	5 May 2008 00:35:23 -0000	1.4
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fckdomrange.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckdomrange.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckdomrange.js	9 Feb 2008 12:53:56 -0000	1.1
--- fckdomrange.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 99,102 ****
--- 99,103 ----
  			return docFrag ;
  		}
+ 		return null ;
  	},
  
***************
*** 105,108 ****
--- 106,111 ----
  		if ( this._Range )
  			return this._Range.collapsed ;
+ 
+ 		return false ;
  	},
  
***************
*** 146,155 ****
  	MoveToElementEditStart : function( targetElement )
  	{
! 		var child ;
  
! 		while ( ( child = targetElement.firstChild ) && child.nodeType == 1 && FCKListsLib.EmptyElements[ child.nodeName.toLowerCase() ] == null )
! 			targetElement = child ;
  
! 		this.MoveToElementStart( targetElement ) ;
  	},
  
--- 149,166 ----
  	MoveToElementEditStart : function( targetElement )
  	{
! 		var editableElement ;
  
! 		while ( targetElement && targetElement.nodeType == 1 )
! 		{
! 			if ( FCKDomTools.CheckIsEditable( targetElement ) )
! 				editableElement = targetElement ;
! 			else if ( editableElement )
! 				break ;		// If we already found an editable element, stop the loop.
  
! 			targetElement = targetElement.firstChild ;
! 		}
! 
! 		if ( editableElement )
! 			this.MoveToElementStart( editableElement ) ;
  	},
  
***************
*** 737,741 ****
  	 *		- PreviousBlock	: a reference to the block element that preceeds
  	 *		  the range after the split.
! 	 *		- NextBlock : a reference to the block element that preceeds the
  	 *		  range after the split.
  	 *		- WasStartOfBlock : a boolean indicating that the range was
--- 748,752 ----
  	 *		- PreviousBlock	: a reference to the block element that preceeds
  	 *		  the range after the split.
! 	 *		- NextBlock : a reference to the block element that follows the
  	 *		  range after the split.
  	 *		- WasStartOfBlock : a boolean indicating that the range was
***************
*** 748,753 ****
  	 * NextBlock value if the range was at the end of the block.
  	 */
! 	SplitBlock : function()
  	{
  		if ( !this._Range )
  			this.MoveToSelection() ;
--- 759,766 ----
  	 * NextBlock value if the range was at the end of the block.
  	 */
! 	SplitBlock : function( forceBlockTag )
  	{
+ 		var blockTag = forceBlockTag || FCKConfig.EnterMode ;
+ 
  		if ( !this._Range )
  			this.MoveToSelection() ;
***************
*** 761,774 ****
  			var oElementPath	= null ;
  
! 			if ( FCKConfig.EnterMode != 'br' )
  			{
  				if ( !eStartBlock )
  				{
! 					eStartBlock = this.FixBlock( true ) ;
  					eEndBlock	= this.EndBlock ;	// FixBlock may have fixed the EndBlock too.
  				}
  
  				if ( !eEndBlock )
! 					eEndBlock = this.FixBlock( false ) ;
  			}
  
--- 774,787 ----
  			var oElementPath	= null ;
  
! 			if ( blockTag != 'br' )
  			{
  				if ( !eStartBlock )
  				{
! 					eStartBlock = this.FixBlock( true, blockTag ) ;
  					eEndBlock	= this.EndBlock ;	// FixBlock may have fixed the EndBlock too.
  				}
  
  				if ( !eEndBlock )
! 					eEndBlock = this.FixBlock( false, blockTag ) ;
  			}
  
***************
*** 833,837 ****
  
  	// Transform a block without a block tag in a valid block (orphan text in the body or td, usually).
! 	FixBlock : function( isStart )
  	{
  		// Bookmark the range so we can restore it later.
--- 846,850 ----
  
  	// Transform a block without a block tag in a valid block (orphan text in the body or td, usually).
! 	FixBlock : function( isStart, blockTag )
  	{
  		// Bookmark the range so we can restore it later.
***************
*** 845,849 ****
  
  		// Create the fixed block.
! 		var oFixedBlock = this.Window.document.createElement( FCKConfig.EnterMode ) ;
  
  		// Move the contents of the temporary range to the fixed block.
--- 858,862 ----
  
  		// Create the fixed block.
! 		var oFixedBlock = this.Window.document.createElement( blockTag ) ;
  
  		// Move the contents of the temporary range to the fixed block.

Index: fckimagepreloader.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckimagepreloader.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckimagepreloader.js	9 Feb 2008 12:53:56 -0000	1.1
--- fckimagepreloader.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 62,64 ****
  	if ( (--imagePreloader._PreloadCount) == 0 && imagePreloader.OnComplete )
  		imagePreloader.OnComplete() ;
! }
\ No newline at end of file
--- 62,64 ----
  	if ( (--imagePreloader._PreloadCount) == 0 && imagePreloader.OnComplete )
  		imagePreloader.OnComplete() ;
! }

Index: fcktoolbarfontformatcombo.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fcktoolbarfontformatcombo.js	9 Feb 2008 12:53:57 -0000	1.5
--- fcktoolbarfontformatcombo.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 35,39 ****
  
  	this.PanelWidth = 190 ;
! 	
  	this.DefaultLabel = FCKConfig.DefaultFontFormatLabel || '' ;
  }
--- 35,39 ----
  
  	this.PanelWidth = 190 ;
! 
  	this.DefaultLabel = FCKConfig.DefaultFontFormatLabel || '' ;
  }
***************
*** 65,69 ****
  		div		: aNames[9] || ( aNames[0] + ' (DIV)')
  	} ;
! 	
  	// Get the available formats from the configuration file.
  	var elements = FCKConfig.FontFormats.split(';') ;
--- 65,69 ----
  		div		: aNames[9] || ( aNames[0] + ' (DIV)')
  	} ;
! 
  	// Get the available formats from the configuration file.
  	var elements = FCKConfig.FontFormats.split(';') ;

Index: fckdocumentfragment_gecko.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckdocumentfragment_gecko.js	9 Feb 2008 12:53:56 -0000	1.1
--- fckdocumentfragment_gecko.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 44,46 ****
  		FCKDomTools.InsertAfterNode( existingNode, this.RootNode ) ;
  	}
! }
\ No newline at end of file
--- 44,46 ----
  		FCKDomTools.InsertAfterNode( existingNode, this.RootNode ) ;
  	}
! }

Index: fckdocumentfragment_ie.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckdocumentfragment_ie.js	9 Feb 2008 12:53:56 -0000	1.1
--- fckdocumentfragment_ie.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 56,58 ****
  			FCKDomTools.InsertAfterNode( existingNode, eRoot.removeChild( eLast ) ) ;
  	}
! } ;
\ No newline at end of file
--- 56,58 ----
  			FCKDomTools.InsertAfterNode( existingNode, eRoot.removeChild( eLast ) ) ;
  	}
! } ;

Index: fckxml_gecko.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckxml_gecko.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fckxml_gecko.js	9 Feb 2008 12:53:57 -0000	1.5
--- fckxml_gecko.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 27,52 ****
  	{
  		this.Error = false ;
- 		var oFCKXml = this ;
  
  		var oXmlHttp = FCKTools.CreateXmlObject( 'XmlHttp' ) ;
! 		oXmlHttp.open( "GET", urlToCall, false ) ;
  		oXmlHttp.send( null ) ;
  
  		if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 )
! 			this.DOMDocument = oXmlHttp.responseXML ;
  		else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 )
! 			this.DOMDocument = oXmlHttp.responseXML ;
  		else
! 			this.DOMDocument = null ;
  
! 		if ( this.DOMDocument == null || this.DOMDocument.firstChild == null )
  		{
! 			this.Error = true ;
! 			if (window.confirm( 'Error loading "' + urlToCall + '"\r\nDo you want to see more info?' ) )
! 				alert( 'URL requested: "' + urlToCall + '"\r\n' +
! 							'Server response:\r\nStatus: ' + oXmlHttp.status + '\r\n' +
! 							'Response text:\r\n' + oXmlHttp.responseText ) ;
  
  		}
  	},
  
--- 27,67 ----
  	{
  		this.Error = false ;
  
+ 		var oXml ;
  		var oXmlHttp = FCKTools.CreateXmlObject( 'XmlHttp' ) ;
! 		oXmlHttp.open( 'GET', urlToCall, false ) ;
  		oXmlHttp.send( null ) ;
  
  		if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 )
! 			oXml = oXmlHttp.responseXML ;
  		else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 )
! 			oXml = oXmlHttp.responseXML ;
  		else
! 			oXml = null ;
  
! 		if ( oXml )
  		{
! 			// Try to access something on it.
! 			try
! 			{
! 				var test = oXml.firstChild ;
! 			}
! 			catch (e)
! 			{
! 				// If document.domain has been changed (#123), we'll have a security
! 				// error at this point. The workaround here is parsing the responseText:
! 				// http://alexander.kirk.at/2006/07/27/firefox-15-xmlhttprequest-reqresponsexml-and-documentdomain/
! 				oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
! 			}
! 		}
  
+ 		if ( !oXml || !oXml.firstChild )
+ 		{
+ 			this.Error = true ;
+ 			if ( window.confirm( 'Error loading "' + urlToCall + '" (HTTP Status: ' + oXmlHttp.status + ').\r\nDo you want to see the server response dump?' ) )
+ 				alert( oXmlHttp.responseText ) ;
  		}
+ 
+ 		this.DOMDocument = oXml ;
  	},
  
***************
*** 85,87 ****
  			return null ;
  	}
! } ;
\ No newline at end of file
--- 100,102 ----
  			return null ;
  	}
! } ;

Index: fckxml_ie.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckxml_ie.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fckxml_ie.js	9 Feb 2008 12:53:57 -0000	1.5
--- fckxml_ie.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 86,88 ****
  			return this.DOMDocument.selectSingleNode( xpath ) ;
  	}
! } ;
\ No newline at end of file
--- 86,88 ----
  			return this.DOMDocument.selectSingleNode( xpath ) ;
  	}
! } ;

Index: fckicon.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckicon.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckicon.js	9 Feb 2008 12:53:56 -0000	1.3
--- fckicon.js	5 May 2008 00:35:23 -0000	1.4
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 101,103 ****
  
  	return eIcon ;
! }
\ No newline at end of file
--- 101,103 ----
  
  	return eIcon ;
! }

Index: fckmenublockpanel.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckmenublockpanel.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckmenublockpanel.js	9 Feb 2008 12:53:57 -0000	1.3
--- fckmenublockpanel.js	5 May 2008 00:35:23 -0000	1.4
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 36,40 ****
  {
  	var oPanel = this.Panel = ( this.Parent && this.Parent.Panel ? this.Parent.Panel.CreateChildPanel() : new FCKPanel() ) ;
! 	oPanel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
  
  	// Call the "base" implementation.
--- 36,40 ----
  {
  	var oPanel = this.Panel = ( this.Parent && this.Parent.Panel ? this.Parent.Panel.CreateChildPanel() : new FCKPanel() ) ;
! 	oPanel.AppendStyleSheet( FCKConfig.SkinEditorCSS ) ;
  
  	// Call the "base" implementation.
***************
*** 52,54 ****
  	if ( this.Panel.CheckIsOpened() )
  		this.Panel.Hide() ;
! }
\ No newline at end of file
--- 52,54 ----
  	if ( this.Panel.CheckIsOpened() )
  		this.Panel.Hide() ;
! }

Index: fcktoolbarbuttonui.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fcktoolbarbuttonui.js	9 Feb 2008 12:53:57 -0000	1.4
--- fcktoolbarbuttonui.js	5 May 2008 00:35:23 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fckkeystrokehandler.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckkeystrokehandler.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckkeystrokehandler.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckkeystrokehandler.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 57,63 ****
  		// If the configuration for the keystrokes is missing some element or has any extra comma
  		// this item won't be valid, so skip it and keep on processing.
! 		if ( !keyDef ) 
  			continue ;
! 		
  		if ( typeof( keyDef[0] ) == 'object' )		// It is an array with arrays defining the keystrokes.
  			this.SetKeystrokes.apply( this, keyDef ) ;
--- 57,63 ----
  		// If the configuration for the keystrokes is missing some element or has any extra comma
  		// this item won't be valid, so skip it and keep on processing.
! 		if ( !keyDef )
  			continue ;
! 
  		if ( typeof( keyDef[0] ) == 'object' )		// It is an array with arrays defining the keystrokes.
  			this.SetKeystrokes.apply( this, keyDef ) ;

Index: fckstyle.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckstyle.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckstyle.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckstyle.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 95,99 ****
  	 * Apply the style to a FCKDomRange.
  	 */
! 	ApplyToRange : function( range, selectIt )
  	{
  		// ApplyToRange is not valid for FCK_STYLE_OBJECT types.
--- 95,99 ----
  	 * Apply the style to a FCKDomRange.
  	 */
! 	ApplyToRange : function( range, selectIt, updateRange )
  	{
  		// ApplyToRange is not valid for FCK_STYLE_OBJECT types.
***************
*** 112,116 ****
  		}
  
! 		this.ApplyToRange( range, selectIt ) ;
  	},
  
--- 112,116 ----
  		}
  
! 		this.ApplyToRange( range, selectIt, updateRange ) ;
  	},
  
***************
*** 142,146 ****
  	 * effect.
  	 */
! 	RemoveFromRange : function( range, selectIt )
  	{
  		var bookmark ;
--- 142,146 ----
  	 * effect.
  	 */
! 	RemoveFromRange : function( range, selectIt, updateRange )
  	{
  		var bookmark ;
***************
*** 232,237 ****
  						this._RemoveOverrides( pathElement, styleOverrides[ pathElementName ] ) ;
  
! 						// Remove the element if no more attributes are available.
! 						this._RemoveNoAttribElement( pathElement ) ;
  					}
  				}
--- 232,238 ----
  						this._RemoveOverrides( pathElement, styleOverrides[ pathElementName ] ) ;
  
! 						// Remove the element if no more attributes are available and it's an inline style element
! 						if ( this.GetType() == FCK_STYLE_INLINE)
! 							this._RemoveNoAttribElement( pathElement ) ;
  					}
  				}
***************
*** 276,279 ****
--- 277,283 ----
  				range.SelectBookmark( bookmark ) ;
  
+ 			if ( updateRange )
+ 				range.MoveToBookmark( bookmark ) ;
+ 
  			return ;
  		}
***************
*** 283,287 ****
  
  		// Bookmark the range so we can re-select it after processing.
! 		var bookmark = range.CreateBookmark( true ) ;
  
  		// The style will be applied within the bookmark boundaries.
--- 287,291 ----
  
  		// Bookmark the range so we can re-select it after processing.
! 		bookmark = range.CreateBookmark( true ) ;
  
  		// The style will be applied within the bookmark boundaries.
***************
*** 401,404 ****
--- 405,411 ----
  		if ( selectIt )
  			range.SelectBookmark( bookmark ) ;
+ 
+ 		if ( updateRange )
+ 			range.MoveToBookmark( bookmark ) ;
  	},
  
***************
*** 487,491 ****
  		{
  			case FCK_STYLE_BLOCK :
! 				return this.CheckElementRemovable( elementPath.Block || elementPath.BlockLimit ) ;
  
  			case FCK_STYLE_INLINE :
--- 494,498 ----
  		{
  			case FCK_STYLE_BLOCK :
! 				return this.CheckElementRemovable( elementPath.Block || elementPath.BlockLimit, true ) ;
  
  			case FCK_STYLE_INLINE :
***************
*** 689,693 ****
  		}
  
! 		return ( valueA == valueB )
  	},
  
--- 696,701 ----
  		}
  
! 		// Return true if they match or if valueA is null and valueB is an empty string
! 		return ( valueA == valueB || ( ( valueA === null || valueA === '' ) && ( valueB === null || valueB === '' ) ) )
  	},
  
***************
*** 742,745 ****
--- 750,841 ----
  
  	/**
+ 	 * Converting from a PRE block to a non-PRE block in formatting operations.
+ 	 */
+ 	_FromPre : function( doc, block, newBlock )
+ 	{
+ 		var innerHTML = block.innerHTML ;
+ 
+ 		// Trim the first and last linebreaks immediately after and before <pre>, </pre>,
+ 		// if they exist.
+ 		// This is done because the linebreaks are not rendered.
+ 		innerHTML = innerHTML.replace( /(\r\n|\r)/g, '\n' ) ;
+ 		innerHTML = innerHTML.replace( /^[ \t]*\n/, '' ) ;
+ 		innerHTML = innerHTML.replace( /\n$/, '' ) ;
+ 
+ 		// 1. Convert spaces or tabs at the beginning or at the end to &nbsp;
+ 		innerHTML = innerHTML.replace( /^[ \t]+|[ \t]+$/g, function( match, offset, s )
+ 				{
+ 					if ( match.length == 1 )	// one space, preserve it
+ 						return '&nbsp;' ;
+ 					else if ( offset == 0 )		// beginning of block
+ 						return new Array( match.length ).join( '&nbsp;' ) + ' ' ;
+ 					else				// end of block
+ 						return ' ' + new Array( match.length ).join( '&nbsp;' ) ;
+ 				} ) ;
+ 
+ 		// 2. Convert \n to <BR>.
+ 		// 3. Convert contiguous (i.e. non-singular) spaces or tabs to &nbsp;
+ 		var htmlIterator = new FCKHtmlIterator( innerHTML ) ;
+ 		var results = [] ;
+ 		htmlIterator.Each( function( isTag, value )
+ 			{
+ 				if ( !isTag )
+ 				{
+ 					value = value.replace( /\n/g, '<BR>' ) ;
+ 					value = value.replace( /[ \t]{2,}/g,
+ 							function ( match )
+ 							{
+ 								return new Array( match.length ).join( '&nbsp;' ) + ' ' ;
+ 							} ) ;
+ 				}
+ 				results.push( value ) ;
+ 			} ) ;
+ 		newBlock.innerHTML = results.join( '' ) ;
+ 		return newBlock ;
+ 	},
+ 
+ 	/**
+ 	 * Converting from a non-PRE block to a PRE block in formatting operations.
+ 	 */
+ 	_ToPre : function( doc, block, newBlock )
+ 	{
+ 		// Handle converting from a regular block to a <pre> block.
+ 		var innerHTML = block.innerHTML.Trim() ;
+ 
+ 		// 1. Delete ANSI whitespaces immediately before and after <BR> because they are not visible.
+ 		// 2. Mark down any <BR /> nodes here so they can be turned into \n in the next step and avoid being compressed.
+ 		innerHTML = innerHTML.replace( /[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi, '<BR />' ) ;
+ 
+ 		// 3. Compress other ANSI whitespaces since they're only visible as one single space previously.
+ 		// 4. Convert &nbsp; to spaces since &nbsp; is no longer needed in <PRE>.
+ 		// 5. Convert any <BR /> to \n. This must not be done earlier because the \n would then get compressed.
+ 		var htmlIterator = new FCKHtmlIterator( innerHTML ) ;
+ 		var results = [] ;
+ 		htmlIterator.Each( function( isTag, value )
+ 			{
+ 				if ( !isTag )
+ 					value = value.replace( /([ \t\n\r]+|&nbsp;)/g, ' ' ) ;
+ 				else if ( isTag && value == '<BR />' )
+ 					value = '\n' ;
+ 				results.push( value ) ;
+ 			} ) ;
+ 
+ 		// Assigning innerHTML to <PRE> in IE causes all linebreaks to be reduced to spaces.
+ 		// Assigning outerHTML to <PRE> in IE doesn't work if the <PRE> isn't contained in another node
+ 		// since the node reference is changed after outerHTML assignment.
+ 		// So, we need some hacks to workaround IE bugs here.
+ 		if ( FCKBrowserInfo.IsIE )
+ 		{
+ 			var temp = doc.createElement( 'div' ) ;
+ 			temp.appendChild( newBlock ) ;
+ 			newBlock.outerHTML = '<PRE>\n' + results.join( '' ) + '</PRE>' ;
+ 			newBlock = temp.removeChild( temp.firstChild ) ;
+ 		}
+ 		else
+ 			newBlock.innerHTML = results.join( '' ) ;
+ 		return newBlock ;
+ 	},
+ 
+ 	/**
  	 * Apply an inline style to a FCKDomRange.
  	 *
***************
*** 748,752 ****
  	 *	- Properly handle block containers like <div> and <blockquote>.
  	 */
! 	_ApplyBlockStyle : function( range, selectIt )
  	{
  		// Bookmark the range so we can re-select it after processing.
--- 844,848 ----
  	 *	- Properly handle block containers like <div> and <blockquote>.
  	 */
! 	_ApplyBlockStyle : function( range, selectIt, updateRange )
  	{
  		// Bookmark the range so we can re-select it after processing.
***************
*** 754,758 ****
  
  		if ( selectIt )
! 			bookmark = range.CreateBookmark( true ) ;
  
  		var iterator = new FCKDomRangeIterator( range ) ;
--- 850,854 ----
  
  		if ( selectIt )
! 			bookmark = range.CreateBookmark() ;
  
  		var iterator = new FCKDomRangeIterator( range ) ;
***************
*** 760,778 ****
  
  		var block ;
  		while( ( block = iterator.GetNextParagraph() ) )		// Only one =
  		{
  			// Create the new node right before the current one.
! 			var newBlock = block.parentNode.insertBefore( this.BuildElement( range.Window.document ), block ) ;
  
  			// Move everything from the current node to the new one.
! 			FCKDomTools.MoveChildren( block, newBlock ) ;
  
! 			// Delete the current node.
  			FCKDomTools.RemoveNode( block ) ;
  		}
  
  		// Re-select the original range.
  		if ( selectIt )
  			range.SelectBookmark( bookmark ) ;
  	},
  
--- 856,938 ----
  
  		var block ;
+ 		var doc = range.Window.document ;
+ 
+ 		var preBlocks = [] ;
+ 		var convertedPreBlocks = [] ;
+ 
  		while( ( block = iterator.GetNextParagraph() ) )		// Only one =
  		{
  			// Create the new node right before the current one.
! 			var newBlock = this.BuildElement( doc ) ;
  
  			// Move everything from the current node to the new one.
! 			var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' ) ;
! 			var blockIsPre = block.nodeName.IEquals( 'pre' ) ;
! 			if ( newBlockIsPre && !blockIsPre )
! 			{
! 				newBlock = this._ToPre( doc, block, newBlock ) ;
! 				preBlocks.push( newBlock ) ;
! 			}
! 			else if ( !newBlockIsPre && blockIsPre )
! 			{
! 				newBlock = this._FromPre( doc, block, newBlock ) ;
! 				convertedPreBlocks.push( newBlock ) ;
! 			}
! 			else	// Convering from a regular block to another regular block.
! 				FCKDomTools.MoveChildren( block, newBlock ) ;
  
! 			// Replace the current block.
! 			block.parentNode.insertBefore( newBlock, block ) ;
  			FCKDomTools.RemoveNode( block ) ;
  		}
  
+ 		// Merge adjacent <PRE> blocks for #1229.
+ 		for ( var i = 0 ; i < preBlocks.length - 1 ; i++ )
+ 		{
+ 			// Check if the next block in HTML equals the next <PRE> block generated.
+ 			if ( FCKDomTools.GetNextSourceElement( preBlocks[i], true, [], [], true ) != preBlocks[i+1] )
+ 				continue ;
+ 
+ 			// Merge the upper <PRE> block's content into the lower <PRE> block.
+ 			// Remove the upper <PRE> block.
+ 			preBlocks[i+1].innerHTML = preBlocks[i].innerHTML + '\n\n' + preBlocks[i+1].innerHTML ;
+ 			FCKDomTools.RemoveNode( preBlocks[i] ) ;
+ 		}
+ 
+ 		// Split converted <PRE> blocks for #1229.
+ 		for ( var i = 0 ; i < convertedPreBlocks.length ; i++ )
+ 		{
+ 			var currentBlock = convertedPreBlocks[i] ;
+ 			var lastNewBlock = null ;
+ 			for ( var j = 0 ; j < currentBlock.childNodes.length ; j++ )
+ 			{
+ 				var cursor = currentBlock.childNodes[j] ;
+ 
+ 				// If we have two <BR>s, and they're not at the beginning or the end,
+ 				// then we'll split up the contents following them into another block.
+ 				if ( cursor.nodeName.IEquals( 'br' ) && j != 0 && j != currentBlock.childNodes.length - 2
+ 						&& cursor.nextSibling && cursor.nextSibling.nodeName.IEquals( 'br' ) )
+ 				{
+ 					FCKDomTools.RemoveNode( cursor.nextSibling ) ;
+ 					FCKDomTools.RemoveNode( cursor ) ;
+ 					j-- ;	// restart at current index at next iteration
+ 					lastNewBlock = FCKDomTools.InsertAfterNode( lastNewBlock || currentBlock, doc.createElement( currentBlock.nodeName ) ) ;
+ 					continue ;
+ 				}
+ 
+ 				if ( lastNewBlock )
+ 				{
+ 					FCKDomTools.MoveNode( cursor, lastNewBlock ) ;
+ 					j-- ;	// restart at current index at next iteration
+ 				}
+ 			}
+ 		}
+ 
  		// Re-select the original range.
  		if ( selectIt )
  			range.SelectBookmark( bookmark ) ;
+ 
+ 		if ( updateRange )
+ 			range.MoveToBookmark( bookmark ) ;
  	},
  
***************
*** 787,791 ****
  	 *        <span style="color: #ff0000;"><span style="background-color: #ffffff">XYZ</span></span>
  	 */
! 	_ApplyInlineStyle : function( range, selectIt )
  	{
  		var doc = range.Window.document ;
--- 947,951 ----
  	 *        <span style="color: #ff0000;"><span style="background-color: #ffffff">XYZ</span></span>
  	 */
! 	_ApplyInlineStyle : function( range, selectIt, updateRange )
  	{
  		var doc = range.Window.document ;
***************
*** 968,971 ****
--- 1128,1134 ----
  		if ( selectIt )
  			range.SelectBookmark( bookmark ) ;
+ 
+ 		if ( updateRange )
+ 			range.MoveToBookmark( bookmark ) ;
  	},
  

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

Index: fckdomrange_ie.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckdomrange_ie.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckdomrange_ie.js	9 Feb 2008 12:53:56 -0000	1.1
--- fckdomrange_ie.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 83,87 ****
  	// Create marker tags for the start and end boundaries.
  	var eStartMarker = this.GetBookmarkNode( bookmark, true ) ;
! 	
  	if ( !eStartMarker )
  		return ;
--- 83,87 ----
  	// Create marker tags for the start and end boundaries.
  	var eStartMarker = this.GetBookmarkNode( bookmark, true ) ;
! 
  	if ( !eStartMarker )
  		return ;
***************
*** 113,118 ****
  	{
  		bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
! 		
! 		// Append a temporary <span>&nbsp;</span> before the selection.
  		// This is needed to avoid IE destroying selections inside empty
  		// inline elements, like <b></b> (#253).
--- 113,118 ----
  	{
  		bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
! 
! 		// Append a temporary <span>&#65279;</span> before the selection.
  		// This is needed to avoid IE destroying selections inside empty
  		// inline elements, like <b></b> (#253).
***************
*** 122,126 ****
  		dummySpan.innerHTML = '&#65279;' ;	// Zero Width No-Break Space (U+FEFF). See #1359.
  		eStartMarker.parentNode.insertBefore( dummySpan, eStartMarker ) ;
! 		
  		if ( bIsStartMakerAlone )
  		{
--- 122,126 ----
  		dummySpan.innerHTML = '&#65279;' ;	// Zero Width No-Break Space (U+FEFF). See #1359.
  		eStartMarker.parentNode.insertBefore( dummySpan, eStartMarker ) ;
! 
  		if ( bIsStartMakerAlone )
  		{
***************
*** 132,136 ****
  		}
  	}
! 	
  	if ( !this._Range )
  		this._Range = this.CreateRange() ;
--- 132,136 ----
  		}
  	}
! 
  	if ( !this._Range )
  		this._Range = this.CreateRange() ;
***************
*** 144,150 ****
  		if ( bIsStartMakerAlone )
  		{
! 			// Move the selection start to include the temporary &nbsp;.
  			oIERange.moveStart( 'character', -1 ) ;
! 			
  			oIERange.select() ;
  
--- 144,150 ----
  		if ( bIsStartMakerAlone )
  		{
! 			// Move the selection start to include the temporary &#65279;.
  			oIERange.moveStart( 'character', -1 ) ;
! 
  			oIERange.select() ;
  

Index: fckplugin.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckplugin.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fckplugin.js	9 Feb 2008 12:53:57 -0000	1.5
--- fckplugin.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 54,56 ****
  	// Add the main plugin script.
  	LoadScript( this.Path + 'fckplugin.js' ) ;
! }
\ No newline at end of file
--- 54,56 ----
  	// Add the main plugin script.
  	LoadScript( this.Path + 'fckplugin.js' ) ;
! }

Index: fckevents.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckevents.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fckevents.js	9 Feb 2008 12:53:56 -0000	1.5
--- fckevents.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fckdataprocessor.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckdataprocessor.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckdataprocessor.js	9 Feb 2008 12:53:56 -0000	1.1
--- fckdataprocessor.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 117,119 ****
  		return html ;
  	}
! } ;
\ No newline at end of file
--- 117,119 ----
  		return html ;
  	}
! } ;

Index: fcktoolbarspecialcombo.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fcktoolbarspecialcombo.js	9 Feb 2008 12:53:57 -0000	1.5
--- fcktoolbarspecialcombo.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 33,36 ****
--- 33,39 ----
  	this.SourceView			= false ;
  	this.ContextSensitive	= true ;
+ 	this.FieldWidth			= null ;
+ 	this.PanelWidth			= null ;
+ 	this.PanelMaxHeight		= null ;
  	//this._LastValue			= null ;
  }
***************
*** 99,103 ****
  				{
  					this._LastValue = sValue ;
! 					
  					if ( !sValue || sValue.length == 0 )
  					{
--- 102,106 ----
  				{
  					this._LastValue = sValue ;
! 
  					if ( !sValue || sValue.length == 0 )
  					{

Index: fcktoolbarbreak_gecko.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fcktoolbarbreak_gecko.js	9 Feb 2008 12:53:57 -0000	1.5
--- fcktoolbarbreak_gecko.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 34,36 ****
  
  	targetElement.appendChild( oBreakDiv ) ;
! }
\ No newline at end of file
--- 34,36 ----
  
  	targetElement.appendChild( oBreakDiv ) ;
! }

Index: fckdomrangeiterator.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckdomrangeiterator.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckdomrangeiterator.js	9 Feb 2008 12:53:56 -0000	1.1
--- fckdomrangeiterator.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 93,96 ****
--- 93,98 ----
  		var lastNode = this._LastNode ;
  
+ 		this._NextNode = null ;
+ 
  		while ( currentNode )
  		{
***************
*** 111,115 ****
  				var nodeName = currentNode.nodeName.toLowerCase() ;
  
! 				if ( boundarySet[ nodeName ] )
  				{
  					// <br> boundaries must be part of the range. It will
--- 113,117 ----
  				var nodeName = currentNode.nodeName.toLowerCase() ;
  
! 				if ( boundarySet[ nodeName ] && ( !FCKBrowserInfo.IsIE || currentNode.scopeName == 'HTML' ) )
  				{
  					// <br> boundaries must be part of the range. It will
***************
*** 129,134 ****
--- 131,143 ----
  					// including possibly skipped empty spaces. (#1603)
  					if ( range )
+ 					{
  						range.SetEnd( currentNode, 3, true ) ;
  
+ 						// The found boundary must be set as the next one at this
+ 						// point. (#1717)
+ 						if ( nodeName != 'br' )
+ 							this._NextNode = currentNode ;
+ 					}
+ 
  					closeRange = true ;
  				}
***************
*** 202,208 ****
  			{
  				range._UpdateElementInfo() ;
! 				
! 				if ( range.StartNode == range.EndNode 
! 						&& range.StartNode.parentNode == range.StartBlockLimit 
  						&& range.StartNode.getAttribute && range.StartNode.getAttribute( '_fck_bookmark' ) )
  					range = null ;
--- 211,217 ----
  			{
  				range._UpdateElementInfo() ;
! 
! 				if ( range.StartNode == range.EndNode
! 						&& range.StartNode.parentNode == range.StartBlockLimit
  						&& range.StartNode.getAttribute && range.StartNode.getAttribute( '_fck_bookmark' ) )
  					range = null ;
***************
*** 210,214 ****
  					break ;
  			}
! 			
  			if ( isLast )
  				break ;
--- 219,223 ----
  					break ;
  			}
! 
  			if ( isLast )
  				break ;
***************
*** 272,276 ****
  					removePreviousBr = !splitInfo.WasStartOfBlock ;
  					removeLastBr = !splitInfo.WasEndOfBlock ;
- 					FCKDebug.Output( 'removePreviousBr=' + removePreviousBr + ',removeLastBr=' + removeLastBr ) ;
  
  					// Insert the new block into the DOM.
--- 281,284 ----
***************
*** 312,316 ****
  		// above block can be removed or changed, so we can rely on it for the
  		// next interation.
! 		this._NextNode = ( isLast || block == lastNode ) ? null : FCKDomTools.GetNextSourceNode( block, true, null, lastNode ) ;
  
  		return block ;
--- 320,325 ----
  		// above block can be removed or changed, so we can rely on it for the
  		// next interation.
! 		if ( !this._NextNode )
! 			this._NextNode = ( isLast || block == lastNode ) ? null : FCKDomTools.GetNextSourceNode( block, true, null, lastNode ) ;
  
  		return block ;

Index: fcktoolbarstylecombo.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fcktoolbarstylecombo.js	9 Feb 2008 12:53:57 -0000	1.5
--- fcktoolbarstylecombo.js	5 May 2008 00:35:23 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 77,84 ****
  
  		// Object type styles have no preview.
! 		var caption = style.GetType() == FCK_STYLE_OBJECT ? 
! 			styleName : 
  			FCKToolbarStyleCombo_BuildPreview( style, style.Label || styleName ) ;
! 	
  		var item = targetSpecialCombo.AddItem( styleName, caption ) ;
  
--- 77,84 ----
  
  		// Object type styles have no preview.
! 		var caption = style.GetType() == FCK_STYLE_OBJECT ?
! 			styleName :
  			FCKToolbarStyleCombo_BuildPreview( style, style.Label || styleName ) ;
! 
  		var item = targetSpecialCombo.AddItem( styleName, caption ) ;
  
***************
*** 124,128 ****
  	//	  for that element only.
  	//	- Select the styles that are active for the current selection.
! 	
  	// Clear the current selection.
  	targetSpecialCombo.DeselectAll() ;
--- 124,128 ----
  	//	  for that element only.
  	//	- Select the styles that are active for the current selection.
! 
  	// Clear the current selection.
  	targetSpecialCombo.DeselectAll() ;
***************
*** 131,137 ****
  	var path ;
  	var tagName ;
! 	
  	var selection = FCK.ToolbarSet.CurrentInstance.Selection ;
! 	
  	if ( selection.GetType() == 'Control' )
  	{
--- 131,137 ----
  	var path ;
  	var tagName ;
! 
  	var selection = FCK.ToolbarSet.CurrentInstance.Selection ;
! 
  	if ( selection.GetType() == 'Control' )
  	{
***************
*** 149,153 ****
  		var item = targetSpecialCombo.Items[i] ;
  		var style = item.Style ;
! 		
  		if ( ( tagName && style.Element == tagName ) || ( !tagName && style.GetType() != FCK_STYLE_OBJECT ) )
  		{
--- 149,153 ----
  		var item = targetSpecialCombo.Items[i] ;
  		var style = item.Style ;
! 
  		if ( ( tagName && style.Element == tagName ) || ( !tagName && style.GetType() != FCK_STYLE_OBJECT ) )
  		{
***************
*** 162,175 ****
  }
  
! function FCKToolbarStyleCombo_BuildPreview( style, caption ) 
  {
  	var styleType = style.GetType() ;
  	var html = [] ;
! 	
  	if ( styleType == FCK_STYLE_BLOCK )
  		html.push( '<div class="BaseFont">' ) ;
! 	
  	var elementName = style.Element ;
! 	
  	// Avoid <bdo> in the preview.
  	if ( elementName == 'bdo' )
--- 162,175 ----
  }
  
! function FCKToolbarStyleCombo_BuildPreview( style, caption )
  {
  	var styleType = style.GetType() ;
  	var html = [] ;
! 
  	if ( styleType == FCK_STYLE_BLOCK )
  		html.push( '<div class="BaseFont">' ) ;
! 
  	var elementName = style.Element ;
! 
  	// Avoid <bdo> in the preview.
  	if ( elementName == 'bdo' )
***************
*** 198,200 ****
  
  	return html.join( '' ) ;
! }
\ No newline at end of file
--- 198,200 ----
  
  	return html.join( '' ) ;
! }

Index: fckeditingarea.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckeditingarea.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckeditingarea.js	9 Feb 2008 12:53:56 -0000	1.4
--- fckeditingarea.js	5 May 2008 00:35:23 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 45,73 ****
  
  	// Remove all child nodes from the target.
! 	var oChild ;
! 	while( ( oChild = eTargetElement.firstChild ) )		// Only one "=".
! 	{
! 		// Set innerHTML = '' to avoid memory leak.
! 		if ( oChild.contentWindow )
! 			oChild.contentWindow.document.body.innerHTML = '' ;
! 
! 		eTargetElement.removeChild( oChild ) ;
! 	}
  
  	if ( this.Mode == FCK_EDITMODE_WYSIWYG )
  	{
! 		// Create the editing area IFRAME.
! 		var oIFrame = this.IFrame = oTargetDocument.createElement( 'iframe' ) ;
! 		
! 		// Firefox will render the tables inside the body in Quirks mode if the 
! 		// source of the iframe is set to javascript. see #515
! 		if ( !FCKBrowserInfo.IsGecko )
! 			oIFrame.src = 'javascript:void(0)' ;
! 		
! 		oIFrame.frameBorder = 0 ;
! 		oIFrame.width = oIFrame.height = '100%' ;
! 
! 		// Append the new IFRAME to the target.
! 		eTargetElement.appendChild( oIFrame ) ;
  
  		// IE has a bug with the <base> tag... it must have a </base> closer,
--- 45,57 ----
  
  	// Remove all child nodes from the target.
! 	while( eTargetElement.firstChild )
! 		eTargetElement.removeChild( eTargetElement.firstChild ) ;
  
  	if ( this.Mode == FCK_EDITMODE_WYSIWYG )
  	{
! 		// For FF, document.domain must be set only when different, otherwhise
! 		// we'll strangely have "Permission denied" issues.
! 		if ( FCK_IS_CUSTOM_DOMAIN )
! 			html = '<script>document.domain="' + FCK_RUNTIME_DOMAIN + '";</script>' + html ;
  
  		// IE has a bug with the <base> tag... it must have a </base> closer,
***************
*** 105,108 ****
--- 89,124 ----
  		}
  
+ 		// Create the editing area IFRAME.
+ 		var oIFrame = this.IFrame = oTargetDocument.createElement( 'iframe' ) ;
+ 
+ 		// IE: Avoid JavaScript errors thrown by the editing are source (like tags events).
+ 		// See #1055.
+ 		var sOverrideError = '<script type="text/javascript" _fcktemp="true">window.onerror=function(){return true;};</script>' ;
+ 
+ 		oIFrame.frameBorder = 0 ;
+ 		oIFrame.width = oIFrame.height = '100%' ;
+ 
+ 		if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE )
+ 		{
+ 			window._FCKHtmlToLoad = sOverrideError + html ;
+ 			oIFrame.src = 'javascript:void( (function(){' +
+ 				'document.open() ;' +
+ 				'document.domain="' + document.domain + '" ;' +
+ 				'document.write( window.parent._FCKHtmlToLoad );' +
+ 				'document.close() ;' +
+ 				'window.parent._FCKHtmlToLoad = null ;' +
+ 				'})() )' ;
+ 		}
+ 		else if ( !FCKBrowserInfo.IsGecko )
+ 		{
+ 			// Firefox will render the tables inside the body in Quirks mode if the
+ 			// source of the iframe is set to javascript. see #515
+ 			oIFrame.src = 'javascript:void(0)' ;
+ 		}
+ 
+ 		// Append the new IFRAME to the target. For IE, it must be done after
+ 		// setting the "src", to avoid the "secure/unsecure" message under HTTPS.
+ 		eTargetElement.appendChild( oIFrame ) ;
+ 
  		// Get the window and document objects used to interact with the newly created IFRAME.
  		this.Window = oIFrame.contentWindow ;
***************
*** 112,120 ****
  		// this.Window.onerror = function() { alert( 'Error!' ) ; return true ; }
  
! 		var oDoc = this.Document = this.Window.document ;
  
! 		oDoc.open() ;
! 		oDoc.write( html ) ;
! 		oDoc.close() ;
  
  		// Firefox 1.0.x is buggy... ohh yes... so let's do it two times and it
--- 128,142 ----
  		// this.Window.onerror = function() { alert( 'Error!' ) ; return true ; }
  
! 		if ( !FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE )
! 		{
! 			var oDoc = this.Window.document ;
  
! 			oDoc.open() ;
! 			oDoc.write( sOverrideError + html ) ;
! 			oDoc.close() ;
! 		}
! 
! 		if ( FCKBrowserInfo.IsAIR )
! 			FCKAdobeAIR.EditingArea_Start( oDoc, html ) ;
  
  		// Firefox 1.0.x is buggy... ohh yes... so let's do it two times and it
***************
*** 126,139 ****
  		}
  
! 		this.Window._FCKEditingArea = this ;
! 
! 		// FF 1.0.x is buggy... we must wait a lot to enable editing because
! 		// sometimes the content simply disappears, for example when pasting
! 		// "bla1!<img src='some_url'>!bla2" in the source and then switching
! 		// back to design.
! 		if ( FCKBrowserInfo.IsGecko10 )
! 			this.Window.setTimeout( FCKEditingArea_CompleteStart, 500 ) ;
  		else
! 			FCKEditingArea_CompleteStart.call( this.Window ) ;
  	}
  	else
--- 148,180 ----
  		}
  
! 		if ( oIFrame.readyState && oIFrame.readyState != 'completed' )
! 		{
! 			var editArea = this ;
! 			( oIFrame.onreadystatechange = function()
! 			{
! 				if ( oIFrame.readyState == 'complete' )
! 				{
! 					oIFrame.onreadystatechange = null ;
! 					editArea.Window._FCKEditingArea = editArea ;
! 					FCKEditingArea_CompleteStart.call( editArea.Window ) ;
! 				}
! 			// It happened that IE changed the state to "complete" after the
! 			// "if" and before the "onreadystatechange" assignement, making we
! 			// lost the event call, so we do a manual call just to be sure.
! 			} )() ;
! 		}
  		else
! 		{
! 			this.Window._FCKEditingArea = this ;
! 
! 			// FF 1.0.x is buggy... we must wait a lot to enable editing because
! 			// sometimes the content simply disappears, for example when pasting
! 			// "bla1!<img src='some_url'>!bla2" in the source and then switching
! 			// back to design.
! 			if ( FCKBrowserInfo.IsGecko10 )
! 				this.Window.setTimeout( FCKEditingArea_CompleteStart, 500 ) ;
! 			else
! 				FCKEditingArea_CompleteStart.call( this.Window ) ;
! 		}
  	}
  	else
***************
*** 142,150 ****
  		eTextarea.className = 'SourceField' ;
  		eTextarea.dir = 'ltr' ;
! 		FCKDomTools.SetElementStyles( eTextarea, 
! 			{ 
! 				width	: '100%', 
! 				height	: '100%', 
! 				border	: 'none', 
  				resize	: 'none',
  				outline	: 'none'
--- 183,191 ----
  		eTextarea.className = 'SourceField' ;
  		eTextarea.dir = 'ltr' ;
! 		FCKDomTools.SetElementStyles( eTextarea,
! 			{
! 				width	: '100%',
! 				height	: '100%',
! 				border	: 'none',
  				resize	: 'none',
  				outline	: 'none'
***************
*** 170,174 ****
  
  	var oEditorArea = this._FCKEditingArea ;
! 	
  	oEditorArea.MakeEditable() ;
  
--- 211,218 ----
  
  	var oEditorArea = this._FCKEditingArea ;
! 
! 	// Save this reference to be re-used later.
! 	oEditorArea.Document = oEditorArea.Window.document ;
! 
  	oEditorArea.MakeEditable() ;
  
***************
*** 214,218 ****
  			oDoc.execCommand( 'enableInlineTableEditing', false, !FCKConfig.DisableFFTableHandles ) ;
  		}
! 		catch (e) 
  		{
  			// In Firefox if the iframe is initially hidden it can't be set to designMode and it raises an exception
--- 258,262 ----
  			oDoc.execCommand( 'enableInlineTableEditing', false, !FCKConfig.DisableFFTableHandles ) ;
  		}
! 		catch (e)
  		{
  			// In Firefox if the iframe is initially hidden it can't be set to designMode and it raises an exception
***************
*** 229,238 ****
  {
  	var editingArea = evt.currentTarget.contentWindow._FCKEditingArea ;
! 	
  	// We want to run our function after the events no longer fire, so we can know that it's a stable situation
  	if ( editingArea._timer )
  		window.clearTimeout( editingArea._timer ) ;
  
! 	editingArea._timer = FCKTools.SetTimeout( FCKEditingArea_MakeEditableByMutation, 1000, editingArea ) ;	
  }
  
--- 273,282 ----
  {
  	var editingArea = evt.currentTarget.contentWindow._FCKEditingArea ;
! 
  	// We want to run our function after the events no longer fire, so we can know that it's a stable situation
  	if ( editingArea._timer )
  		window.clearTimeout( editingArea._timer ) ;
  
! 	editingArea._timer = FCKTools.SetTimeout( FCKEditingArea_MakeEditableByMutation, 1000, editingArea ) ;
  }
  
***************
*** 256,269 ****
  		if ( this.Mode == FCK_EDITMODE_WYSIWYG )
  		{
- 			// The following check is important to avoid IE entering in a focus loop. Ref:
- 			// http://sourceforge.net/tracker/index.php?func=detail&aid=1567060&group_id=75348&atid=543653
- 			if ( FCKBrowserInfo.IsIE && this.Document.hasFocus() )
- 				this._EnsureFocusIE() ;
- 
- 			this.Window.focus() ;
- 
- 			// In IE it can happen that the document is in theory focused but the active element is outside it
  			if ( FCKBrowserInfo.IsIE )
! 				this._EnsureFocusIE() ;
  		}
  		else
--- 300,307 ----
  		if ( this.Mode == FCK_EDITMODE_WYSIWYG )
  		{
  			if ( FCKBrowserInfo.IsIE )
! 				this._FocusIE() ;
! 			else
! 				this.Window.focus() ;
  		}
  		else
***************
*** 279,287 ****
  }
  
! FCKEditingArea.prototype._EnsureFocusIE = function()
  {
! 	// In IE it can happen that the document is in theory focused but the active element is outside it
  	this.Document.body.setActive() ;
  
  	// Kludge for #141... yet more code to workaround IE bugs
  	var range = this.Document.selection.createRange() ;
--- 317,328 ----
  }
  
! FCKEditingArea.prototype._FocusIE = function()
  {
! 	// In IE it can happen that the document is in theory focused but the
! 	// active element is outside of it.
  	this.Document.body.setActive() ;
  
+ 	this.Window.focus() ;
+ 
  	// Kludge for #141... yet more code to workaround IE bugs
  	var range = this.Document.selection.createRange() ;
***************
*** 292,296 ****
  	// Only apply the fix when in a block, and the block is empty.
  	if ( parentNode.childNodes.length > 0 ||
! 		 !( FCKListsLib.BlockElements[parentTag] || 
  		    FCKListsLib.NonEmptyBlockElements[parentTag] ) )
  	{
--- 333,337 ----
  	// Only apply the fix when in a block, and the block is empty.
  	if ( parentNode.childNodes.length > 0 ||
! 		 !( FCKListsLib.BlockElements[parentTag] ||
  		    FCKListsLib.NonEmptyBlockElements[parentTag] ) )
  	{
***************
*** 298,309 ****
  	}
  
! 	range.moveEnd( "character", 1 ) ;
! 	range.select() ;
! 
! 	if ( range.boundingWidth > 0 )
! 	{
! 		range.moveEnd( "character", -1 ) ;
! 		range.select() ;
! 	}
  }
  
--- 339,347 ----
  	}
  
! 	// Force the selection to happen, in this way we guarantee the focus will
! 	// be there.
! 	range = new FCKDomRange( this.Window ) ;
! 	range.MoveToElementEditStart( parentNode ) ;
! 	range.Select() ;
  }
  

Index: fckxml.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckxml.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckxml.js	9 Feb 2008 12:53:57 -0000	1.1
--- fckxml.js	5 May 2008 00:35:23 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 106,108 ****
  
  	return obj ;
! }
\ No newline at end of file
--- 106,108 ----
  
  	return obj ;
! }



From blaine at qs1489.pair.com  Sun May  4 20:35:27 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/css/images
	fck_plugin.gif, NONE, 1.1
Message-ID: <20080505003528.28F4110FE19@qs1489.pair.com>

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

Added Files:
	fck_plugin.gif 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

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



From blaine at qs1489.pair.com  Sun May  4 20:35:27 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog
	fck_about.html, 1.6, 1.7 fck_anchor.html, 1.6,
	1.7 fck_button.html, 1.4, 1.5 fck_checkbox.html, 1.5,
	1.6 fck_colorselector.html, 1.4, 1.5 fck_docprops.html, 1.5,
	1.6 fck_flash.html, 1.4, 1.5 fck_form.html, 1.4,
	1.5 fck_hiddenfield.html, 1.4, 1.5 fck_image.html, 1.7,
	1.8 fck_link.html, 1.6, 1.7 fck_listprop.html, 1.5,
	1.6 fck_paste.html, 1.5, 1.6 fck_radiobutton.html, 1.5,
	1.6 fck_replace.html, 1.4, 1.5 fck_select.html, 1.4,
	1.5 fck_smiley.html, 1.5, 1.6 fck_source.html, 1.4,
	1.5 fck_specialchar.html, 1.6, 1.7 fck_spellerpages.html, 1.4,
	1.5 fck_table.html, 1.6, 1.7 fck_tablecell.html, 1.4,
	1.5 fck_template.html, 1.6, 1.7 fck_textarea.html, 1.4,
	1.5 fck_textfield.html, 1.4, 1.5
Message-ID: <20080505003528.2E2B610FE1C@qs1489.pair.com>

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

Modified 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:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_table.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_table.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_table.html	9 Feb 2008 12:53:57 -0000	1.6
--- fck_table.html	5 May 2008 00:35:24 -0000	1.7
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,34 ****
  	<script type="text/javascript">
  
! var oEditor = window.parent.InnerDialogLoaded() ;
  
  // Gets the document DOM
--- 30,36 ----
  	<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
! var dialogArguments = dialog.Args() ;
  
  // Gets the document DOM
***************
*** 37,41 ****
  // 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' ) )
--- 39,43 ----
  // Gets the table if there is one selected.
  var table ;
! var e = dialog.Selection.GetSelectedElement() ;
  
  if ( ( !e && document.location.search.substr(1) == 'Parent' ) || ( e && e.tagName != 'TABLE' ) )
***************
*** 89,96 ****
  		document.getElementById('txtRows').disabled    = true ;
  		document.getElementById('txtColumns').disabled = true ;
  	}
  
! 	window.parent.SetOkButton( true ) ;
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 91,101 ----
  		document.getElementById('txtRows').disabled    = true ;
  		document.getElementById('txtColumns').disabled = true ;
+ 		SelectField( 'txtWidth' ) ;
  	}
+ 	else
+ 		SelectField( 'txtRows' ) ;
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
  }
  

Index: fck_template.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_template.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_template.html	9 Feb 2008 12:53:57 -0000	1.6
--- fck_template.html	5 May 2008 00:35:24 -0000	1.7
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fck_radiobutton.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_radiobutton.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_radiobutton.html	9 Feb 2008 12:53:57 -0000	1.5
--- fck_radiobutton.html	5 May 2008 00:35:24 -0000	1.6
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,39 ****
  		<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()
--- 30,40 ----
  		<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
  
  // Gets the document DOM
  var oDOM = oEditor.FCK.EditorDocument ;
  
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
  
  window.onload = function()
***************
*** 51,56 ****
  		oActiveEl = null ;
  
! 	window.parent.SetOkButton( true ) ;
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 52,58 ----
  		oActiveEl = null ;
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
! 	SelectField( 'txtName' ) ;
  }
  
***************
*** 58,71 ****
  {
  	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 )
--- 60,65 ----
  {
  	oEditor.FCKUndo.SaveUndoStep() ;
  
! 	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: 'radio' } ) ;
  
  	if ( oEditor.FCKBrowserInfo.IsIE )

Index: fck_hiddenfield.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_hiddenfield.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_hiddenfield.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_hiddenfield.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,34 ****
  	<script type="text/javascript">
  
! var oEditor = window.parent.InnerDialogLoaded() ;
  var FCK = oEditor.FCK ;
  
--- 30,36 ----
  	<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
! 
  var FCK = oEditor.FCK ;
  
***************
*** 37,41 ****
  
  // Get the selected flash embed (if available).
! var oFakeImage = FCK.Selection.GetSelectedElement() ;
  var oActiveEl ;
  
--- 39,43 ----
  
  // Get the selected flash embed (if available).
! var oFakeImage = dialog.Selection.GetSelectedElement() ;
  var oActiveEl ;
  
***************
*** 59,64 ****
  	}
  
! 	window.parent.SetOkButton( true ) ;
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 61,67 ----
  	}
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
! 	SelectField( 'txtName' ) ;
  }
  
***************
*** 67,80 ****
  {
  	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 ) ;
  
--- 70,76 ----
  {
  	oEditor.FCKUndo.SaveUndoStep() ;
  
! 	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: 'hidden' } ) ;
  
  	SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
  
***************
*** 83,92 ****
  		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 ;
--- 79,88 ----
  		oFakeImage	= oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__InputHidden', oActiveEl ) ;
  		oFakeImage.setAttribute( '_fckinputhidden', 'true', 0 ) ;
! 
! 		oActiveEl.parentNode.insertBefore( oFakeImage, oActiveEl ) ;
! 		oActiveEl.parentNode.removeChild( oActiveEl ) ;
  	}
  	else
  		oEditor.FCKUndo.SaveUndoStep() ;
  
  	return true ;

Index: fck_link.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_link.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_link.html	9 Feb 2008 12:53:57 -0000	1.6
--- fck_link.html	5 May 2008 00:35:24 -0000	1.7
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fck_button.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_button.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_button.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_button.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,39 ****
  	<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()
--- 30,40 ----
  	<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor	= dialog.InnerDialogLoaded() ;
  
  // Gets the document DOM
  var oDOM = oEditor.FCK.EditorDocument ;
  
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
  
  window.onload = function()
***************
*** 47,58 ****
  		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 ) ;
  }
  
--- 48,58 ----
  		GetE('txtValue').value	= oActiveEl.value ;
  		GetE('txtType').value	= oActiveEl.type ;
  	}
  	else
  		oActiveEl = null ;
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
! 	SelectField( 'txtName' ) ;
  }
  
***************
*** 60,72 ****
  {
  	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 ) ;
  
--- 60,66 ----
  {
  	oEditor.FCKUndo.SaveUndoStep() ;
  
! 	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: GetE('txtType').value } ) ;
! 
  	SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ;
  

Index: fck_listprop.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_listprop.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_listprop.html	9 Feb 2008 12:53:57 -0000	1.5
--- fck_listprop.html	5 May 2008 00:35:24 -0000	1.6
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,34 ****
  	<script type="text/javascript">
  
! var oEditor = window.parent.InnerDialogLoaded() ;
  
  // Gets the document DOM
--- 30,35 ----
  	<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
  
  // Gets the document DOM
***************
*** 36,40 ****
  var sListType = ( location.search == '?OL' ? 'OL' : 'UL' ) ;
  
! var oActiveEl = oEditor.FCKSelection.MoveToAncestorNode( sListType ) ;
  var oActiveSel ;
  
--- 37,41 ----
  var sListType = ( location.search == '?OL' ? 'OL' : 'UL' ) ;
  
! var oActiveEl = dialog.Selection.GetSelection().MoveToAncestorNode( sListType ) ;
  var oActiveSel ;
  
***************
*** 64,69 ****
  	}
  
! 	window.parent.SetOkButton( true ) ;
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 65,72 ----
  	}
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
! 
! 	SelectField( 'txtStartPosition' ) ;
  }
  

Index: fck_about.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_about.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_about.html	9 Feb 2008 12:53:57 -0000	1.6
--- fck_about.html	5 May 2008 00:35:24 -0000	1.7
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 71,75 ****
  		<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">
--- 71,75 ----
  		<table cellpadding="0" cellspacing="0" border="0" width="100%" style="height: 100%">
  			<tr>
! 				<td colspan="2">
  					<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">
***************
*** 79,84 ****
  								<span fcklang="DlgAboutVersion">version</span>
  								<br />
! 								<b>2.5.1</b><br />
! 								Build 17566</td>
  						</tr>
  					</table>
--- 79,84 ----
  								<span fcklang="DlgAboutVersion">version</span>
  								<br />
! 								<b>2.6</b><br />
! 								Build 18638</td>
  						</tr>
  					</table>
***************
*** 86,107 ****
  			</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>
--- 86,113 ----
  			</tr>
  			<tr style="height: 100%">
! 				<td align="center" valign="middle">
  					<span style="font-size: 14px" dir="ltr">
  						<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>
! 					<div style="padding-top:15px">
! 						<img alt="" src="fck_about/logo_fredck.gif" width="87" height="36" />
! 					</div>
! 				</td>
! 				<td align="center" nowrap="nowrap" valign="middle">
! 					<div>
! 						<div style="margin-bottom:5px" dir="ltr">Selected Sponsor</div>
! 						<a href="http://www.spellchecker.net/fckeditor/" target="_blank"><img alt="Selected Sponsor" border="0" src="fck_about/sponsors/spellchecker_net.gif" width="75" height="75" /></a>
! 					</div>
! 				</td>
! 			</tr>
! 			<tr>
! 				<td width="100%" nowrap="nowrap">
  					<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-2008 <a href="#" onclick="SendEMail();">Frederico Caldeira Knabben</a>
  				</td>
  				<td align="center">
! 					<a href="http://www.fckeditor.net/sponsors/apply" target="_blank">Become a Sponsor</a>
  				</td>
  			</tr>

Index: fck_image.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** fck_image.html	9 Feb 2008 12:53:57 -0000	1.7
--- fck_image.html	5 May 2008 00:35:24 -0000	1.8
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 29,33 ****
  	<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">
--- 29,37 ----
  	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
  	<script src="fck_image/fck_image.js" type="text/javascript"></script>
! 		<script type="text/javascript">
! 
! document.write( FCKTools.GetStyleHtml( GetCommonDialogCss() ) ) ;
! 
! 		</script>
  </head>
  <body scroll="no" style="overflow: hidden">
***************
*** 161,165 ****
  			<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>
--- 165,171 ----
  			<br />
  			<input id="btnUpload" type="submit" value="Send it to the Server" fcklang="DlgLnkBtnUpload" />
! 			<script type="text/javascript">
! 				document.write( '<iframe name="UploadWindow" style="display: none" src="' + FCKTools.GetVoidUrl() + '"></iframe>' ) ;
! 			</script>
  		</form>
  	</div>

Index: fck_smiley.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_smiley.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_smiley.html	9 Feb 2008 12:53:57 -0000	1.5
--- fck_smiley.html	5 May 2008 00:35:24 -0000	1.6
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 34,40 ****
  		}
  	</style>
  	<script type="text/javascript">
  
! var oEditor = window.parent.InnerDialogLoaded() ;
  
  window.onload = function ()
--- 34,42 ----
  		}
  	</style>
+ 	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
  	<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
  
  window.onload = function ()
***************
*** 43,47 ****
  	oEditor.FCKLanguageManager.TranslatePage(document) ;
  
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 45,49 ----
  	oEditor.FCKLanguageManager.TranslatePage(document) ;
  
! 	dialog.SetAutoSize( true ) ;
  }
  
***************
*** 49,52 ****
--- 51,55 ----
  {
  	oEditor.FCKUndo.SaveUndoStep() ;
+ 
  	var oImg = oEditor.FCK.InsertElement( 'img' ) ;
  	oImg.src = url ;
***************
*** 58,62 ****
  	document.body.innerHTML = '' ;
  
! 	window.parent.Cancel() ;
  }
  
--- 61,65 ----
  	document.body.innerHTML = '' ;
  
! 	dialog.Cancel() ;
  }
  

Index: fck_checkbox.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_checkbox.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_checkbox.html	9 Feb 2008 12:53:57 -0000	1.5
--- fck_checkbox.html	5 May 2008 00:35:24 -0000	1.6
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,39 ****
  		<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()
--- 30,40 ----
  		<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor	= dialog.InnerDialogLoaded() ;
  
  // Gets the document DOM
  var oDOM = oEditor.FCK.EditorDocument ;
  
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
  
  window.onload = function()
***************
*** 51,56 ****
  		oActiveEl = null ;
  
! 	window.parent.SetOkButton( true ) ;
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 52,58 ----
  		oActiveEl = null ;
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
! 	SelectField( 'txtName' ) ;
  }
  
***************
*** 58,71 ****
  {
  	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 )
--- 60,65 ----
  {
  	oEditor.FCKUndo.SaveUndoStep() ;
  
! 	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: 'checkbox' } ) ;
  
  	if ( oEditor.FCKBrowserInfo.IsIE )

Index: fck_tablecell.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_tablecell.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_tablecell.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_tablecell.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,34 ****
  	<script type="text/javascript">
  
! var oEditor = window.parent.InnerDialogLoaded() ;
  
  // Gets the document DOM
--- 30,35 ----
  	<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
  
  // Gets the document DOM
***************
*** 45,50 ****
  	SetStartupValue() ;
  
! 	window.parent.SetOkButton( true ) ;
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 46,52 ----
  	SetStartupValue() ;
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
! 	SelectField( 'txtWidth' ) ;
  }
  
***************
*** 88,92 ****
  
  		if ( GetE('selWordWrap').value == 'false' )
! 			SetAttribute( aCells[i], 'noWrap', 'nowrap' ) ;  
  		else
  			aCells[i].removeAttribute( 'noWrap' ) ;
--- 90,94 ----
  
  		if ( GetE('selWordWrap').value == 'false' )
! 			SetAttribute( aCells[i], 'noWrap', 'nowrap' ) ;
  		else
  			aCells[i].removeAttribute( 'noWrap' ) ;
***************
*** 119,123 ****
  function SelectColor( wich )
  {
! 	oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', oEditor.FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 400, 330, wich == 'Back' ? SelectBackColor : SelectBorderColor, window ) ;
  }
  
--- 121,125 ----
  function SelectColor( wich )
  {
! 	oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', oEditor.FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, wich == 'Back' ? SelectBackColor : SelectBorderColor, window ) ;
  }
  

Index: fck_replace.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_replace.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_replace.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_replace.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,38 ****
  	<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 = {} ;
  
--- 30,41 ----
  	<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
! var dialogArguments = dialog.Args() ;
! 
  var FCKLang = oEditor.FCKLang ;
  
! dialog.AddTab( 'Find', FCKLang.DlgFindTitle ) ;
! dialog.AddTab( 'Replace', FCKLang.DlgReplaceTitle ) ;
  var idMap = {} ;
  
***************
*** 46,50 ****
  
  	if ( tabCode == 'Replace' )
! 		window.parent.SetAutoSize( true ) ;
  }
  
--- 49,85 ----
  
  	if ( tabCode == 'Replace' )
! 		dialog.SetAutoSize( true ) ;
! }
! 
! // Place a range at the start of document.
! // This will be the starting point of our search.
! var GlobalRange = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
! 
! function ResetGlobalRange()
! {
! 	GlobalRange.SetStart( oEditor.FCK.EditorDocument.body, 1 ) ;
! 	GlobalRange.SetEnd( oEditor.FCK.EditorDocument.body, 1 ) ;
! 	GlobalRange.Collapse( true ) ;
! }
! ResetGlobalRange() ;
! 
! var HighlightRange = null ;
! function Highlight()
! {
! 	if ( HighlightRange )
! 		ClearHighlight() ;
! 	var cloneRange = GlobalRange.Clone() ;
! 	oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).ApplyToRange( cloneRange, false, true ) ;
! 	HighlightRange = cloneRange ;
! 	GlobalRange = HighlightRange.Clone() ;
! }
! 
! function ClearHighlight()
! {
! 	if ( HighlightRange )
! 	{
! 		oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).RemoveFromRange( HighlightRange, false, true ) ;
! 		HighlightRange = null ;
! 	}
  }
  
***************
*** 54,109 ****
  	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 ) ;
  }
  
--- 89,135 ----
  	oEditor.FCKLanguageManager.TranslatePage( document ) ;
  
  	// Show the appropriate tab at startup.
! 	if ( dialogArguments.CustomValue == 'Find' )
  	{
! 		dialog.SetSelectedTab( 'Find' ) ;
! 		dialog.SetAutoSize( true ) ;
  	}
  	else
! 		dialog.SetSelectedTab( 'Replace' ) ;
  
+ 	SelectField( 'txtFind' + dialogArguments.CustomValue ) ;
  }
  
! function btnStat()
  {
! 	GetE('btnReplace').disabled =
! 		GetE('btnReplaceAll').disabled =
! 			GetE('btnFind').disabled =
! 				( GetE(idMap["FindText"]).value.length == 0 ) ;
  }
  
! function btnStatDelayed()
  {
! 	setTimeout( btnStat, 1 ) ;
  }
  
  function GetSearchString()
  {
! 	return GetE(idMap['FindText']).value ;
  }
  
  function GetReplaceString()
  {
! 	return GetE("txtReplace").value ;
  }
  
  function GetCheckCase()
  {
! 	return !! ( GetE(idMap['CheckCase']).checked ) ;
  }
  
  function GetMatchWord()
  {
! 	return !! ( GetE(idMap['CheckWord']).checked ) ;
  }
  
***************
*** 242,246 ****
  					return KMP_MATCHED;
  				}
! 				return KMP_ADVANCED;
  			}
  			else if ( this._State == 0 )
--- 268,272 ----
  					return KMP_MATCHED;
  				}
! 				return KMP_ADVANCED ;
  			}
  			else if ( this._State == 0 )
***************
*** 262,268 ****
  	// 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.
--- 288,295 ----
  	// Start from the end of the current selection.
  	var matcher = new KmpMatch( GetSearchString(), ! GetCheckCase() ) ;
! 	var cursor = GlobalRange.CreateBookmark2().End ;
  	var matchState = KMP_NOMATCH ;
  	var matchBookmark = null ;
+ 	var matchBookmarkStart = [] ;
  
  	// Match finding.
***************
*** 279,283 ****
  				{
  					matcher.Reset();
! 					matchBookmark = null ;
  				}
  			}
--- 306,310 ----
  				{
  					matcher.Reset();
! 					matchBookmarkStart = [] ;
  				}
  			}
***************
*** 286,301 ****
  				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() )
  					{
--- 313,340 ----
  				matchState = matcher.FeedCharacter(data) ;
  
+ 				// No possible match of any useful substring in the pattern for the currently scanned character.
+ 				// So delete any positional information.
  				if ( matchState == KMP_NOMATCH )
! 					matchBookmarkStart = [] ;
! 				// We've matched something, but it's not a complete match, so let's just mark down the position for backtracking later.
! 				else if ( matchState == KMP_ADVANCED )
! 				{
! 					matchBookmarkStart.push( cursor.concat( [] ) ) ;
! 					if ( matchBookmarkStart.length > matcher._State )
! 						matchBookmarkStart.shift() ;
! 				}
! 				// Found a complete match! Mark down the ending position as well.
  				else if ( matchState == KMP_MATCHED )
  				{
! 					// It is possible to get a KMP_MATCHED without KMP_ADVANCED when the match pattern is only 1 character.
! 					// So need to check and mark down the starting position as well.
! 					if ( matchBookmarkStart.length == 0 )
! 						matchBookmarkStart = [cursor.concat( [] )] ;
! 
! 					matchBookmark = { 'Start' : matchBookmarkStart.shift(), 'End' : cursor.concat( [] ) } ;
  					matchBookmark.End[ matchBookmark.End.length - 1 ]++;
  
  					// Wait, do we have to match a whole word?
+ 					// If yes, carry out additional checks on what we've got.
  					if ( GetMatchWord() )
  					{
***************
*** 342,352 ****
  	}
  
! 	// 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 ;
--- 381,390 ----
  	}
  
! 	// If we've found a match, highlight the match.
  	if ( matchState == KMP_MATCHED )
  	{
! 		GlobalRange.MoveToBookmark2( matchBookmark ) ;
! 		Highlight() ;
! 		var focus = GlobalRange._Range.endContainer ;
  		while ( focus && focus.nodeType != 1 )
  			focus = focus.parentNode ;
***************
*** 360,397 ****
  		}
  
! 		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() ;
  	}
  }
--- 398,435 ----
  		}
  
! 		return true ;
  	}
  	else
! 	{
! 		ResetGlobalRange() ;
! 		return false ;
! 	}
  }
  
  function Find()
  {
  	if ( ! _Find() )
+ 	{
+ 		ClearHighlight() ;
  		alert( FCKLang.DlgFindNotFoundMsg ) ;
+ 	}
  }
  
  function Replace()
  {
! 	if ( GlobalRange.CheckIsCollapsed() )
  	{
  		if (! _Find() )
+ 		{
+ 			ClearHighlight() ;
  			alert( FCKLang.DlgFindNotFoundMsg ) ;
+ 		}
  	}
  	else
  	{
  		oEditor.FCKUndo.SaveUndoStep() ;
! 		GlobalRange.DeleteContents() ;
! 		GlobalRange.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
! 		GlobalRange.Collapse( false ) ;
  	}
  }
***************
*** 400,420 ****
  {
  	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>
--- 438,460 ----
  {
  	oEditor.FCKUndo.SaveUndoStep() ;
  	var replaceCount = 0 ;
  
  	while ( _Find() )
  	{
! 		dialog.Selection.EnsureSelection() ;
! 		GlobalRange.DeleteContents() ;
! 		GlobalRange.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
! 		GlobalRange.Collapse( false ) ;
  		replaceCount++ ;
  	}
  	if ( replaceCount == 0 )
+ 	{
+ 		ClearHighlight() ;
  		alert( FCKLang.DlgFindNotFoundMsg ) ;
! 	}
! 	dialog.Cancel() ;
  }
+ 
+ window.onunload = function(){ ClearHighlight() ; }
  	</script>
  </head>
***************
*** 428,432 ****
  				</td>
  				<td width="100%">
! 					<input id="txtFindFind" onkeyup="btnStat(this.form)" style="width: 100%" tabindex="1"
  						type="text" />
  				</td>
--- 468,472 ----
  				</td>
  				<td width="100%">
! 					<input id="txtFindFind" onkeyup="btnStat()" oninput="btnStat()" onpaste="btnStatDelayed()" style="width: 100%" tabindex="1"
  						type="text" />
  				</td>
***************
*** 455,459 ****
  				</td>
  				<td width="100%">
! 					<input id="txtFindReplace" onkeyup="btnStat(this.form)" style="width: 100%" tabindex="1"
  						type="text" />
  				</td>
--- 495,499 ----
  				</td>
  				<td width="100%">
! 					<input id="txtFindReplace" onkeyup="btnStat()" oninput="btnStat()" onpaste="btnStatDelayed()" style="width: 100%" tabindex="1"
  						type="text" />
  				</td>

Index: fck_colorselector.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_colorselector.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_colorselector.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_colorselector.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 35,38 ****
--- 35,39 ----
  			.ColorCell		{ height: 15px ; width: 15px ; }
  		</style>
+ 		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
  		<script type="text/javascript">
  
***************
*** 136,141 ****
  function Ok()
  {
! 	if ( typeof(window.parent.dialogArguments.CustomValue) == 'function' )
! 		window.parent.dialogArguments.CustomValue( document.getElementById('selcolor').value ) ;
  
  	return true ;
--- 137,142 ----
  function Ok()
  {
! 	if ( typeof(window.parent.Args().CustomValue) == 'function' )
! 		window.parent.Args().CustomValue( document.getElementById('selcolor').value ) ;
  
  	return true ;

Index: fck_textfield.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_textfield.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_textfield.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_textfield.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,39 ****
  	<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()
--- 30,40 ----
  	<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
  
  // Gets the document DOM
  var oDOM = oEditor.FCK.EditorDocument ;
  
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
  
  window.onload = function()
***************
*** 49,60 ****
  		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 ) ;
  }
  
--- 50,60 ----
  		GetE('txtMax').value	= GetAttribute( oActiveEl, 'maxLength' ) ;
  		GetE('txtType').value	= oActiveEl.type ;
  	}
  	else
  		oActiveEl = null ;
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
! 	SelectField( 'txtName' ) ;
  }
  
***************
*** 74,86 ****
  	}
  
! 	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 ) ;
--- 74,81 ----
  	}
  
! 	oEditor.FCKUndo.SaveUndoStep() ;
! 
! 	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: GetE('txtType').value } ) ;
  
  	SetAttribute( oActiveEl, 'value'	, GetE('txtValue').value ) ;
  	SetAttribute( oActiveEl, 'size'		, GetE('txtSize').value ) ;

Index: fck_spellerpages.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_spellerpages.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_spellerpages.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 27,30 ****
--- 27,31 ----
  		<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_spellerpages/spellerpages/spellChecker.js"></script>
  		<script type="text/javascript">

Index: fck_docprops.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_docprops.html	9 Feb 2008 12:53:57 -0000	1.5
--- fck_docprops.html	5 May 2008 00:35:24 -0000	1.6
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 375,383 ****
  	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 ;
  	}
  }
--- 375,383 ----
  	switch ( wich )
  	{
! 		case 'Back'			: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectBackColor, window ) ; return ;
! 		case 'ColorText'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorText, window ) ; return ;
! 		case 'ColorLink'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorLink, window ) ; return ;
! 		case 'ColorVisited'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorVisited, window ) ; return ;
! 		case 'ColorActive'	: oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, SelectColorActive, window ) ; return ;
  	}
  }

Index: fck_specialchar.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_specialchar.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_specialchar.html	9 Feb 2008 12:53:57 -0000	1.6
--- fck_specialchar.html	5 May 2008 00:35:24 -0000	1.7
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 34,37 ****
--- 34,38 ----
  				.Sample { font-size: 24px; }
  		</style>
+ 		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
  		<script type="text/javascript">
  
***************
*** 82,86 ****
  					<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;","&Otil
 de;","&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 ;
--- 83,87 ----
  					<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;","&Otil
 de;","&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;","&#372;","&#374","&#373","&#375;","&sbquo;","&#8219;","&bdquo;","&hellip;","&trade;","&#9658;","&bull;","&rarr;","&rArr;","&hArr;","&diams;","&asymp;"] ;
  
  var cols = 20 ;

Index: fck_form.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_form.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_form.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_form.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,39 ****
  	<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()
--- 30,40 ----
  	<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
  
  // Gets the document DOM
  var oDOM = oEditor.FCK.EditorDocument ;
  
! var oActiveEl = dialog.Selection.GetSelection().MoveToAncestorNode( 'FORM' ) ;
  
  window.onload = function()
***************
*** 51,56 ****
  		oActiveEl = null ;
  
! 	window.parent.SetOkButton( true ) ;
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 52,58 ----
  		oActiveEl = null ;
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
! 	SelectField( 'txtName' ) ;
  }
  

Index: fck_select.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_select.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_select.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_select.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 31,40 ****
  		<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 ;
--- 31,41 ----
  		<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
  
  // Gets the document DOM
  var oDOM = oEditor.FCK.EditorDocument ;
  
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
  
  var oListText ;
***************
*** 49,52 ****
--- 50,57 ----
  	oListValue	= document.getElementById( 'cmbValue' ) ;
  
+ 	// Fix the lists widths. (Bug #970)
+ 	oListText.style.width = oListText.offsetWidth ;
+ 	oListValue.style.width = oListValue.offsetWidth ;
+ 
  	if ( oActiveEl && oActiveEl.tagName == 'SELECT' )
  	{
***************
*** 69,74 ****
  		oActiveEl = null ;
  
! 	window.parent.SetOkButton( true ) ;
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 74,80 ----
  		oActiveEl = null ;
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
! 	SelectField( 'txtName' ) ;
  }
  
***************
*** 76,90 ****
  {
  	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 ) ;
--- 82,92 ----
  {
  	oEditor.FCKUndo.SaveUndoStep() ;
! 
  	var sSize = GetE('txtLines').value ;
  	if ( sSize == null || isNaN( sSize ) || sSize <= 1 )
  		sSize = '' ;
  
! 	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'SELECT', {name: GetE('txtName').value} ) ;
  
  	SetAttribute( oActiveEl, 'size'	, sSize ) ;
  	oActiveEl.multiple = ( sSize.length > 0 && GetE('chkMultiple').checked ) ;

Index: fck_textarea.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_textarea.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_textarea.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_textarea.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,39 ****
  		<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()
--- 30,40 ----
  		<script type="text/javascript">
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
  
  // Gets the document DOM
  var oDOM = oEditor.FCK.EditorDocument ;
  
! var oActiveEl = dialog.Selection.GetSelectedElement() ;
  
  window.onload = function()
***************
*** 51,56 ****
  		oActiveEl = null ;
  
! 	window.parent.SetOkButton( true ) ;
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 52,58 ----
  		oActiveEl = null ;
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
! 	SelectField( 'txtName' ) ;
  }
  
***************
*** 58,68 ****
  {
  	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 ) ;
--- 60,66 ----
  {
  	oEditor.FCKUndo.SaveUndoStep() ;
  
! 	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'TEXTAREA', {name: GetE('txtName').value} ) ;
! 
  	SetAttribute( oActiveEl, 'cols', GetE('txtCols').value ) ;
  	SetAttribute( oActiveEl, 'rows', GetE('txtRows').value ) ;

Index: fck_flash.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_flash.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_flash.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 29,33 ****
  		<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">
--- 29,37 ----
  		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
  		<script src="fck_flash/fck_flash.js" type="text/javascript"></script>
! 		<script type="text/javascript">
! 
! document.write( FCKTools.GetStyleHtml( GetCommonDialogCss() ) ) ;
! 
! 		</script>
  	</head>
  	<body scroll="no" style="OVERFLOW: hidden">
***************
*** 93,97 ****
  				<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>
--- 97,103 ----
  				<br />
  				<input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" />
! 				<script type="text/javascript">
! 					document.write( '<iframe name="UploadWindow" style="DISPLAY: none" src="' + FCKTools.GetVoidUrl() + '"></iframe>' ) ;
! 				</script>
  			</form>
  		</div>

Index: fck_source.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_source.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_source.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_source.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 27,31 ****
  		<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">
  
--- 27,31 ----
  		<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 language="javascript">
  
***************
*** 33,36 ****
--- 33,39 ----
  var FCK			= oEditor.FCK ;
  var FCKConfig	= oEditor.FCKConfig ;
+ var FCKTools	= oEditor.FCKTools ;
+ 
+ document.write( FCKTools.GetStyleHtml( GetCommonDialogCss() ) ) ;
  
  window.onload = function()

Index: fck_paste.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_paste.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_paste.html	9 Feb 2008 12:53:57 -0000	1.5
--- fck_paste.html	5 May 2008 00:35:24 -0000	1.6
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 29,38 ****
  	<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 ()
--- 29,40 ----
  	<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 dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
  var FCK = oEditor.FCK;
  var FCKTools	= oEditor.FCKTools ;
  var FCKConfig	= oEditor.FCKConfig ;
+ var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
  
  window.onload = function ()
***************
*** 41,45 ****
  	oEditor.FCKLanguageManager.TranslatePage(document) ;
  
! 	var sPastingType = window.parent.dialogArguments.CustomValue ;
  
  	if ( sPastingType == 'Word' || sPastingType == 'Security' )
--- 43,47 ----
  	oEditor.FCKLanguageManager.TranslatePage(document) ;
  
! 	var sPastingType = dialog.Args().CustomValue ;
  
  	if ( sPastingType == 'Word' || sPastingType == 'Security' )
***************
*** 48,67 ****
  			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
--- 50,87 ----
  			document.getElementById( 'xSecurityMsg' ).style.display = '' ;
  
! 		// For document.domain compatibility (#123) we must do all the magic in
! 		// the URL for IE.
! 		var sFrameUrl = !oEditor.FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE ?
! 			'javascript:void(0)' :
! 			'javascript:void( (function(){' +
! 				'document.open() ;' +
! 				'document.domain=\'' + document.domain + '\' ;' +
! 				'document.write(\'<html><head><script>window.onerror = function() { return true ; };<\/script><\/head><body><\/body><\/html>\') ;' +
! 				'document.close() ;' +
! 				'document.body.contentEditable = true ;' +
! 				'window.focus() ;' +
! 				'})() )' ;
  
! 		var eFrameSpace = document.getElementById( 'xFrameSpace' ) ;
! 		eFrameSpace.innerHTML = '<iframe id="frmData" src="' + sFrameUrl + '" ' +
! 					'height="98%" width="99%" frameborder="0" style="border: #000000 1px; background-color: #ffffff"></iframe>' ;
  
! 		var oFrame = eFrameSpace.firstChild ;
! 
! 		if ( !oEditor.FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE )
! 		{
! 			// 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 ( FCKBrowserInfo.IsIE )
! 				oDoc.body.contentEditable = true ;
! 			else
! 				oDoc.designMode = 'on' ;
! 
! 			oFrame.contentWindow.focus();
! 		}
  	}
  	else
***************
*** 73,78 ****
  		document.getElementById('oWordCommands').style.display = 'none' ;
  
! 	window.parent.SetOkButton( true ) ;
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 93,98 ----
  		document.getElementById('oWordCommands').style.display = 'none' ;
  
! 	dialog.SetOkButton( true ) ;
! 	dialog.SetAutoSize( true ) ;
  }
  
***************
*** 84,88 ****
  	var sHtml ;
  
! 	var sPastingType = window.parent.dialogArguments.CustomValue ;
  
  	if ( sPastingType == 'Word' || sPastingType == 'Security' )
--- 104,108 ----
  	var sHtml ;
  
! 	var sPastingType = dialog.Args().CustomValue ;
  
  	if ( sPastingType == 'Word' || sPastingType == 'Security' )
***************
*** 120,123 ****
--- 140,144 ----
  		var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
  		var oDoc = oEditor.FCK.EditorDocument ;
+ 		dialog.Selection.EnsureSelection() ;
  		range.MoveToSelection() ;
  		range.DeleteContents() ;
***************
*** 158,172 ****
  }
  
- 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
--- 179,182 ----
***************
*** 307,337 ****
  		</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>
--- 317,336 ----
  		</tr>
  		<tr>
! 			<td id="xFrameSpace" valign="top" height="100%" style="border: #000000 1px solid">
  				<textarea id="txtData" cols="80" rows="5" style="border: #000000 1px; display: none;
  					width: 99%; height: 98%"></textarea>
  			</td>
  		</tr>
  		<tr id="oWordCommands">
  			<td>
! 
! 					<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>
  		</tr>

Index: fck_anchor.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_anchor.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_anchor.html	9 Feb 2008 12:53:57 -0000	1.6
--- fck_anchor.html	5 May 2008 00:35:24 -0000	1.7
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,43 ****
  		<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 ;
  
--- 30,45 ----
  		<script type="text/javascript">
  
! var dialog			= window.parent ;
! var oEditor			= dialog.InnerDialogLoaded() ;
  
! var FCK				= oEditor.FCK ;
! var FCKBrowserInfo	= oEditor.FCKBrowserInfo ;
! var FCKTools		= oEditor.FCKTools ;
! var FCKRegexLib		= oEditor.FCKRegexLib ;
! 
! var oDOM			= FCK.EditorDocument ;
! 
! var oFakeImage = dialog.Selection.GetSelectedElement() ;
  
  var oAnchor ;
  
***************
*** 70,73 ****
--- 72,77 ----
  	window.parent.SetOkButton( true ) ;
  	window.parent.SetAutoSize( true ) ;
+ 
+ 	SelectField( 'txtName' ) ;
  }
  



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash
	fck_flash.js, 1.4, 1.5 fck_flash_preview.html, 1.3, 1.4
Message-ID: <20080505003528.53B1A10FE1E@qs1489.pair.com>

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

Modified Files:
	fck_flash.js fck_flash_preview.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_flash_preview.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fck_flash_preview.html	9 Feb 2008 12:53:57 -0000	1.3
--- fck_flash_preview.html	5 May 2008 00:35:24 -0000	1.4
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 27,35 ****
  		<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 )
--- 27,39 ----
  		<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 language="javascript">
  
+ var FCKTools	= window.parent.FCKTools ;
+ var FCKConfig	= window.parent.FCKConfig ;
+ 
  // Sets the Skin CSS
! document.write( FCKTools.GetStyleHtml( FCKConfig.SkinDialogCSS ) ) ;
! document.write( FCKTools.GetStyleHtml( GetCommonDialogCss( '../' ) ) ) ;
  
  if ( window.parent.FCKConfig.BaseHref.length > 0 )

Index: fck_flash.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_flash/fck_flash.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_flash.js	9 Feb 2008 12:53:57 -0000	1.4
--- fck_flash.js	5 May 2008 00:35:24 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 22,40 ****
   */
  
! 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( 'Info', oEditor.FCKLang.DlgInfoTab ) ;
  
  if ( FCKConfig.FlashUpload )
! 	window.parent.AddTab( 'Upload', FCKLang.DlgLnkUpload ) ;
  
  if ( !FCKConfig.FlashDlgHideAdvanced )
! 	window.parent.AddTab( 'Advanced', oEditor.FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
--- 22,42 ----
   */
  
! var dialog		= window.parent ;
! var oEditor		= dialog.InnerDialogLoaded() ;
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
  var FCKConfig	= oEditor.FCKConfig ;
+ var FCKTools	= oEditor.FCKTools ;
  
  //#### Dialog Tabs
  
  // Set the dialog tabs.
! dialog.AddTab( 'Info', oEditor.FCKLang.DlgInfoTab ) ;
  
  if ( FCKConfig.FlashUpload )
! 	dialog.AddTab( 'Upload', FCKLang.DlgLnkUpload ) ;
  
  if ( !FCKConfig.FlashDlgHideAdvanced )
! 	dialog.AddTab( 'Advanced', oEditor.FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
***************
*** 47,51 ****
  
  // Get the selected flash embed (if available).
! var oFakeImage = FCK.Selection.GetSelectedElement() ;
  var oEmbed ;
  
--- 49,53 ----
  
  // Get the selected flash embed (if available).
! var oFakeImage = dialog.Selection.GetSelectedElement() ;
  var oEmbed ;
  
***************
*** 73,80 ****
  		GetE('frmUpload').action = FCKConfig.FlashUploadURL ;
  
! 	window.parent.SetAutoSize( true ) ;
  
  	// Activate the "OK" button.
! 	window.parent.SetOkButton( true ) ;
  }
  
--- 75,84 ----
  		GetE('frmUpload').action = FCKConfig.FlashUploadURL ;
  
! 	dialog.SetAutoSize( true ) ;
  
  	// Activate the "OK" button.
! 	dialog.SetOkButton( true ) ;
! 
! 	SelectField( 'txtUrl' ) ;
  }
  
***************
*** 115,119 ****
  	if ( GetE('txtUrl').value.length == 0 )
  	{
! 		window.parent.SetSelectedTab( 'Info' ) ;
  		GetE('txtUrl').focus() ;
  
--- 119,123 ----
  	if ( GetE('txtUrl').value.length == 0 )
  	{
! 		dialog.SetSelectedTab( 'Info' ) ;
  		GetE('txtUrl').focus() ;
  
***************
*** 138,142 ****
  	}
  
! 	oEditor.FCKFlashProcessor.RefreshView( oFakeImage, oEmbed ) ;
  
  	return true ;
--- 142,146 ----
  	}
  
! 	oEditor.FCKEmbedAndObjectProcessor.RefreshView( oFakeImage, oEmbed ) ;
  
  	return true ;
***************
*** 228,232 ****
  	UpdatePreview() ;
  
! 	window.parent.SetSelectedTab( 'Info' ) ;
  }
  
--- 232,236 ----
  	UpdatePreview() ;
  
! 	dialog.SetSelectedTab( 'Info' ) ;
  }
  
***************
*** 253,256 ****
--- 257,263 ----
  			alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ;
  			return ;
+ 		case 500 :
+ 			alert( 'The connector is disabled' ) ;
+ 			break ;
  		default :
  			alert( 'Error on file upload. Error number: ' + errorNumber ) ;



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_link
	fck_link.js, 1.6, 1.7
Message-ID: <20080505003528.5D60110FE20@qs1489.pair.com>

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

Modified Files:
	fck_link.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_link.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_link/fck_link.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_link.js	9 Feb 2008 12:53:58 -0000	1.6
--- fck_link.js	5 May 2008 00:35:24 -0000	1.7
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 22,26 ****
   */
  
! var oEditor		= window.parent.InnerDialogLoaded() ;
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
--- 22,28 ----
   */
  
! var dialog	= window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
! 
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
***************
*** 32,45 ****
  
  // Set the dialog tabs.
! window.parent.AddTab( 'Info', FCKLang.DlgLnkInfoTab ) ;
  
  if ( !FCKConfig.LinkDlgHideTarget )
! 	window.parent.AddTab( 'Target', FCKLang.DlgLnkTargetTab, true ) ;
  
  if ( FCKConfig.LinkUpload )
! 	window.parent.AddTab( 'Upload', FCKLang.DlgLnkUpload, true ) ;
  
  if ( !FCKConfig.LinkDlgHideAdvanced )
! 	window.parent.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
--- 34,47 ----
  
  // Set the dialog tabs.
! dialog.AddTab( 'Info', FCKLang.DlgLnkInfoTab ) ;
  
  if ( !FCKConfig.LinkDlgHideTarget )
! 	dialog.AddTab( 'Target', FCKLang.DlgLnkTargetTab, true ) ;
  
  if ( FCKConfig.LinkUpload )
! 	dialog.AddTab( 'Upload', FCKLang.DlgLnkUpload, true ) ;
  
  if ( !FCKConfig.LinkDlgHideAdvanced )
! 	dialog.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
***************
*** 51,55 ****
  	ShowE('divAttribs'	, ( tabCode == 'Advanced' ) ) ;
  
! 	window.parent.SetAutoSize( true ) ;
  }
  
--- 53,57 ----
  	ShowE('divAttribs'	, ( tabCode == 'Advanced' ) ) ;
  
! 	dialog.SetAutoSize( true ) ;
  }
  
***************
*** 125,129 ****
  
  // oLink: The actual selected link in the editor.
! var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ;
  if ( oLink )
  	FCK.Selection.SelectNode( oLink ) ;
--- 127,131 ----
  
  // oLink: The actual selected link in the editor.
! var oLink = dialog.Selection.GetSelection().MoveToAncestorNode( 'A' ) ;
  if ( oLink )
  	FCK.Selection.SelectNode( oLink ) ;
***************
*** 157,161 ****
  
  	// Activate the "OK" button.
! 	window.parent.SetOkButton( true ) ;
  }
  
--- 159,179 ----
  
  	// Activate the "OK" button.
! 	dialog.SetOkButton( true ) ;
! 
! 	// Select the first field.
! 	switch( GetE('cmbLinkType').value )
! 	{
! 		case 'url' :
! 			SelectField( 'txtUrl' ) ;
! 			break ;
! 		case 'email' :
! 			SelectField( 'txtEMailAddress' ) ;
! 			break ;
! 		case 'anchor' :
! 			if ( GetE('divSelAnchor').style.display != 'none' )
! 				SelectField( 'cmbAnchorName' ) ;
! 			else
! 				SelectField( 'cmbLinkType' ) ;
! 	}
  }
  
***************
*** 225,229 ****
  
  	// Accessible popups, the popup data is in the onclick attribute
! 	if ( !oPopupMatch ) 
  	{
  		var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
--- 243,247 ----
  
  	// Accessible popups, the popup data is in the onclick attribute
! 	if ( !oPopupMatch )
  	{
  		var onclick = oLink.getAttribute( 'onclick_fckprotectedatt' ) ;
***************
*** 232,236 ****
  			// Decode the protected string
  			onclick = decodeURIComponent( onclick ) ;
! 			
  			oPopupMatch = oRegex.OnClickPopup.exec( onclick ) ;
  			if( oPopupMatch )
--- 250,254 ----
  			// Decode the protected string
  			onclick = decodeURIComponent( onclick ) ;
! 
  			oPopupMatch = oRegex.OnClickPopup.exec( onclick ) ;
  			if( oPopupMatch )
***************
*** 339,352 ****
  
  	if ( !FCKConfig.LinkDlgHideTarget )
! 		window.parent.SetTabVisibility( 'Target'	, (linkType == 'url') ) ;
  
  	if ( FCKConfig.LinkUpload )
! 		window.parent.SetTabVisibility( 'Upload'	, (linkType == 'url') ) ;
  
  	if ( !FCKConfig.LinkDlgHideAdvanced )
! 		window.parent.SetTabVisibility( 'Advanced'	, (linkType != 'anchor' || bHasAnchors) ) ;
  
  	if ( linkType == 'email' )
! 		window.parent.SetAutoSize( true ) ;
  }
  
--- 357,370 ----
  
  	if ( !FCKConfig.LinkDlgHideTarget )
! 		dialog.SetTabVisibility( 'Target'	, (linkType == 'url') ) ;
  
  	if ( FCKConfig.LinkUpload )
! 		dialog.SetTabVisibility( 'Upload'	, (linkType == 'url') ) ;
  
  	if ( !FCKConfig.LinkDlgHideAdvanced )
! 		dialog.SetTabVisibility( 'Advanced'	, (linkType != 'anchor' || bHasAnchors) ) ;
  
  	if ( linkType == 'email' )
! 		dialog.SetAutoSize( true ) ;
  }
  
***************
*** 372,376 ****
  
  	if ( targetType == 'popup' )
! 		window.parent.SetAutoSize( true ) ;
  }
  
--- 390,394 ----
  
  	if ( targetType == 'popup' )
! 		dialog.SetAutoSize( true ) ;
  }
  
***************
*** 575,579 ****
  				// Decode the protected string
  				onclick = decodeURIComponent( onclick ) ;
! 			
  				if( oRegex.OnClickPopup.test( onclick ) )
  					SetAttribute( oLink, 'onclick_fckprotectedatt', '' ) ;
--- 593,597 ----
  				// Decode the protected string
  				onclick = decodeURIComponent( onclick ) ;
! 
  				if( oRegex.OnClickPopup.test( onclick ) )
  					SetAttribute( oLink, 'onclick_fckprotectedatt', '' ) ;
***************
*** 635,639 ****
  	document.getElementById('txtUrl').value = url ;
  	OnUrlChange() ;
! 	window.parent.SetSelectedTab( 'Info' ) ;
  }
  
--- 653,657 ----
  	document.getElementById('txtUrl').value = url ;
  	OnUrlChange() ;
! 	dialog.SetSelectedTab( 'Info' ) ;
  }
  
***************
*** 660,663 ****
--- 678,684 ----
  			alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ;
  			return ;
+ 		case 500 :
+ 			alert( 'The connector is disabled' ) ;
+ 			break ;
  		default :
  			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
***************
*** 695,699 ****
  {
  	var target = FCKConfig.DefaultLinkTarget || '' ;
! 	
  	if ( oLink || target.length == 0 )
  		return ;
--- 716,720 ----
  {
  	var target = FCKConfig.DefaultLinkTarget || '' ;
! 
  	if ( oLink || target.length == 0 )
  		return ;
***************
*** 711,715 ****
  			break ;
  	}
! 	
  	GetE('txtTargetFrame').value = target ;
  }
--- 732,736 ----
  			break ;
  	}
! 
  	GetE('txtTargetFrame').value = target ;
  }



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages
	spellChecker.js, 1.3, 1.4 spellerStyle.css, 1.3, 1.4
Message-ID: <20080505003528.883A210FE23@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-serv85146/editor/dialog/fck_spellerpages/spellerpages

Modified Files:
	spellChecker.js spellerStyle.css 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: spellChecker.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spellChecker.js	9 Feb 2008 12:53:58 -0000	1.3
--- spellChecker.js	5 May 2008 00:35:24 -0000	1.4
***************
*** 460,462 ****
  	return inputs;
  }
- 
--- 460,461 ----

Index: spellerStyle.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spellerStyle.css	9 Feb 2008 12:53:58 -0000	1.3
--- spellerStyle.css	5 May 2008 00:35:24 -0000	1.4
***************
*** 47,49 ****
  	margin-top:2;
  	font-size:8pt;
! }
\ No newline at end of file
--- 47,49 ----
  	margin-top:2;
  	font-size:8pt;
! }



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops
	fck_document_preview.html, 1.4, 1.5
Message-ID: <20080505003528.2BC2610FE1A@qs1489.pair.com>

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

Modified Files:
	fck_document_preview.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_document_preview.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_document_preview.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_document_preview.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:27 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/css
	fck_editorarea.css, 1.6, 1.7 fck_internal.css, 1.6,
	1.7 fck_showtableborders_gecko.css, 1.4, 1.5
Message-ID: <20080505003528.2CFAF10FE1B@qs1489.pair.com>

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

Modified Files:
	fck_editorarea.css fck_internal.css 
	fck_showtableborders_gecko.css 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_showtableborders_gecko.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css/fck_showtableborders_gecko.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_showtableborders_gecko.css	9 Feb 2008 12:53:57 -0000	1.4
--- fck_showtableborders_gecko.css	5 May 2008 00:35:24 -0000	1.5
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 20,23 ****
--- 20,30 ----
   *
   * This CSS Style Sheet defines the rules to show table borders on Gecko.
+  */
+ 
+ /* #########
+  *  WARNING
+  * #########
+  * When changing this file, the minified version of it must be updated in the
+  * fckeditor.html file (see FCK_ShowTableBordersCSS).
   */
  

Index: fck_editorarea.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css/fck_editorarea.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_editorarea.css	9 Feb 2008 12:53:57 -0000	1.6
--- fck_editorarea.css	5 May 2008 00:35:24 -0000	1.7
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fck_internal.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css/fck_internal.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_internal.css	9 Feb 2008 12:53:57 -0000	1.6
--- fck_internal.css	5 May 2008 00:35:24 -0000	1.7
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 22,25 ****
--- 22,32 ----
   */
  
+ /* #########
+  *  WARNING
+  * #########
+  * When changing this file, the minified version of it must be updated in the
+  * fckeditor.html file (see FCK_InternalCSS).
+  */
+ 
  /* Fix to allow putting the caret at the end of the content in Firefox if
     clicking below the content. */
***************
*** 50,53 ****
--- 57,70 ----
  }
  
+ .FCK__UnknownObject
+ {
+ 	border: #a9a9a9 1px solid;
+ 	background-position: center center;
+ 	background-image: url(images/fck_plugin.gif);
+ 	background-repeat: no-repeat;
+ 	width: 80px;
+ 	height: 80px;
+ }
+ 
  /* Empty anchors images */
  .FCK__Anchor
***************
*** 147,151 ****
  }
  
! .FCK__ShowBlocks blockquote 
  {
  	background-image: url(images/block_blockquote.png);
--- 164,168 ----
  }
  
! .FCK__ShowBlocks blockquote
  {
  	background-image: url(images/block_blockquote.png);



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp
	basexml.asp, 1.1, 1.2 class_upload.asp, 1.1, 1.2 commands.asp,
	1.1, 1.2 config.asp, 1.1, 1.2 connector.asp, 1.1, 1.2 io.asp,
	1.1, 1.2 upload.asp, 1.1, 1.2 util.asp, 1.1, 1.2
Message-ID: <20080505003528.CFBE810FE12@qs1489.pair.com>

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

Modified Files:
	basexml.asp class_upload.asp commands.asp config.asp 
	connector.asp io.asp upload.asp util.asp 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: config.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/config.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.asp	9 Feb 2008 12:53:58 -0000	1.1
--- config.asp	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
--- 1,5 ----
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
***************
*** 24,28 ****
  
  ' 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.
  Dim ConfigIsEnabled
--- 24,28 ----
  
  ' 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.
  Dim ConfigIsEnabled
***************
*** 30,34 ****
  
  ' Path to user files relative to the document root.
! ' This setting is preserved only for backward compatibility. 
  ' You should look at the settings for each resource type to get the full potential
  Dim ConfigUserFilesPath
--- 30,34 ----
  
  ' Path to user files relative to the document root.
! ' This setting is preserved only for backward compatibility.
  ' You should look at the settings for each resource type to get the full potential
  Dim ConfigUserFilesPath
***************
*** 38,42 ****
  ' following setting enabled.
  Dim ConfigForceSingleExtension
! ConfigForceSingleExtension = true 
  
  ' What the user can do with this connector
--- 38,42 ----
  ' following setting enabled.
  Dim ConfigForceSingleExtension
! ConfigForceSingleExtension = true
  
  ' What the user can do with this connector
***************
*** 55,62 ****
  '	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.
  '
--- 55,62 ----
  '	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.
  '
***************
*** 65,75 ****
  '
  '	- 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.
--- 65,75 ----
  '
  '	- 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.
***************
*** 77,88 ****
  '
  ' - 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.
--- 77,88 ----
  '
  ' - 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.

Index: class_upload.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/class_upload.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class_upload.asp	9 Feb 2008 12:53:58 -0000	1.1
--- class_upload.asp	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
--- 1,5 ----
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
***************
*** 351,353 ****
  	Dim FormName, ClientPath, Path, Name, Ext, Content, Size, MIME, Start
  End Class
! %>
\ No newline at end of file
--- 351,353 ----
  	Dim FormName, ClientPath, Path, Name, Ext, Content, Size, MIME, Start
  End Class
! %>

Index: basexml.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/basexml.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** basexml.asp	9 Feb 2008 12:53:58 -0000	1.1
--- basexml.asp	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
--- 1,5 ----
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==

Index: io.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/io.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** io.asp	9 Feb 2008 12:53:58 -0000	1.1
--- io.asp	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
--- 1,5 ----
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
***************
*** 41,52 ****
  		else
  			' Map the "UserFiles" path to a local directory.
! 			GetResourceTypeDirectory = Server.MapPath( ConfigQuickUploadPath.Item( resourceType ) ) 
  		end if
  	else
! 		if ( ConfigFileTypesAbsolutePath.Item( resourceType ) <> "" ) then 
  			GetResourceTypeDirectory = ConfigFileTypesAbsolutePath.Item( resourceType )
  		else
  			' Map the "UserFiles" path to a local directory.
! 			GetResourceTypeDirectory = Server.MapPath( ConfigFileTypesPath.Item( resourceType ) ) 
  		end if
  	end if
--- 41,52 ----
  		else
  			' Map the "UserFiles" path to a local directory.
! 			GetResourceTypeDirectory = Server.MapPath( ConfigQuickUploadPath.Item( resourceType ) )
  		end if
  	else
! 		if ( ConfigFileTypesAbsolutePath.Item( resourceType ) <> "" ) then
  			GetResourceTypeDirectory = ConfigFileTypesAbsolutePath.Item( resourceType )
  		else
  			' Map the "UserFiles" path to a local directory.
! 			GetResourceTypeDirectory = Server.MapPath( ConfigFileTypesPath.Item( resourceType ) )
  		end if
  	end if
***************
*** 64,68 ****
  	Dim sResourceTypePath
  	' Get the resource type directory.
! 	sResourceTypePath = GetResourceTypeDirectory( resourceType, sCommand ) 
  
  	' Ensure that the directory exists.
--- 64,68 ----
  	Dim sResourceTypePath
  	' Get the resource type directory.
! 	sResourceTypePath = GetResourceTypeDirectory( resourceType, sCommand )
  
  	' Ensure that the directory exists.
***************
*** 173,177 ****
  
  	' Check for invalid folder paths (..)
! 	If ( InStr( 1, sCurrentFolder, ".." ) <> 0 ) Then
  		SendError 102, ""
  	End If
--- 173,177 ----
  
  	' Check for invalid folder paths (..)
! 	If ( InStr( 1, sCurrentFolder, ".." ) <> 0 OR InStr( 1, sCurrentFolder, "\" ) <> 0) Then
  		SendError 102, ""
  	End If
***************
*** 186,191 ****
  	oRegex.Global		= True
  
! ' remove . \ / | : ? *  " < >
! 	oRegex.Pattern = "(\.|\\|\/|\||:|\?|\*|""|\<|\>)"
  	SanitizeFolderName = oRegex.Replace( sNewFolderName, "_" )
  
--- 186,191 ----
  	oRegex.Global		= True
  
! ' remove . \ / | : ? *  " < > and control characters
! 	oRegex.Pattern = "(\.|\\|\/|\||:|\?|\*|""|\<|\>|[\u0000-\u001F]|\u007F)"
  	SanitizeFolderName = oRegex.Replace( sNewFolderName, "_" )
  
***************
*** 204,209 ****
  	end if
  
! ' remove \ / | : ? *  " < >
! 	oRegex.Pattern = "(\\|\/|\||:|\?|\*|""|\<|\>)"
  	SanitizeFileName = oRegex.Replace( sNewFileName, "_" )
  
--- 204,209 ----
  	end if
  
! ' remove \ / | : ? *  " < > and control characters
! 	oRegex.Pattern = "(\\|\/|\||:|\?|\*|""|\<|\>|[\u0000-\u001F]|\u007F)"
  	SanitizeFileName = oRegex.Replace( sNewFileName, "_" )
  
***************
*** 215,218 ****
--- 215,250 ----
  	Response.Clear
  	Response.Write "<script type=""text/javascript"">"
+ 	Response.Write "(function()"
+ 	Response.Write "{"
+ 	Response.Write "var d = document.domain ;"
+ 
+ 	Response.Write " while ( true )"
+ 	Response.Write "	{"
+ 	' Test if we can access a parent property.
+ 	Response.Write "		try"
+ 	Response.Write "		{"
+ 	Response.Write "			var test = window.top.opener.document.domain ;"
+ 	Response.Write "			break ;"
+ 	Response.Write "		}"
+ 	Response.Write "		catch( e ) {}"
+ 
+ 	' Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 	Response.Write "		d = d.replace( /.*?(?:\.|$)/, '' ) ;"
+ 
+ 	Response.Write "		if ( d.length == 0 )"
+ 	' It was not able to detect the domain.
+ 	Response.Write "			break ;"
+ 	Response.Write ""
+ 	Response.Write "		try"
+ 	Response.Write "		{"
+ 	Response.Write "			document.domain = d ;"
+ 	Response.Write "		}"
+ 	Response.Write "		catch (e)"
+ 	Response.Write "		{"
+ 	Response.Write "			break ;"
+ 	Response.Write "		}"
+ 	Response.Write "	}"
+ 	Response.Write "})() ;"
+ 
  	Response.Write "window.parent.OnUploadCompleted(" & errorNumber & ",""" & Replace( fileUrl, """", "\""" ) & """,""" & Replace( fileName, """", "\""" ) & """,""" & Replace( customMsg , """", "\""" ) & """) ;"
  	Response.Write "</script>"

Index: connector.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/connector.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.asp	9 Feb 2008 12:53:58 -0000	1.1
--- connector.asp	5 May 2008 00:35:25 -0000	1.2
***************
*** 6,10 ****
  <%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
--- 6,10 ----
  <%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
***************
*** 51,55 ****
  	sCurrentFolder = GetCurrentFolder()
  
! 	' Check if it is an allowed command 
  	if ( Not IsAllowedCommand( sCommand ) ) then
  		SendError 1, "The """ & sCommand & """ command isn't allowed"
--- 51,55 ----
  	sCurrentFolder = GetCurrentFolder()
  
! 	' Check if it is an allowed command
  	if ( Not IsAllowedCommand( sCommand ) ) then
  		SendError 1, "The """ & sCommand & """ command isn't allowed"
***************
*** 57,61 ****
  
  	' Check if it is an allowed resource type.
! 	if ( Not IsAllowedType( sResourceType ) ) Then 
  		SendError 1, "The """ & sResourceType & """ resource type isn't allowed"
  	end if
--- 57,61 ----
  
  	' Check if it is an allowed resource type.
! 	if ( Not IsAllowedType( sResourceType ) ) Then
  		SendError 1, "The """ & sResourceType & """ resource type isn't allowed"
  	end if
***************
*** 86,88 ****
  End Sub
  
! %>
\ No newline at end of file
--- 86,88 ----
  End Sub
  
! %>

Index: util.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/util.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** util.asp	9 Feb 2008 12:53:58 -0000	1.1
--- util.asp	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
--- 1,5 ----
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==

Index: commands.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/commands.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** commands.asp	9 Feb 2008 12:53:58 -0000	1.1
--- commands.asp	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
--- 1,5 ----
  ???<%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
***************
*** 191,195 ****
  	dim sFileUrl
  	sFileUrl = CombinePaths( GetResourceTypePath( resourceType, sCommand ) , currentFolder )
! 	sFileUrl = CombinePaths( sFileUrl, sFileName ) 
  
  	SendUploadResults sErrorNumber, sFileUrl, sFileName, ""
--- 191,195 ----
  	dim sFileUrl
  	sFileUrl = CombinePaths( GetResourceTypePath( resourceType, sCommand ) , currentFolder )
! 	sFileUrl = CombinePaths( sFileUrl, sFileName )
  
  	SendUploadResults sErrorNumber, sFileUrl, sFileName, ""

Index: upload.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/upload.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.asp	9 Feb 2008 12:53:58 -0000	1.1
--- upload.asp	5 May 2008 00:35:25 -0000	1.2
***************
*** 6,10 ****
  <%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
--- 6,10 ----
  <%
   ' FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
   '
   ' == BEGIN LICENSE ==
***************
*** 32,35 ****
--- 32,39 ----
  <!--#include file="class_upload.asp"-->
  <%
+ 
+ Sub SendError( number, text )
+ 	SendUploadResults number, "", "", text
+ End Sub
  
  ' Check if this uploader has been enabled.



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode
	fckplugin.js, 1.1, 1.2
Message-ID: <20080505003530.8237610FE1A@qs1489.pair.com>

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

Modified Files:
	fckplugin.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckplugin.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode/fckplugin.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckplugin.js	9 Feb 2008 12:53:59 -0000	1.1
--- fckplugin.js	5 May 2008 00:35:26 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 121,123 ****
  	['Bold','Italic','Underline','-','Link'],
  	['About']
! ] ;
\ No newline at end of file
--- 121,123 ----
  	['Bold','Italic','Underline','-','Link'],
  	['About']
! ] ;



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor
	fckdebug.html, 1.5, 1.6 fckdialog.html, 1.5,
	1.6 fckeditor.html, 1.6, 1.7 fckeditor.original.html, 1.6, 1.7
Message-ID: <20080505003528.9D2D910FE24@qs1489.pair.com>

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

Modified Files:
	fckdebug.html fckdialog.html fckeditor.html 
	fckeditor.original.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckdialog.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/fckdialog.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fckdialog.html	9 Feb 2008 12:53:58 -0000	1.5
--- fckdialog.html	5 May 2008 00:35:24 -0000	1.6
***************
*** 1,6 ****
! <!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 ==
--- 1,6 ----
! <!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
[...1063 lines suppressed...]
! 		<div class="tl"></div>
! 		<div class="tc"></div>
! 		<div class="tr"></div>
! 		<div class="ml"></div>
! 		<div class="mr"></div>
! 		<div class="bl"></div>
! 		<div class="bc"></div>
! 		<div class="br"></div>
! 		<div class="cover" id="cover" style="display:none"></div>
! 		<div id="throbberBlock" style="position: absolute; visibility: hidden"></div>
! 		<script type="text/javascript">
! 			// Set the class name for language direction.
! 			document.body.className += ' ' + langDir ;
! 
! 			var cover = $( 'cover' ) ;
! 			cover.style.backgroundColor = FCKConfig.BackgroundBlockerColor ;
! 			FCKDomTools.SetOpacity( cover, FCKConfig.BackgroundBlockerOpacity ) ;
! 		</script>
  	</body>
  </html>

Index: fckeditor.original.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/fckeditor.original.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fckeditor.original.html	9 Feb 2008 12:53:58 -0000	1.6
--- fckeditor.original.html	5 May 2008 00:35:24 -0000	1.7
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 28,35 ****
  	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  	<!-- @Packager.RemoveLine
! 	<meta http-equiv="Cache-Control" content="public" />
  	@Packager.RemoveLine -->
  	<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,
--- 28,75 ----
  	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  	<!-- @Packager.RemoveLine
! 	<meta http-equiv="Cache-Control" content="public">
  	@Packager.RemoveLine -->
  	<script type="text/javascript">
  
+ // Save a reference to the default domain.
+ var FCK_ORIGINAL_DOMAIN ;
+ 
+ // Automatically detect the correct document.domain (#123).
+ (function()
+ {
+ 	var d = FCK_ORIGINAL_DOMAIN = document.domain ;
+ 
+ 	while ( true )
+ 	{
+ 		// Test if we can access a parent property.
+ 		try
+ 		{
+ 			var test = window.parent.document.domain ;
+ 			break ;
+ 		}
+ 		catch( e ) {}
+ 
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+ 
+ 		if ( d.length == 0 )
+ 			break ;		// It was not able to detect the domain.
+ 
+ 		try
+ 		{
+ 			document.domain = d ;
+ 		}
+ 		catch (e)
+ 		{
+ 			break ;
+ 		}
+ 	}
+ })() ;
+ 
+ // Save a reference to the detected runtime domain.
+ var FCK_RUNTIME_DOMAIN = document.domain ;
+ 
+ var FCK_IS_CUSTOM_DOMAIN = ( FCK_ORIGINAL_DOMAIN != FCK_RUNTIME_DOMAIN ) ;
+ 
  // 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,
***************
*** 42,50 ****
  }
  
- function LoadCss( url )
- {
- 	document.write( '<link href="' + url + '" type="text/css" rel="stylesheet" />' ) ;
- }
- 
  // Main editor scripts.
  var sSuffix = ( /*@cc_on!@*/false ) ? 'ie' : 'gecko' ;
--- 82,85 ----
***************
*** 142,146 ****
  LoadScript( '_source/internals/fcktoolbarset.js' ) ;
  LoadScript( '_source/internals/fckdialog.js' ) ;
- LoadScript( '_source/internals/fckdialog_' + sSuffix + '.js' ) ;
  LoadScript( '_source/classes/fckmenuitem.js' ) ;
  LoadScript( '_source/classes/fckmenublock.js' ) ;
--- 177,180 ----
***************
*** 148,151 ****
--- 182,186 ----
  LoadScript( '_source/classes/fckcontextmenu.js' ) ;
  LoadScript( '_source/internals/fck_contextmenu.js' ) ;
+ LoadScript( '_source/classes/fckhtmliterator.js' ) ;
  LoadScript( '_source/classes/fckplugin.js' ) ;
  LoadScript( '_source/internals/fckplugins.js' ) ;
***************
*** 159,162 ****
--- 194,201 ----
  	<script type="text/javascript">
  
+ // Adobe AIR compatibility file.
+ if ( FCKBrowserInfo.IsAIR )
+ 	LoadScript( 'js/fckadobeair.js' ) ;
+ 
  if ( FCKBrowserInfo.IsIE )
  {
***************
*** 199,204 ****
  FCKConfig_PreProcess() ;
  
  // Load the active skin CSS.
! LoadCss( FCKConfig.SkinPath + 'fck_editor.css' ) ;
  
  // Load the language file.
--- 238,256 ----
  FCKConfig_PreProcess() ;
  
+ var FCK_InternalCSS			= FCKConfig.FullBasePath + 'css/fck_internal.css' ;					// @Packager.RemoveLine
+ var FCK_ShowTableBordersCSS	= FCKConfig.FullBasePath + 'css/fck_showtableborders_gecko.css' ;	// @Packager.RemoveLine
+ /* @Packager.RemoveLine
+ // CSS minified by http://iceyboard.no-ip.org/projects/css_compressor
+ var FCK_InternalCSS			= FCKTools.FixCssUrls( FCKConfig.FullBasePath + 'css/', 'html{min-height:100%}table.FCK__ShowTableBorders,table.FCK__ShowTableBorders td,table.FCK__ShowTableBorders th{border:#d3d3d3 1px solid}form{border:1px dotted #F00;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}.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}.FCK__AnchorC{border:1px dotted #00F;background-position:1px center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}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:ur
 l(images/fck_pagebreak.gif);background-repeat:no-repeat;clear:both;display:block;float:none;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;border-right:0;border-left:0;height:5px}.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{back
 ground-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)}' ) ;
+ var FCK_ShowTableBordersCSS	= FCKTools.FixCssUrls( FCKConfig.FullBasePath + 'css/', '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,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}' ) ;
+ @Packager.RemoveLine */
+ 
+ // Popup the debug window if debug mode is set to true. It guarantees that the
+ // first debug message will not be lost.
+ if ( FCKConfig.Debug )
+ 	FCKDebug._GetWindow() ;
+ 
  // Load the active skin CSS.
! document.write( FCKTools.GetStyleHtml( FCKConfig.SkinEditorCSS ) ) ;
  
  // Load the language file.
***************
*** 282,292 ****
  }
  
! // 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 ;
  
--- 334,347 ----
  }
  
! // Gecko browsers doesn't calculate well the IFRAME size so we must
  // recalculate it every time the window size changes.
! if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera )
  {
! 	window.onresize = function( e )
  	{
! 		// Running in Chrome makes the window receive the event including subframes.
! 		// we care only about this window. Ticket #1642.
! 		// #2002: The originalTarget from the event can be the current document, the window, or the editing area.
! 		if ( e && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document ))
  			return ;
  
***************
*** 296,304 ****
  		if ( eInnerElement )
  		{
! 			eInnerElement.style.height = 0 ;
! 			eInnerElement.style.height = oCell.scrollHeight - 2 ;
  		}
  	}
- 	window.onresize = Window_OnResize ;
  }
  
--- 351,358 ----
  		if ( eInnerElement )
  		{
! 			eInnerElement.style.height = '0px' ;
! 			eInnerElement.style.height = ( oCell.scrollHeight - 2 ) + 'px' ;
  		}
  	}
  }
  

Index: fckeditor.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/fckeditor.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fckeditor.html	9 Feb 2008 12:53:58 -0000	1.6
--- fckeditor.html	5 May 2008 00:35:24 -0000	1.7
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 27,33 ****
  	<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,
--- 27,73 ----
  	<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">
  
+ // Save a reference to the default domain.
+ var FCK_ORIGINAL_DOMAIN ;
+ 
+ // Automatically detect the correct document.domain (#123).
+ (function()
+ {
+ 	var d = FCK_ORIGINAL_DOMAIN = document.domain ;
+ 
+ 	while ( true )
+ 	{
+ 		// Test if we can access a parent property.
+ 		try
+ 		{
+ 			var test = window.parent.document.domain ;
+ 			break ;
+ 		}
+ 		catch( e ) {}
+ 
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+ 
+ 		if ( d.length == 0 )
+ 			break ;		// It was not able to detect the domain.
+ 
+ 		try
+ 		{
+ 			document.domain = d ;
+ 		}
+ 		catch (e)
+ 		{
+ 			break ;
+ 		}
+ 	}
+ })() ;
+ 
+ // Save a reference to the detected runtime domain.
+ var FCK_RUNTIME_DOMAIN = document.domain ;
+ 
+ var FCK_IS_CUSTOM_DOMAIN = ( FCK_ORIGINAL_DOMAIN != FCK_RUNTIME_DOMAIN ) ;
+ 
  // 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,
***************
*** 40,48 ****
  }
  
- function LoadCss( url )
- {
- 	document.write( '<link href="' + url + '" type="text/css" rel="stylesheet" />' ) ;
- }
- 
  // Main editor scripts.
  var sSuffix = ( /*@cc_on!@*/false ) ? 'ie' : 'gecko' ;
--- 80,83 ----
***************
*** 56,59 ****
--- 91,98 ----
  	<script type="text/javascript">
  
+ // Adobe AIR compatibility file.
+ if ( FCKBrowserInfo.IsAIR )
+ 	LoadScript( 'js/fckadobeair.js' ) ;
+ 
  if ( FCKBrowserInfo.IsIE )
  {
***************
*** 96,101 ****
  FCKConfig_PreProcess() ;
  
  // Load the active skin CSS.
! LoadCss( FCKConfig.SkinPath + 'fck_editor.css' ) ;
  
  // Load the language file.
--- 135,149 ----
  FCKConfig_PreProcess() ;
  
+ // CSS minified by http://iceyboard.no-ip.org/projects/css_compressor
+ var FCK_InternalCSS			= FCKTools.FixCssUrls( FCKConfig.FullBasePath + 'css/', 'html{min-height:100%}table.FCK__ShowTableBorders,table.FCK__ShowTableBorders td,table.FCK__ShowTableBorders th{border:#d3d3d3 1px solid}form{border:1px dotted #F00;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}.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}.FCK__AnchorC{border:1px dotted #00F;background-position:1px center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}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:ur
 l(images/fck_pagebreak.gif);background-repeat:no-repeat;clear:both;display:block;float:none;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;border-right:0;border-left:0;height:5px}.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{back
 ground-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)}' ) ;
+ var FCK_ShowTableBordersCSS	= FCKTools.FixCssUrls( FCKConfig.FullBasePath + 'css/', '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,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}' ) ;
+ 
+ // Popup the debug window if debug mode is set to true. It guarantees that the
+ // first debug message will not be lost.
+ if ( FCKConfig.Debug )
+ 	FCKDebug._GetWindow() ;
+ 
  // Load the active skin CSS.
! document.write( FCKTools.GetStyleHtml( FCKConfig.SkinEditorCSS ) ) ;
  
  // Load the language file.
***************
*** 179,189 ****
  }
  
! // 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 ;
  
--- 227,240 ----
  }
  
! // Gecko browsers doesn't calculate well the IFRAME size so we must
  // recalculate it every time the window size changes.
! if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera )
  {
! 	window.onresize = function( e )
  	{
! 		// Running in Chrome makes the window receive the event including subframes.
! 		// we care only about this window. Ticket #1642.
! 		// #2002: The originalTarget from the event can be the current document, the window, or the editing area.
! 		if ( e && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document ))
  			return ;
  
***************
*** 193,201 ****
  		if ( eInnerElement )
  		{
! 			eInnerElement.style.height = 0 ;
! 			eInnerElement.style.height = oCell.scrollHeight - 2 ;
  		}
  	}
- 	window.onresize = Window_OnResize ;
  }
  
--- 244,251 ----
  		if ( eInnerElement )
  		{
! 			eInnerElement.style.height = '0px' ;
! 			eInnerElement.style.height = ( oCell.scrollHeight - 2 ) + 'px' ;
  		}
  	}
  }
  

Index: fckdebug.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/fckdebug.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fckdebug.html	9 Feb 2008 12:53:58 -0000	1.5
--- fckdebug.html	5 May 2008 00:35:24 -0000	1.6
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts
	spellchecker.php, 1.3, 1.4 spellchecker.pl, 1.3, 1.4
Message-ID: <20080505003528.878F610FE22@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-serv85146/editor/dialog/fck_spellerpages/spellerpages/server-scripts

Modified Files:
	spellchecker.php spellchecker.pl 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: spellchecker.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spellchecker.pl	9 Feb 2008 12:53:58 -0000	1.3
--- spellchecker.pl	5 May 2008 00:35:24 -0000	1.4
***************
*** 180,183 ****
  </html>
  EOF
- 
- 
--- 180,181 ----

Index: spellchecker.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spellchecker.php	9 Feb 2008 12:53:58 -0000	1.3
--- spellchecker.php	5 May 2008 00:35:24 -0000	1.4
***************
*** 63,67 ****
  # handle a server-side error.
  function error_handler( $err ) {
! 	echo "error = '" . escape_quote( $err ) . "';\n";
  }
  
--- 63,67 ----
  # handle a server-side error.
  function error_handler( $err ) {
! 	echo "error = '" . preg_replace( "/['\\\\]/", "\\\\$0", $err ) . "';\n";
  }
  
***************
*** 198,201 ****
  </body>
  </html>
- 
- 
--- 198,199 ----



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default
	browser.css, 1.3, 1.4 browser.html, 1.3,
	1.4 frmactualfolder.html, 1.3, 1.4 frmcreatefolder.html, 1.3,
	1.4 frmfolders.html, 1.3, 1.4 frmresourceslist.html, 1.4,
	1.5 frmresourcetype.html, 1.3, 1.4 frmupload.html, 1.3, 1.4
Message-ID: <20080505003528.9F18B10FE26@qs1489.pair.com>

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

Modified Files:
	browser.css browser.html frmactualfolder.html 
	frmcreatefolder.html frmfolders.html frmresourceslist.html 
	frmresourcetype.html frmupload.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: frmfolders.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/frmfolders.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** frmfolders.html	9 Feb 2008 12:53:58 -0000	1.3
--- frmfolders.html	5 May 2008 00:35:25 -0000	1.4
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 26,29 ****
--- 26,30 ----
  	<head>
  		<link href="browser.css" type="text/css" rel="stylesheet">
+ 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  		<script type="text/javascript" src="js/common.js"></script>
  		<script language="javascript">

Index: frmactualfolder.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/frmactualfolder.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** frmactualfolder.html	9 Feb 2008 12:53:58 -0000	1.3
--- frmactualfolder.html	5 May 2008 00:35:25 -0000	1.4
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 24,29 ****
--- 24,61 ----
  <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">
+ // Automatically detect the correct document.domain (#1919).
+ (function()
+ {
+ 	var d = document.domain ;
+ 
+ 	while ( true )
+ 	{
+ 		// Test if we can access a parent property.
+ 		try
+ 		{
+ 			var test = window.top.opener.document.domain ;
+ 			break ;
+ 		}
+ 		catch( e ) {}
+ 
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+ 
+ 		if ( d.length == 0 )
+ 			break ;		// It was not able to detect the domain.
+ 
+ 		try
+ 		{
+ 			document.domain = d ;
+ 		}
+ 		catch (e)
+ 		{
+ 			break ;
+ 		}
+ 	}
+ })() ;
  
  function OnResize()

Index: browser.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/browser.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** browser.html	9 Feb 2008 12:53:58 -0000	1.3
--- browser.html	5 May 2008 00:35:25 -0000	1.4
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 25,31 ****
--- 25,63 ----
  	<head>
  		<title>FCKeditor - Resources Browser</title>
+ 		<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/fckxml.js"></script>
  		<script language="javascript">
+ // Automatically detect the correct document.domain (#1919).
+ (function()
+ {
+ 	var d = document.domain ;
+ 
+ 	while ( true )
+ 	{
+ 		// Test if we can access a parent property.
+ 		try
+ 		{
+ 			var test = window.opener.document.domain ;
+ 			break ;
+ 		}
+ 		catch( e ) {}
+ 
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+ 
+ 		if ( d.length == 0 )
+ 			break ;		// It was not able to detect the domain.
+ 
+ 		try
+ 		{
+ 			document.domain = d ;
+ 		}
+ 		catch (e)
+ 		{
+ 			break ;
+ 		}
+ 	}
+ })() ;
  
  function GetUrlParam( paramName )
***************
*** 141,145 ****
  function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
  {
! 	window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;
  }
  
--- 173,180 ----
  function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
  {
! 	if (errorNumber == "1")
! 		window.frames['frmUpload'].OnUploadCompleted( errorNumber, customMsg ) ;
! 	else
! 		window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;
  }
  

Index: frmresourcetype.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/frmresourcetype.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** frmresourcetype.html	9 Feb 2008 12:53:58 -0000	1.3
--- frmresourcetype.html	5 May 2008 00:35:25 -0000	1.4
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: frmresourceslist.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/frmresourceslist.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** frmresourceslist.html	9 Feb 2008 12:53:58 -0000	1.4
--- frmresourceslist.html	5 May 2008 00:35:25 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 25,28 ****
--- 25,29 ----
  <head>
  	<link href="browser.css" type="text/css" rel="stylesheet" />
+ 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  	<script type="text/javascript" src="js/common.js"></script>
  	<script type="text/javascript">
***************
*** 88,92 ****
  function OpenFile( fileUrl )
  {
! 	window.top.opener.SetUrl( encodeURI( fileUrl ) ) ;
  	window.top.close() ;
  	window.top.opener.focus() ;
--- 89,93 ----
  function OpenFile( fileUrl )
  {
! 	window.top.opener.SetUrl( encodeURI( fileUrl ).replace( '#', '%23' ) ) ;
  	window.top.close() ;
  	window.top.opener.focus() ;

Index: frmcreatefolder.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** frmcreatefolder.html	9 Feb 2008 12:53:58 -0000	1.3
--- frmcreatefolder.html	5 May 2008 00:35:25 -0000	1.4
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: browser.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/browser.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** browser.css	9 Feb 2008 12:53:58 -0000	1.3
--- browser.css	5 May 2008 00:35:25 -0000	1.4
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 87,89 ****
  {
  	background-image: url(images/Folder.gif);
! }
\ No newline at end of file
--- 87,89 ----
  {
  	background-image: url(images/Folder.gif);
! }

Index: frmupload.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/frmupload.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** frmupload.html	9 Feb 2008 12:53:58 -0000	1.3
--- frmupload.html	5 May 2008 00:35:25 -0000	1.4
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 25,28 ****
--- 25,29 ----
  	<head>
  		<title>File Upload</title>
+ 		<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>



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image
	fck_image.js, 1.7, 1.8 fck_image_preview.html, 1.4, 1.5
Message-ID: <20080505003528.5B52C10FE1F@qs1489.pair.com>

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

Modified Files:
	fck_image.js fck_image_preview.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_image.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image/fck_image.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** fck_image.js	9 Feb 2008 12:53:57 -0000	1.7
--- fck_image.js	5 May 2008 00:35:24 -0000	1.8
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 22,30 ****
   */
  
! var oEditor		= window.parent.InnerDialogLoaded() ;
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
  var FCKConfig	= oEditor.FCKConfig ;
  var FCKDebug	= oEditor.FCKDebug ;
  
  var bImageButton = ( document.location.search.length > 0 && document.location.search.substr(1) == 'ImageButton' ) ;
--- 22,32 ----
   */
  
! var dialog		= window.parent ;
! var oEditor		= dialog.InnerDialogLoaded() ;
  var FCK			= oEditor.FCK ;
  var FCKLang		= oEditor.FCKLang ;
  var FCKConfig	= oEditor.FCKConfig ;
  var FCKDebug	= oEditor.FCKDebug ;
+ var FCKTools	= oEditor.FCKTools ;
  
  var bImageButton = ( document.location.search.length > 0 && document.location.search.substr(1) == 'ImageButton' ) ;
***************
*** 33,46 ****
  
  // Set the dialog tabs.
! window.parent.AddTab( 'Info', FCKLang.DlgImgInfoTab ) ;
  
  if ( !bImageButton && !FCKConfig.ImageDlgHideLink )
! 	window.parent.AddTab( 'Link', FCKLang.DlgImgLinkTab ) ;
  
  if ( FCKConfig.ImageUpload )
! 	window.parent.AddTab( 'Upload', FCKLang.DlgLnkUpload ) ;
  
  if ( !FCKConfig.ImageDlgHideAdvanced )
! 	window.parent.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
--- 35,48 ----
  
  // Set the dialog tabs.
! dialog.AddTab( 'Info', FCKLang.DlgImgInfoTab ) ;
  
  if ( !bImageButton && !FCKConfig.ImageDlgHideLink )
! 	dialog.AddTab( 'Link', FCKLang.DlgImgLinkTab ) ;
  
  if ( FCKConfig.ImageUpload )
! 	dialog.AddTab( 'Upload', FCKLang.DlgLnkUpload ) ;
  
  if ( !FCKConfig.ImageDlgHideAdvanced )
! 	dialog.AddTab( 'Advanced', FCKLang.DlgAdvancedTag ) ;
  
  // Function called when a dialog tag is selected.
***************
*** 54,58 ****
  
  // Get the selected image (if available).
! var oImage = FCK.Selection.GetSelectedElement() ;
  
  if ( oImage && oImage.tagName != 'IMG' && !( oImage.tagName == 'INPUT' && oImage.type == 'image' ) )
--- 56,60 ----
  
  // Get the selected image (if available).
! var oImage = dialog.Selection.GetSelectedElement() ;
  
  if ( oImage && oImage.tagName != 'IMG' && !( oImage.tagName == 'INPUT' && oImage.type == 'image' ) )
***************
*** 60,64 ****
  
  // Get the active link.
! var oLink = FCK.Selection.MoveToAncestorNode( 'A' ) ;
  
  var oImageOriginal ;
--- 62,66 ----
  
  // Get the active link.
! var oLink = dialog.Selection.GetSelection().MoveToAncestorNode( 'A' ) ;
  
  var oImageOriginal ;
***************
*** 112,119 ****
  		GetE('frmUpload').action = FCKConfig.ImageUploadURL ;
  
! 	window.parent.SetAutoSize( true ) ;
  
  	// Activate the "OK" button.
! 	window.parent.SetOkButton( true ) ;
  }
  
--- 114,123 ----
  		GetE('frmUpload').action = FCKConfig.ImageUploadURL ;
  
! 	dialog.SetAutoSize( true ) ;
  
  	// Activate the "OK" button.
! 	dialog.SetOkButton( true ) ;
! 
! 	SelectField( 'txtUrl' ) ;
  }
  
***************
*** 198,202 ****
  	if ( GetE('txtUrl').value.length == 0 )
  	{
! 		window.parent.SetSelectedTab( 'Info' ) ;
  		GetE('txtUrl').focus() ;
  
--- 202,206 ----
  	if ( GetE('txtUrl').value.length == 0 )
  	{
! 		dialog.SetSelectedTab( 'Info' ) ;
  		GetE('txtUrl').focus() ;
  
***************
*** 381,384 ****
--- 385,393 ----
  {
  	if ( ! oImageOriginal ) return ;
+ 	if ( oEditor.FCKBrowserInfo.IsGecko && !oImageOriginal.complete )
+ 	{
+ 		setTimeout( ResetSizes, 50 ) ;
+ 		return ;
+ 	}
  
  	GetE('txtWidth').value  = oImageOriginal.width ;
***************
*** 434,438 ****
  	}
  
! 	window.parent.SetSelectedTab( 'Info' ) ;
  }
  
--- 443,447 ----
  	}
  
! 	dialog.SetSelectedTab( 'Info' ) ;
  }
  
***************
*** 459,462 ****
--- 468,474 ----
  			alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ;
  			return ;
+ 		case 500 :
+ 			alert( 'The connector is disabled' ) ;
+ 			break ;
  		default :
  			alert( 'Error on file upload. Error number: ' + errorNumber ) ;

Index: fck_image_preview.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image/fck_image_preview.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_image_preview.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_image_preview.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 29,37 ****
  	<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 )
--- 29,41 ----
  	<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 FCKTools	= window.parent.FCKTools ;
+ var FCKConfig	= window.parent.FCKConfig ;
+ 
  // Sets the Skin CSS
! document.write( FCKTools.GetStyleHtml( FCKConfig.SkinDialogCSS ) ) ;
! document.write( FCKTools.GetStyleHtml( GetCommonDialogCss( '../' ) ) ) ;
  
  if ( window.parent.FCKConfig.BaseHref.length > 0 )
***************
*** 48,66 ****
  </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>
--- 52,72 ----
  </head>
  <body style="color: #000000; background-color: #ffffff">
! 	<div>
! 		<a id="lnkPreview" onclick="return false;" style="cursor: default">
! 			<img id="imgPreview" onload="window.parent.UpdateOriginal();"
! 				style="display: none" alt="" /></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.
! 	</div>
  </body>
  </html>



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js
	common.js, 1.4, 1.5 fckxml.js, 1.3, 1.4
Message-ID: <20080505003528.C755510FE27@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-serv85146/editor/filemanager/browser/default/js

Modified Files:
	common.js fckxml.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: common.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js/common.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** common.js	9 Feb 2008 12:53:58 -0000	1.4
--- common.js	5 May 2008 00:35:25 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 23,26 ****
--- 23,58 ----
   */
  
+ // Automatically detect the correct document.domain (#1919).
+ (function()
+ {
+ 	var d = document.domain ;
+ 
+ 	while ( true )
+ 	{
+ 		// Test if we can access a parent property.
+ 		try
+ 		{
+ 			var test = window.top.opener.document.domain ;
+ 			break ;
+ 		}
+ 		catch( e ) {}
+ 
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+ 
+ 		if ( d.length == 0 )
+ 			break ;		// It was not able to detect the domain.
+ 
+ 		try
+ 		{
+ 			document.domain = d ;
+ 		}
+ 		catch (e)
+ 		{
+ 			break ;
+ 		}
+ 	}
+ })() ;
+ 
  function AddSelectOption( selectElement, optionText, optionValue )
  {
***************
*** 53,55 ****
  {
      return this._Strings.join( '' ) ;
! }
\ No newline at end of file
--- 85,87 ----
  {
      return this._Strings.join( '' ) ;
! }

Index: fckxml.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/js/fckxml.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckxml.js	9 Feb 2008 12:53:58 -0000	1.3
--- fckxml.js	5 May 2008 00:35:25 -0000	1.4
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 32,37 ****
  {
  	// Gecko / IE7
! 	if ( typeof(XMLHttpRequest) != 'undefined' )
! 		return new XMLHttpRequest() ;
  
  	// IE6
--- 32,37 ----
  {
  	// Gecko / IE7
! 	try { return new XMLHttpRequest(); }
! 	catch(e) {}
  
  	// IE6



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/simplecommands
	fckplugin.js, 1.3, 1.4
Message-ID: <20080505003530.A296210FE6C@qs1489.pair.com>

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

Modified Files:
	fckplugin.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckplugin.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/simplecommands/fckplugin.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fckplugin.js	9 Feb 2008 12:54:00 -0000	1.3
--- fckplugin.js	5 May 2008 00:35:26 -0000	1.4
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/office2003/images
	dialog.sides.gif, NONE, 1.1 dialog.sides.png, NONE,
	1.1 dialog.sides.rtl.png, NONE, 1.1 sprites.gif, NONE,
	1.1 sprites.png, NONE, 1.1
Message-ID: <20080505003530.DE40F10FE19@qs1489.pair.com>

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

Added Files:
	dialog.sides.gif dialog.sides.png dialog.sides.rtl.png 
	sprites.gif sprites.png 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

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

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

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

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

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



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/skins/default
	fck_dialog_ie6.js, NONE, 1.1 fck_dialog.css, 1.4,
	1.5 fck_editor.css, 1.6, 1.7
Message-ID: <20080505003530.C08F910FE72@qs1489.pair.com>

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

Modified Files:
	fck_dialog.css fck_editor.css 
Added Files:
	fck_dialog_ie6.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

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

Index: fck_editor.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/default/fck_editor.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_editor.css	9 Feb 2008 12:54:01 -0000	1.6
--- fck_editor.css	5 May 2008 00:35:26 -0000	1.7
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 410,414 ****
  }
  
! .SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption
  {
      opacity: 0.30; /* Safari, Opera and Mozilla */
--- 410,414 ----
  }
  
! .SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
  {
      opacity: 0.30; /* Safari, Opera and Mozilla */

Index: fck_dialog.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/default/fck_dialog.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_dialog.css	9 Feb 2008 12:54:01 -0000	1.4
--- fck_dialog.css	5 May 2008 00:35:26 -0000	1.5
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 22,28 ****
   */
  
! body
  {
  	margin: 0px;
  	padding: 10px;
  }
--- 22,34 ----
   */
  
! html, body
  {
+ 	background-color: transparent;
  	margin: 0px;
+ 	padding: 0px;
+ }
+ 
+ body
+ {
  	padding: 10px;
  }
***************
*** 41,48 ****
  .PopupBody
  {
! 	margin: 0px;
  	padding: 0px;
  }
  
  .PopupTitle
  {
--- 47,62 ----
  .PopupBody
  {
! 	height: 100%;
! 	width: 100%;
! 	overflow: hidden;
! 	background-color: transparent;
  	padding: 0px;
  }
  
+ #header
+ {
+ 	cursor: move;
+ }
+ 
  .PopupTitle
  {
***************
*** 56,59 ****
--- 70,77 ----
  .PopupButtons
  {
+ 	position: absolute;
+ 	right: 0px;
+ 	left: 0px;
+ 	bottom: 0px;
  	border-top: #d5d59d 1px solid;
  	background-color: #e3e3c7;
***************
*** 75,79 ****
  .DarkBackground
  {
! 	background-color: #d7d79f;
  }
  
--- 93,97 ----
  .DarkBackground
  {
! 	background-color: #eaead1;
  }
  
***************
*** 96,100 ****
  .PopupTabEmptyArea
  {
! 	padding-left: 10px ;
  	border-bottom: #d5d59d 1px solid;
  }
--- 114,118 ----
  .PopupTabEmptyArea
  {
! 	padding-left: 10px;
  	border-bottom: #d5d59d 1px solid;
  }
***************
*** 119,123 ****
  .PopupTabSelected
  {
! 	font-weight:bold;
  	cursor: default;
  	padding-top: 4px;
--- 137,141 ----
  .PopupTabSelected
  {
! 	font-weight: bold;
  	cursor: default;
  	padding-top: 4px;
***************
*** 134,139 ****
  }
  
! #tdBrowse 
  {
  	vertical-align: bottom;
! }
\ No newline at end of file
--- 152,402 ----
  }
  
! #tdBrowse
  {
  	vertical-align: bottom;
! }
! 
! /**
!  * Dialog frame related styles.
!  */
! 
! .contents
! {
! 	position: absolute;
! 	top: 2px;
! 	left: 16px;
! 	right: 16px;
! 	bottom: 20px;
! 	background-color: #f1f1e3;
! 	overflow: hidden;
! 	z-index: 1;
! }
! 
! .tl, .tr, .tc, .bl, .br, .bc
! {
! 	position: absolute;
! 	background-image: url(images/sprites.png);
! 	background-repeat: no-repeat;
! }
! 
! * html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
! {
! 	background-image: url(images/sprites.gif);
! }
! 
! .ml, .mr
! {
! 	position: absolute;
! 	background-image: url(images/dialog.sides.png);
! 	background-repeat: repeat-y;
! }
! 
! * html .ml, * html .mr
! {
! 	background-image: url(images/dialog.sides.gif);
! }
! 
! .rtl .ml, .rtl .mr
! {
! 	position: absolute;
! 	background-image: url(images/dialog.sides.rtl.png);
! 	background-repeat: repeat-y;
! }
! 
! * html .rtl .ml, * html .rtl .mr
! {
! 	background-image: url(images/dialog.sides.gif);
! }
! 
! .tl
! {
! 	top: 0px;
! 	left: 0px;
! 	width: 16px;
! 	height: 16px;
! 	background-position: -16px -16px;
! }
! 
! .rtl .tl
! {
! 	background-position: -16px -397px;
! }
! 
! .tr
! {
! 	top: 0px;
! 	right: 0px;
! 	width: 16px;
! 	height: 16px;
! 	background-position: -16px -76px;
! }
! 
! .rtl .tr
! {
! 	background-position: -16px -457px;
! }
! 
! .tc
! {
! 	top: 0px;
! 	right: 16px;
! 	left: 16px;
! 	height: 16px;
! 	background-position: 0px -136px;
! 	background-repeat: repeat-x;
! }
! 
! .ml
! {
! 	top: 16px;
! 	left: 0px;
! 	width: 16px;
! 	bottom: 51px;
! 	background-position: 0px 0px;
! }
! 
! .mr
! {
! 	top: 16px;
! 	right: 0px;
! 	width: 16px;
! 	bottom: 51px;
! 	background-position: -16px 0px;
! }
! 
! .bl
! {
! 	bottom: 0px;
! 	left: 0px;
! 	width: 30px;
! 	height: 51px;
! 	background-position: -16px -196px;
! }
! 
! .rtl .bl
! {
! 	background-position: -16px -517px;
! }
! 
! .br
! {
! 	bottom: 0px;
! 	right: 0px;
! 	width: 30px;
! 	height: 51px;
! 	background-position: -16px -263px;
! }
! 
! .rtl .br
! {
! 	background-position: -16px -584px;
! }
! 
! .bc
! {
! 	bottom: 0px;
! 	right: 30px;
! 	left: 30px;
! 	height: 51px;
! 	background-position: 0px -330px;
! 	background-repeat: repeat-x;
! }
! 
! /* For IE6. Do not change it. */
! * html .blocker
! {
! 	position: absolute;
! 	width: 100%;
! 	height: 100%;
! 	z-index: 12;
! 	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
! }
! 
! /* The layer used to cover the dialog when opening a child dialog. */
! .cover
! {
! 	position: absolute;
! 	top: 0px;
! 	left: 14px;
! 	right: 14px;
! 	bottom: 18px;
! 	z-index: 11;
! }
! 
! #closeButton
! {
! 	position: absolute;
! 	right: 0px;
! 	top: 0px;
! 	margin-top: 5px;
! 	margin-right: 10px;
! 	width: 20px;
! 	height: 20px;
! 	cursor: pointer;
! 	background-image: url(images/sprites.png);
! 	background-repeat: no-repeat;
! 	background-position: -16px -651px;
! }
! 
! * html #closeButton
! {
! 	cursor: hand;
! 	background-image: url(images/sprites.gif);
! }
! 
! .rtl #closeButton
! {
! 	right: auto;
! 	left: 10px;
! 	margin-right: 0px;
! }
! 
! #closeButton:hover
! {
! 	background-position: -16px -687px;
! }
! 
! #throbberBlock
! {
! 	z-index: 10;
! }
! 
! #throbberBlock div
! {
! 	float: left;
! 	width: 8px;
! 	height: 9px;
! 	margin-left: 2px;
! 	margin-right: 2px;
! 	font-size: 1px;	/* IE6 */
! }
! 
! /*
! 	Color Gradient Generator:
! 	http://www.herethere.net/~samson/php/color_gradient/?cbegin=737357&cend=E3E3C7&steps=4
! */
! 
! .throbber_1
! {
! 	background-color: #737357;
! }
! 
! .throbber_2
! {
! 	background-color: #8f8f73;
! }
! 
! .throbber_3
! {
! 	background-color: #abab8f;
! }
! 
! .throbber_4
! {
! 	background-color: #c7c7ab;
! }
! 
! .throbber_5
! {
! 	background-color: #e3e3c7;
! }



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/skins
	_fckviewstrips.html, 1.3, 1.4
Message-ID: <20080505003530.BE87C10FE70@qs1489.pair.com>

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

Modified Files:
	_fckviewstrips.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: _fckviewstrips.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/_fckviewstrips.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _fckviewstrips.html	9 Feb 2008 12:54:01 -0000	1.3
--- _fckviewstrips.html	5 May 2008 00:35:26 -0000	1.4
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dtd
	fck_dtd_test.html, 1.1, 1.2 fck_xhtml10strict.js, 1.1,
	1.2 fck_xhtml10transitional.js, 1.1, 1.2
Message-ID: <20080505003528.9D42B10FE25@qs1489.pair.com>

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

Modified Files:
	fck_dtd_test.html fck_xhtml10strict.js 
	fck_xhtml10transitional.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_xhtml10strict.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dtd/fck_xhtml10strict.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fck_xhtml10strict.js	9 Feb 2008 12:53:58 -0000	1.1
--- fck_xhtml10strict.js	5 May 2008 00:35:24 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 24,28 ****
  FCK.DTD = (function()
  {
!     X = FCKTools.Merge ;
  
      var H,I,J,K,C,L,M,A,B,D,E,G,N,F ;
--- 24,28 ----
  FCK.DTD = (function()
  {
!     var X = FCKTools.Merge ;
  
      var H,I,J,K,C,L,M,A,B,D,E,G,N,F ;

Index: fck_dtd_test.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dtd/fck_dtd_test.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fck_dtd_test.html	9 Feb 2008 12:53:58 -0000	1.1
--- fck_dtd_test.html	5 May 2008 00:35:24 -0000	1.2
***************
*** 18,23 ****
  		<script type="text/javascript">
  
-     alert(FCK.DTD);
- 
  for ( var p in FCK.DTD )
  {
--- 18,21 ----

Index: fck_xhtml10transitional.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dtd/fck_xhtml10transitional.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fck_xhtml10transitional.js	9 Feb 2008 12:53:58 -0000	1.1
--- fck_xhtml10transitional.js	5 May 2008 00:35:24 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 24,28 ****
  FCK.DTD = (function()
  {
!     X = FCKTools.Merge ;
  
      var A,L,J,M,N,O,D,H,P,K,Q,F,G,C,B,E,I ;
--- 24,28 ----
  FCK.DTD = (function()
  {
!     var X = FCKTools.Merge ;
  
      var A,L,J,M,N,O,D,H,P,K,Q,F,G,C,B,E,I ;
***************
*** 138,140 ****
  	    "<b>this is a </b><a><b>link</b> test</a>", instead of
  	    "<b>this is a <a>link</a></b><a> test</a>".
! */
\ No newline at end of file
--- 138,140 ----
  	    "<b>this is a </b><a><b>link</b> test</a>", instead of
  	    "<b>this is a <a>link</a></b><a> test</a>".
! */



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/aspx
	config.ascx, 1.1, 1.2 connector.aspx, 1.1, 1.2 upload.aspx, 1.1, 1.2
Message-ID: <20080505003528.D20D710FE28@qs1489.pair.com>

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

Modified Files:
	config.ascx connector.aspx upload.aspx 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: config.ascx
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/aspx/config.ascx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.ascx	9 Feb 2008 12:53:58 -0000	1.1
--- config.ascx	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <%--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <%--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 23,27 ****
  --%>
  <script runat="server">
! 	
  	/**
  	 * This function must check the user session to be sure that he/she is
--- 23,27 ----
  --%>
  <script runat="server">
! 
  	/**
  	 * This function must check the user session to be sure that he/she is
***************
*** 95,98 ****
  		TypeConfig[ "Media" ].QuickUploadAbsolutePath	= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%" );
  	}
! 	
  </script>
--- 95,98 ----
  		TypeConfig[ "Media" ].QuickUploadAbsolutePath	= ( UserFilesAbsolutePath == "" ? "" : "%UserFilesAbsolutePath%" );
  	}
! 
  </script>

Index: upload.aspx
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/aspx/upload.aspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.aspx	9 Feb 2008 12:53:58 -0000	1.1
--- upload.aspx	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  <%--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 3,7 ----
  <%--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,32 ****
   * http://www.fckeditor.net
  --%>
! <FCKeditor:Config id="Config" runat="server"></FCKeditor:Config>
\ No newline at end of file
--- 30,32 ----
   * http://www.fckeditor.net
  --%>
! <FCKeditor:Config id="Config" runat="server"></FCKeditor:Config>

Index: connector.aspx
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/aspx/connector.aspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.aspx	9 Feb 2008 12:53:58 -0000	1.1
--- connector.aspx	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  <%--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 3,7 ----
  <%--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,32 ****
   * http://www.fckeditor.net
  --%>
! <FCKeditor:Config id="Config" runat="server"></FCKeditor:Config>
\ No newline at end of file
--- 30,32 ----
   * http://www.fckeditor.net
  --%>
! <FCKeditor:Config id="Config" runat="server"></FCKeditor:Config>



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops
	fck_document_preview.html, 1.4, 1.5
Message-ID: <20080505003528.2BC2610FE1A@qs1489.pair.com>

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

Modified Files:
	fck_document_preview.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_document_preview.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_document_preview.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_document_preview.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_about/sponsors
	spellchecker_net.gif, NONE, 1.1
Message-ID: <20080505003530.EE5CC10FE78@qs1489.pair.com>

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

Added Files:
	spellchecker_net.gif 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

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



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm
	ImageObject.cfc, 1.1, 1.2 cf5_connector.cfm, 1.1,
	1.2 cf5_upload.cfm, 1.1, 1.2 cf_basexml.cfm, 1.1,
	1.2 cf_commands.cfm, 1.1, 1.2 cf_connector.cfm, 1.1,
	1.2 cf_io.cfm, 1.1, 1.2 cf_upload.cfm, 1.1, 1.2 cf_util.cfm,
	1.1, 1.2 config.cfm, 1.1, 1.2 connector.cfm, 1.1,
	1.2 image.cfc, 1.1, 1.2 upload.cfm, 1.1, 1.2
Message-ID: <20080505003529.0D7EB10FE29@qs1489.pair.com>

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

Modified 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:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: cf_connector.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_connector.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- cf_connector.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: image.cfc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/image.cfc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** image.cfc	9 Feb 2008 12:53:58 -0000	1.1
--- image.cfc	5 May 2008 00:35:25 -0000	1.2
***************
*** 1323,1325 ****
  
  </cfcomponent>
- 
--- 1323,1324 ----

Index: upload.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/upload.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- upload.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 29,31 ****
  <cfelse>
  	<cfinclude template="cf_upload.cfm">
! </cfif>
\ No newline at end of file
--- 29,31 ----
  <cfelse>
  	<cfinclude template="cf_upload.cfm">
! </cfif>

Index: ImageObject.cfc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImageObject.cfc	9 Feb 2008 12:53:58 -0000	1.1
--- ImageObject.cfc	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
  	ImageObject.cfc written by Rick Root (rick at webworksllc.com)
! 	
  	Related Web Sites:
  	- http://www.opensourcecf.com/imagecfc (home page)
--- 2,6 ----
  <!---
  	ImageObject.cfc written by Rick Root (rick at webworksllc.com)
! 
  	Related Web Sites:
  	- http://www.opensourcecf.com/imagecfc (home page)
***************
*** 33,64 ****
  	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.
  --->
--- 33,64 ----
  	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.
  --->
***************
*** 188,192 ****
  	</cfif>
  	<cfset imageCFC.setOption(key, val)>
! 	
  </cffunction>
  
--- 188,192 ----
  	</cfif>
  	<cfset imageCFC.setOption(key, val)>
! 
  </cffunction>
  

Index: connector.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/connector.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- connector.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 29,31 ****
  <cfelse>
  	<cfinclude template="cf_connector.cfm">
! </cfif>
\ No newline at end of file
--- 29,32 ----
  <cfelse>
  	<cfinclude template="cf_connector.cfm">
! </cfif>
! <cfabort>

Index: cf_commands.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_commands.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- cf_commands.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 33,36 ****
--- 33,37 ----
  	<cfset var sFileExt = "">
  	<cfset var sFileUrl = "">
+ 	<cfset var sTempDir = "">
  	<cfset var sTempFilePath = "">
  	<cfset var errorNumber = 0>
***************
*** 39,44 ****
  	<cfset var destination = "">
  
!     <cftry>
!         <cffile action="UPLOAD" filefield="NewFile" destination="#GetTempDirectory()#" nameconflict="makeunique" mode="0755" />
  		<cfset sTempFilePath = CFFILE.ServerDirectory & REQUEST.fs & CFFILE.ServerFile>
  
--- 40,54 ----
  	<cfset var destination = "">
  
! 	<cftry>
! 		<cfif isDefined( "REQUEST.Config.TempDirectory" )>
! 			<cfset sTempDir = REQUEST.Config.TempDirectory>
! 		<cfelse>
! 			<cfset sTempDir = GetTempDirectory()>
! 		</cfif>
! 		<cfif NOT DirectoryExists (sTempDir)>
! 			<cfthrow message="Invalid temporary directory: #sTempDir#">
! 		</cfif>
! 
! 		<cffile action="UPLOAD" filefield="NewFile" destination="#sTempDir#" nameconflict="makeunique" mode="0755" />
  		<cfset sTempFilePath = CFFILE.ServerDirectory & REQUEST.fs & CFFILE.ServerFile>
  
***************
*** 93,102 ****
  
   		<cfset destination = sServerDir & sFileName>
! <!---
! 		<cfdump var="#sTempFilePath#">
! 		<cfoutput ><br /></cfoutput>
! 		<cfdump var="#destination#">
! 		<cfabort>
!  --->
  		<cflock name="#destination#" timeout="30" type="Exclusive">
  		<cftry>
--- 103,107 ----
  
   		<cfset destination = sServerDir & sFileName>
! 
  		<cflock name="#destination#" timeout="30" type="Exclusive">
  		<cftry>
***************
*** 121,125 ****
  		</cfcatch>
  
!     </cftry>
  
  	<cfset SendUploadResults( errorNumber, sFileUrl, sFileName, customMsg ) >
--- 126,130 ----
  		</cfcatch>
  
! 	</cftry>
  
  	<cfset SendUploadResults( errorNumber, sFileUrl, sFileName, customMsg ) >

Index: config.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/config.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- config.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 27,31 ****
  
  	// SECURITY: You must explicitly enable this "connector". (Set enabled to "true")
! 	Config.Enabled = true ;
  
  	// Path to uploaded files relative to the document root.
--- 27,32 ----
  
  	// SECURITY: You must explicitly enable this "connector". (Set enabled to "true")
! 	Config.Enabled = false ;
! 
  
  	// Path to uploaded files relative to the document root.
***************
*** 57,60 ****
--- 58,66 ----
  	Config.HtmlExtensions					= "html,htm,xml,xsd,txt,js" ;
  
+ 	//Due to known issues with GetTempDirectory function, it is
+ 	//recommended to set this vairiable to a valid directory
+ 	//instead of using the GetTempDirectory function
+ 	//(used by MX 6.0 and above)
+ 	Config.TempDirectory = GetTempDirectory();
  
  //	Configuration settings for each Resource Type

Index: cf5_connector.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf5_connector.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- cf5_connector.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 130,134 ****
  	<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"" />">
--- 130,134 ----
  	<cfset xmlContent = "<Error number=""1"" text=""This connector is disabled. Please check the 'editor/filemanager/connectors/cfm/config.cfm' file"" />">
  
! <cfelseif find("..",url.currentFolder) or find("\",url.currentFolder)>
  
  	<cfset xmlContent = "<Error number=""102"" />">

Index: cf_io.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_io.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- cf_io.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 175,179 ****
  </cffunction>
  
! <cffunction name="GetCurrentFolder" returntype="String" output="false">
  	<cfset var sCurrentFolder = "/">
  
--- 175,179 ----
  </cffunction>
  
! <cffunction name="GetCurrentFolder" returntype="String" output="true">
  	<cfset var sCurrentFolder = "/">
  
***************
*** 194,198 ****
  	<cfset sCurrentFolder = rereplace( sCurrentFolder, "//+", "/", "all" )>
  
! 	<cfif find( "..", sCurrentFolder)>
  		<cfset SendError( 102, "" )>
  	</cfif>
--- 194,198 ----
  	<cfset sCurrentFolder = rereplace( sCurrentFolder, "//+", "/", "all" )>
  
! 	<cfif find( "..", sCurrentFolder) or find( "\", sCurrentFolder) >
  		<cfset SendError( 102, "" )>
  	</cfif>
***************
*** 205,210 ****
  
  	<!--- Do a cleanup of the folder name to avoid possible problems --->
! 	<!--- Remove . \ / | : ? * " < > --->
! 	<cfset sNewFolderName = rereplace( sNewFolderName, '\.+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+', "_", "all" )>
  
  	<cfreturn sNewFolderName>
--- 205,210 ----
  
  	<!--- Do a cleanup of the folder name to avoid possible problems --->
! 	<!--- Remove . \ / | : ? * " < > and control characters --->
! 	<cfset sNewFolderName = rereplace( sNewFolderName, '\.+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+|[[:cntrl:]]+', "_", "all" )>
  
  	<cfreturn sNewFolderName>
***************
*** 267,271 ****
  
  	<cfoutput>
! 		<script type="text/javascript">
  			window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" );
  		</script>
--- 267,302 ----
  
  	<cfoutput>
! <script type="text/javascript">
! (function()
! {
! 	var d = document.domain ;
! 
! 	while ( true )
! 	{
! 		// Test if we can access a parent property.
! 		try
! 		{
! 			var test = window.top.opener.document.domain ;
! 			break ;
! 		}
! 		catch( e ) {}
! 
! 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
! 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
! 
! 		if ( d.length == 0 )
! 			break ;		// It was not able to detect the domain.
! 
! 		try
! 		{
! 			document.domain = d ;
! 		}
! 		catch (e)
! 		{
! 			break ;
! 		}
! 	}
! })() ;
! 
  			window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" );
  		</script>
***************
*** 282,287 ****
  
  	<!--- Do a cleanup of the file name to avoid possible problems --->
! 	<!--- Remove \ / | : ? * " < > --->
! 	<cfset sNewFileName = rereplace( sNewFileName, '\\[.]+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+', "_", "all" )>
  
  	<cfreturn sNewFileName>
--- 313,318 ----
  
  	<!--- Do a cleanup of the file name to avoid possible problems --->
! 	<!--- Remove \ / | : ? * " < > and control characters --->
! 	<cfset sNewFileName = rereplace( sNewFileName, '\\[.]+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+|[[:cntrl:]]+', "_", "all" )>
  
  	<cfreturn sNewFileName>

Index: cf_basexml.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_basexml.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- cf_basexml.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 66,68 ****
  	<cfargument name="text" required="true">
  	<cfoutput><Error number="#ARGUMENTS.number#" text="#htmleditformat(ARGUMENTS.text)#" /></cfoutput>
! </cffunction>
\ No newline at end of file
--- 66,68 ----
  	<cfargument name="text" required="true">
  	<cfoutput><Error number="#ARGUMENTS.number#" text="#htmleditformat(ARGUMENTS.text)#" /></cfoutput>
! </cffunction>

Index: cf_upload.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_upload.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- cf_upload.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 34,37 ****
--- 34,43 ----
  <cfinclude template="cf_commands.cfm">
  
+ <cffunction name="SendError" returntype="void" output="true">
+ 	<cfargument name="number" required="true" type="Numeric">
+ 	<cfargument name="text" required="true">
+ 	<cfreturn SendUploadResults( "#ARGUMENTS.number#", "", "", "ARGUMENTS.text" )>
+ </cffunction>
+ 
  <cfset REQUEST.Config = Config>
  <cfif find( "/", getBaseTemplatePath() ) >
***************
*** 65,68 ****
  
  <cfset FileUpload( sType, sCurrentFolder, sCommand )>
- 
- 
--- 71,72 ----

Index: cf5_upload.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf5_upload.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- cf5_upload.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 48,51 ****
--- 48,83 ----
  	{
  		WriteOutput('<script type="text/javascript">');
+ 		WriteOutput("(function()"&
+ "{"&
+ "	var d = document.domain ;"&
+ ""&
+ "	while ( true )"&
+ "	{"&
+ 		// Test if we can access a parent property.
+ "		try"&
+ "		{"&
+ "			var test = window.top.opener.document.domain ;"&
+ "			break ;"&
+ "		}"&
+ "		catch( e ) {}"&
+ ""&
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ "		d = d.replace( /.*?(?:\.|$)/, '' ) ;"&
+ ""&
+ "		if ( d.length == 0 )"&
+ 			// It was not able to detect the domain.
+ "			break ;"&
+ ""&
+ "		try"&
+ "		{"&
+ "			document.domain = d ;"&
+ "		}"&
+ "		catch (e)"&
+ "		{"&
+ "			break ;"&
+ "		}"&
+ "	}"&
+ "})() ;");
+ 
  		WriteOutput('window.parent.OnUploadCompleted(' & errorNumber & ', "' & JSStringFormat(fileUrl) & '", "' & JSStringFormat(fileName) & '", "' & JSStringFormat(customMsg) & '");' );
  		WriteOutput('</script>');
***************
*** 68,72 ****
  </cfif>
  
! <cfif find( "..", url.currentFolder)>
  	<cfset SendUploadResults(102)>
  	<cfabort>
--- 100,104 ----
  </cfif>
  
! <cfif find( "..", url.currentFolder) or find( "\", url.currentFolder)>
  	<cfset SendUploadResults(102)>
  	<cfabort>
***************
*** 294,296 ****
  	<cfset SendUploadResults(errorNumber, '', '', customMsg)>
  	<cfabort>
! </cfif>
\ No newline at end of file
--- 326,328 ----
  	<cfset SendUploadResults(errorNumber, '', '', customMsg)>
  	<cfabort>
! </cfif>

Index: cf_util.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_util.cfm	9 Feb 2008 12:53:58 -0000	1.1
--- cf_util.cfm	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!---
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 130,132 ****
  	<cfreturn false>
  </cffunction>
- 
--- 130,131 ----



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_select
	fck_select.js, 1.5, 1.6
Message-ID: <20080505003528.728D510FE21@qs1489.pair.com>

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

Modified Files:
	fck_select.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_select.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_select/fck_select.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_select.js	9 Feb 2008 12:53:58 -0000	1.5
--- fck_select.js	5 May 2008 00:35:24 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 192,194 ****
  
  	return text ;
! }
\ No newline at end of file
--- 192,194 ----
  
  	return text ;
! }



From blaine at qs1489.pair.com  Sun May  4 20:35:29 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:29 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/lasso
	config.lasso, 1.1, 1.2 connector.lasso, 1.1, 1.2 upload.lasso,
	1.1, 1.2
Message-ID: <20080505003529.1AA3B10FE2A@qs1489.pair.com>

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

Modified Files:
	config.lasso connector.lasso upload.lasso 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: config.lasso
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/lasso/config.lasso,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.lasso	9 Feb 2008 12:53:58 -0000	1.1
--- config.lasso	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 63,65 ****
  		)
  	);
! ]
\ No newline at end of file
--- 63,65 ----
  		)
  	);
! ]

Index: connector.lasso
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/lasso/connector.lasso,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.lasso	9 Feb 2008 12:53:58 -0000	1.1
--- connector.lasso	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 56,59 ****
--- 56,118 ----
  	);
  
+ 	/*.....................................................................
+ 	Custom tag sets the HTML response.
+ 	*/
+ 
+ 	define_tag(
+ 		'htmlreply',
+ 		-namespace='fck_',
+ 		-priority='replace',
+ 		-required='uploadResult',
+ 		-optional='NewFilePath',
+ 		-type='string',
+ 		-description='Sets the HTML response for the FCKEditor File Upload feature.'
+ 	);
+ 		$__html_reply__ = '\
+ <script type="text/javascript">
+ (function()
+ {
+ 	var d = document.domain ;
+ 
+ 	while ( true )
+ 	{
+ 		// Test if we can access a parent property.
+ 		try
+ 		{
+ 			var test = window.top.opener.document.domain ;
+ 			break ;
+ 		}
+ 		catch( e ) {}
+ 
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 		d = d.replace( /.*?(?:\\.|$)/, "" ) ;
+ 
+ 		if ( d.length == 0 )
+ 			break ;		// It was not able to detect the domain.
+ 
+ 		try
+ 		{
+ 			document.domain = d ;
+ 		}
+ 		catch (e)
+ 		{
+ 			break ;
+ 		}
+ 	}
+ })() ;
+ ';
+ 			if($uploadResult == '0' || $uploadResult == '201');
+ 			$__html_reply__ = $__html_reply__ + '\
+ 	window.parent.OnUploadCompleted(' + $uploadResult + ',\'' + $NewFilePath + '\',\'' + $NewFilePath->split('/')->last + '\');
+ </script>
+ 			';
+ 			else;
+ 			$__html_reply__ = $__html_reply__ + '\
+ 	window.parent.OnUploadCompleted(' + $uploadResult + ');
+ </script>
+ 			';
+ 			/if;
+ 	/define_tag;
+ 
  
      /*.....................................................................
***************
*** 64,70 ****
  	var('currentFolderURL' = $ServerPath
  		+ $config->find('Subdirectories')->find(action_param('Type'))
! 		+ action_param('CurrentFolder')
  	);
  
  
      /*.....................................................................
--- 123,141 ----
  	var('currentFolderURL' = $ServerPath
  		+ $config->find('Subdirectories')->find(action_param('Type'))
! 		+ $CurrentFolder
  	);
  
+ 	if($CurrentFolder->(Find: '..') || $CurrentFolder->(Find: '\\'));
+ 		if($Command == 'FileUpload');
+ 			$responseType = 'html';
+ 			$uploadResult = '102';
+ 			fck_htmlreply(
+ 				-uploadResult=$uploadResult
+ 			);
+ 		else;
+ 			$errorNumber = 102;
+ 			$commandData += '<Error number="' + $errorNumber + '" />\n';
+ 		/if;
+ 	else;
  
      /*.....................................................................
***************
*** 111,114 ****
--- 182,186 ----
              */
  			case('CreateFolder');
+ 				$NewFolderName = (String_ReplaceRegExp: $NewFolderName, -find='\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>', -replace='_');
  				var('newFolder' = $currentFolderURL + $NewFolderName + '/');
  				file_create($newFolder);
***************
*** 149,153 ****
                  Was a file actually uploaded?
                  */
! 				file_uploads->size ? $NewFile = file_uploads->get(1) | $uploadResult = '202';
  
  				if($uploadResult == '0');
--- 221,229 ----
                  Was a file actually uploaded?
                  */
!                 if(file_uploads->size);
!                 	$NewFile = file_uploads->get(1);
!                 else;
!                 	$uploadResult = '202';
!                 /if;
  
  				if($uploadResult == '0');
***************
*** 158,164 ****
--- 234,242 ----
                      */
  					$NewFileName = $NewFile->find('OrigName');
+ 					$NewFileName = (String_ReplaceRegExp: $NewFileName, -find='\\\\|\\/|\\||\\:|\\?|\\*|"|<|>', -replace='_');
  					$OrigFilePath = $currentFolderURL + $NewFileName;
  					$NewFilePath = $OrigFilePath;
  					local('fileExtension') = '.' + $NewFile->find('OrigExtension');
+ 					#fileExtension = (String_ReplaceRegExp: #fileExtension, -find='\\\\|\\/|\\||\\:|\\?|\\*|"|<|>', -replace='_');
  					local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&;
  
***************
*** 192,220 ****
  								$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;
! 
  
      /*.....................................................................
--- 270,284 ----
  								$OrigFilePath != $NewFilePath ? $uploadResult = 201;
  							case;
! 								$uploadResult = file_currenterror( -errorcode);
  						/select;
  					/if;
  				/if;
! 				fck_htmlreply(
! 					-uploadResult=$uploadResult,
! 					-NewFilePath=$NewFilePath
! 				);
  		/select;
  	/inline;
! 	/if;
  
      /*.....................................................................
***************
*** 235,257 ****
  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;
  ]
--- 299,322 ----
  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 + '">';
! 
! 		if($errorNumber != '102');
! 			$__html_reply__ += '<CurrentFolder path="' + $CurrentFolder + '" url="' + $currentFolderURL + '" />';
! 		/if;
! 
! 		$__html_reply__ += $commandData + '
! </Connector>';
  	/if;
  ]

Index: upload.lasso
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/lasso/upload.lasso,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.lasso	9 Feb 2008 12:53:58 -0000	1.1
--- upload.lasso	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 57,61 ****
  	);
  
- 
  	/*.....................................................................
  	Custom tag sets the HTML response.
--- 57,60 ----
***************
*** 78,81 ****
--- 77,110 ----
  		$__html_reply__ = '\
  <script type="text/javascript">
+ (function()
+ {
+ 	var d = document.domain ;
+ 
+ 	while ( true )
+ 	{
+ 		// Test if we can access a parent property.
+ 		try
+ 		{
+ 			var test = window.top.opener.document.domain ;
+ 			break ;
+ 		}
+ 		catch( e ) {}
+ 
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 		d = d.replace( /.*?(?:\\.|$)/, "" ) ;
+ 
+ 		if ( d.length == 0 )
+ 			break ;		// It was not able to detect the domain.
+ 
+ 		try
+ 		{
+ 			document.domain = d ;
+ 		}
+ 		catch (e)
+ 		{
+ 			break ;
+ 		}
+ 	}
+ })() ;
  	window.parent.OnUploadCompleted(' + #errorNumber + ',"'
  		+ string_replace(#fileUrl, -find='"', -replace='\\"') + '","'
***************
*** 86,89 ****
--- 115,121 ----
  	/define_tag;
  
+ 	if($CurrentFolder->(Find: '..') || $CurrentFolder->(Find: '\\'));
+ 		$errorNumber = 102;
+ 	/if;
  
  	if($config->find('Enabled'));
***************
*** 95,99 ****
  			Was a file actually uploaded?
  			*/
! 			file_uploads->size ? $NewFile = file_uploads->get(1) | $errorNumber = 202;
  
  			if($errorNumber == 0);
--- 127,133 ----
  			Was a file actually uploaded?
  			*/
! 			if($errorNumber != '102');
! 				file_uploads->size ? $NewFile = file_uploads->get(1) | $errorNumber = 202;
! 			/if;
  
  			if($errorNumber == 0);



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode/_sample
	sample.config.js, 1.1, 1.2 sample.html, 1.1, 1.2
Message-ID: <20080505003530.6A68E10FE17@qs1489.pair.com>

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

Modified Files:
	sample.config.js sample.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: sample.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode/_sample/sample.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sample.html	9 Feb 2008 12:53:59 -0000	1.1
--- sample.html	5 May 2008 00:35:26 -0000	1.2
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: sample.config.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/bbcode/_sample/sample.config.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sample.config.js	9 Feb 2008 12:53:59 -0000	1.1
--- sample.config.js	5 May 2008 00:35:26 -0000	1.2
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:29 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:29 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl
	basexml.pl, 1.1, 1.2 commands.pl, 1.1, 1.2 connector.cgi, 1.1,
	1.2 io.pl, 1.1, 1.2 upload.cgi, 1.1, 1.2 upload_fck.pl, 1.1,
	1.2 util.pl, 1.1, 1.2
Message-ID: <20080505003529.94E3B10FE2B@qs1489.pair.com>

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

Modified Files:
	basexml.pl commands.pl connector.cgi io.pl upload.cgi 
	upload_fck.pl util.pl 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: upload.cgi
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/upload.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.cgi	9 Feb 2008 12:53:59 -0000	1.1
--- upload.cgi	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2007 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
--- 3,7 ----
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2008 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
***************
*** 105,109 ****
  
  	# Check for invalid folder paths (..)
! 	if ( $sCurrentFolder =~ /\.\./ ) {
  		SendError( 102, "" ) ;
  	}
--- 105,109 ----
  
  	# Check for invalid folder paths (..)
! 	if ( $sCurrentFolder =~ /(?:\.\.|\\)/ ) {
  		SendError( 102, "" ) ;
  	}
***************
*** 116,118 ****
  
  }
- 
--- 116,117 ----

Index: commands.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/commands.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** commands.pl	9 Feb 2008 12:53:59 -0000	1.1
--- commands.pl	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2007 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
--- 1,5 ----
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2008 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
***************
*** 92,95 ****
--- 92,96 ----
  	if($FORM{'NewFolderName'} ne "") {
  		$sNewFolderName = $FORM{'NewFolderName'};
+ 		$sNewFolderName =~ s/\.|\\|\/|\||\:|\?|\*|\"|<|>|[[:cntrl:]]/_/g;
  		# Map the virtual path to the local server path of the current folder.
  		$sServerDir = &ServerMapFolder($resourceType, $currentFolder);
***************
*** 129,132 ****
--- 130,134 ----
  		# Get the uploaded file name.
  		$sFileName = $new_fname;
+ 		$sFileName =~ s/\\|\/|\||\:|\?|\*|\"|<|>|[[:cntrl:]]/_/g;
  		$sOriginalFileName = $sFileName;
  
***************
*** 141,145 ****
  			} else {
  				copy("$img_dir/$new_fname","$sFilePath");
! 				chmod(0777,$sFilePath);
  				unlink("$img_dir/$new_fname");
  				last;
--- 143,156 ----
  			} else {
  				copy("$img_dir/$new_fname","$sFilePath");
! 				if (defined $CHMOD_ON_UPLOAD) {
! 					if ($CHMOD_ON_UPLOAD) {
! 						umask(000);
! 						chmod($CHMOD_ON_UPLOAD,$sFilePath);
! 					}
! 				}
! 				else {
! 					umask(000);
! 					chmod(0777,$sFilePath);
! 				}
  				unlink("$img_dir/$new_fname");
  				last;
***************
*** 159,164 ****
  	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>';
--- 170,210 ----
  	local($sErrorNumber, $sFileUrl, $sFileName, $customMsg) = @_;
  
! 	print <<EOF;
! Content-type: text/html
! 
! <script type="text/javascript">
! // Automatically detect the correct document.domain (#1919).
! (function()
! {
! 	var d = document.domain ;
! 
! 	while ( true )
! 	{
! 		// Test if we can access a parent property.
! 		try
! 		{
! 			var test = window.top.opener.document.domain ;
! 			break ;
! 		}
! 		catch( e ) {}
! 
! 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
! 		d = d.replace( /.*?(?:\\.|\$)/, '' ) ;
! 
! 		if ( d.length == 0 )
! 			break ;		// It was not able to detect the domain.
! 
! 		try
! 		{
! 			document.domain = d ;
! 		}
! 		catch (e)
! 		{
! 			break ;
! 		}
! 	}
! })() ;
! 
! EOF
  	print 'window.parent.OnUploadCompleted(' . $sErrorNumber . ',"' . JS_cnv($sFileUrl) . '","' . JS_cnv($sFileName) . '","' . JS_cnv($customMsg) . '") ;';
  	print '</script>';

Index: connector.cgi
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/connector.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.cgi	9 Feb 2008 12:53:59 -0000	1.1
--- connector.cgi	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2007 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
--- 3,7 ----
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2008 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
***************
*** 102,106 ****
  
  	# Check for invalid folder paths (..)
! 	if ( $sCurrentFolder =~ /\.\./ ) {
  		SendError( 102, "" ) ;
  	}
--- 102,106 ----
  
  	# Check for invalid folder paths (..)
! 	if ( $sCurrentFolder =~ /(?:\.\.|\\)/ ) {
  		SendError( 102, "" ) ;
  	}
***************
*** 135,137 ****
  	exit ;
  }
- 
--- 135,136 ----

Index: upload_fck.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload_fck.pl	9 Feb 2008 12:53:59 -0000	1.1
--- upload_fck.pl	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2007 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
--- 1,5 ----
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2008 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
***************
*** 29,32 ****
--- 29,42 ----
  $MAX_CONTENT_SIZE =  30000;
  
+ # After file is uploaded, sometimes it is required to change its permissions
+ # so that it was possible to access it at the later time.
+ # If possible, it is recommended to set more restrictive permissions, like 0755.
+ # Set to 0 to disable this feature.
+ $CHMOD_ON_UPLOAD = 0777;
+ 
+ # See comments above.
+ # Used when creating folders that does not exist.
+ $CHMOD_ON_FOLDER_CREATE = 0755;
+ 
  # Filelock (1=use,0=not use)
  $PM{'flock'}		= '1';
***************
*** 125,131 ****
  	my ($FORM) = @_;
  
! 
! 	mkdir($img_dir,0777);
! 	chmod(0777,$img_dir);
  
  	undef $img_data_exists;
--- 135,150 ----
  	my ($FORM) = @_;
  
! 	if (defined $CHMOD_ON_FOLDER_CREATE && !$CHMOD_ON_FOLDER_CREATE) {
! 		mkdir("$img_dir");
! 	}
! 	else {
! 		umask(000);
! 		if (defined $CHMOD_ON_FOLDER_CREATE) {
! 			mkdir("$img_dir",$CHMOD_ON_FOLDER_CREATE);
! 		}
! 		else {
! 			mkdir("$img_dir",0777);
! 		}
! 	}
  
  	undef $img_data_exists;

Index: util.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/util.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** util.pl	9 Feb 2008 12:53:59 -0000	1.1
--- util.pl	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2007 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
--- 1,5 ----
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2008 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==

Index: io.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/io.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** io.pl	9 Feb 2008 12:53:59 -0000	1.1
--- io.pl	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2007 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
--- 1,5 ----
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2008 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
***************
*** 88,94 ****
  	}
  	if(!(-e $folderPath)) {
! 		umask(000);
! 		mkdir("$folderPath",0777);
! 		chmod(0777,"$folderPath");
  		return(0);
  	} else {
--- 88,104 ----
  	}
  	if(!(-e $folderPath)) {
! 		if (defined $CHMOD_ON_FOLDER_CREATE && !$CHMOD_ON_FOLDER_CREATE) {
! 			mkdir("$folderPath");
! 		}
! 		else {
! 			umask(000);
! 			if (defined $CHMOD_ON_FOLDER_CREATE) {
! 				mkdir("$folderPath",$CHMOD_ON_FOLDER_CREATE);
! 			}
! 			else {
! 				mkdir("$folderPath",0777);
! 			}
! 		}
! 
  		return(0);
  	} else {

Index: basexml.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/basexml.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** basexml.pl	9 Feb 2008 12:53:59 -0000	1.1
--- basexml.pl	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2007 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
--- 1,5 ----
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2008 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:29 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:29 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php
	basexml.php, 1.1, 1.2 commands.php, 1.1, 1.2 config.php, 1.1,
	1.2 connector.php, 1.1, 1.2 io.php, 1.1, 1.2 upload.php, 1.1,
	1.2 util.php, 1.1, 1.2
Message-ID: <20080505003529.9566310FE2C@qs1489.pair.com>

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

Modified Files:
	basexml.php commands.php config.php connector.php io.php 
	upload.php util.php 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: connector.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/connector.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.php	9 Feb 2008 12:53:59 -0000	1.1
--- connector.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 50,55 ****
  	$sCurrentFolder	= GetCurrentFolder() ;
  
! 	// Check if it is an allowed command 
! 	if ( ! IsAllowedCommand( $sCommand ) ) 
  		SendError( 1, 'The "' . $sCommand . '" command isn\'t allowed' ) ;
  
--- 50,55 ----
  	$sCurrentFolder	= GetCurrentFolder() ;
  
! 	// Check if it is an allowed command
! 	if ( ! IsAllowedCommand( $sCommand ) )
  		SendError( 1, 'The "' . $sCommand . '" command isn\'t allowed' ) ;
  
***************
*** 85,87 ****
  	exit ;
  }
! ?>
\ No newline at end of file
--- 85,87 ----
  	exit ;
  }
! ?>

Index: commands.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/commands.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** commands.php	9 Feb 2008 12:53:59 -0000	1.1
--- commands.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 185,197 ****
  		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' ;
--- 185,198 ----
  		if ( isset( $Config['SecureImageUploads'] ) )
  		{
! 			if ( ( $isImageValid = IsImageValid( $oFile['tmp_name'], $sExtension ) ) === false )
  			{
  				$sErrorNumber = '202' ;
  			}
  		}
! 
  		if ( isset( $Config['HtmlExtensions'] ) )
  		{
! 			if ( !IsHtmlExtension( $sExtension, $Config['HtmlExtensions'] ) &&
! 				( $detectHtml = DetectHtml( $oFile['tmp_name'] ) ) === true )
  			{
  				$sErrorNumber = '202' ;
***************
*** 220,225 ****
  					if ( is_file( $sFilePath ) )
  					{
  						$oldumask = umask(0) ;
! 						chmod( $sFilePath, 0777 ) ;
  						umask( $oldumask ) ;
  					}
--- 221,238 ----
  					if ( is_file( $sFilePath ) )
  					{
+ 						if ( isset( $Config['ChmodOnUpload'] ) && !$Config['ChmodOnUpload'] )
+ 						{
+ 							break ;
+ 						}
+ 
+ 						$permissions = 0777;
+ 
+ 						if ( isset( $Config['ChmodOnUpload'] ) && $Config['ChmodOnUpload'] )
+ 						{
+ 							$permissions = $Config['ChmodOnUpload'] ;
+ 						}
+ 
  						$oldumask = umask(0) ;
! 						chmod( $sFilePath, $permissions ) ;
  						umask( $oldumask ) ;
  					}
***************
*** 228,231 ****
--- 241,259 ----
  				}
  			}
+ 
+ 			if ( file_exists( $sFilePath ) )
+ 			{
+ 				//previous checks failed, try once again
+ 				if ( isset( $isImageValid ) && $isImageValid === -1 && IsImageValid( $sFilePath, $sExtension ) === false )
+ 				{
+ 					@unlink( $sFilePath ) ;
+ 					$sErrorNumber = '202' ;
+ 				}
+ 				else if ( isset( $detectHtml ) && $detectHtml === -1 && DetectHtml( $sFilePath ) === true )
+ 				{
+ 					@unlink( $sFilePath ) ;
+ 					$sErrorNumber = '202' ;
+ 				}
+ 			}
  		}
  		else
***************
*** 243,245 ****
  	exit ;
  }
! ?>
\ No newline at end of file
--- 271,273 ----
  	exit ;
  }
! ?>

Index: upload.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/upload.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.php	9 Feb 2008 12:53:59 -0000	1.1
--- upload.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 44,51 ****
  $sType = isset( $_GET['Type'] ) ? $_GET['Type'] : 'File' ;
  
! $sCurrentFolder	= GetCurrentFolder() ; 
  
  // Is enabled the upload?
! if ( ! IsAllowedCommand( $sCommand ) ) 
  	SendUploadResults( '1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed' ) ;
  
--- 44,51 ----
  $sType = isset( $_GET['Type'] ) ? $_GET['Type'] : 'File' ;
  
! $sCurrentFolder	= GetCurrentFolder() ;
  
  // Is enabled the upload?
! if ( ! IsAllowedCommand( $sCommand ) )
  	SendUploadResults( '1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed' ) ;
  
***************
*** 57,59 ****
  FileUpload( $sType, $sCurrentFolder, $sCommand )
  
! ?>
\ No newline at end of file
--- 57,59 ----
  FileUpload( $sType, $sCurrentFolder, $sCommand )
  
! ?>

Index: basexml.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/basexml.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** basexml.php	9 Feb 2008 12:53:59 -0000	1.1
--- basexml.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 67,71 ****
  {
  	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
! 	{ 
  		SendErrorNode( $number, $text ) ;
  		CreateXmlFooter() ;
--- 67,71 ----
  {
  	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
! 	{
  		SendErrorNode( $number, $text ) ;
  		CreateXmlFooter() ;
***************
*** 79,85 ****
  
  		echo '<Connector>' ;
! 		
  		SendErrorNode( $number, $text ) ;
! 		
  		echo '</Connector>' ;
  	}
--- 79,85 ----
  
  		echo '<Connector>' ;
! 
  		SendErrorNode( $number, $text ) ;
! 
  		echo '</Connector>' ;
  	}
***************
*** 91,93 ****
  	echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
  }
! ?>
\ No newline at end of file
--- 91,93 ----
  	echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
  }
! ?>

Index: config.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/config.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.php	9 Feb 2008 12:53:59 -0000	1.1
--- config.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 49,60 ****
  $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') ;
  
--- 49,60 ----
  $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') ;
  
***************
*** 63,66 ****
--- 63,77 ----
  $Config['HtmlExtensions'] = array("html", "htm", "xml", "xsd", "txt", "js") ;
  
+ // After file is uploaded, sometimes it is required to change its permissions
+ // so that it was possible to access it at the later time.
+ // If possible, it is recommended to set more restrictive permissions, like 0755.
+ // Set to 0 to disable this feature.
+ // Note: not needed on Windows-based servers.
+ $Config['ChmodOnUpload'] = 0777 ;
+ 
+ // See comments above.
+ // Used when creating folders that does not exist.
+ $Config['ChmodOnFolderCreate'] = 0777 ;
+ 
  /*
  	Configuration settings for each Resource Type
***************
*** 124,128 ****
  $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'] ;
--- 135,139 ----
  $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'] ;
***************
*** 131,135 ****
  $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'] ;
--- 142,146 ----
  $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'] ;
***************
*** 138,142 ****
  $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'] ;
--- 149,153 ----
  $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'] ;

Index: util.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/util.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** util.php	9 Feb 2008 12:53:59 -0000	1.1
--- util.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 35,41 ****
  }
  
  function ConvertToXmlAttribute( $value )
  {
! 	if ( defined( 'PHP_OS' ) ) 
  	{
  		$os = PHP_OS ;
--- 35,64 ----
  }
  
+ function FindBadUtf8( $string )
+ {
+ 	$regex =
+ 	'([\x00-\x7F]'.
+ 	'|[\xC2-\xDF][\x80-\xBF]'.
+ 	'|\xE0[\xA0-\xBF][\x80-\xBF]'.
+ 	'|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
+ 	'|\xED[\x80-\x9F][\x80-\xBF]'.
+ 	'|\xF0[\x90-\xBF][\x80-\xBF]{2}'.
+ 	'|[\xF1-\xF3][\x80-\xBF]{3}'.
+ 	'|\xF4[\x80-\x8F][\x80-\xBF]{2}'.
+ 	'|(.{1}))';
+ 
+ 	while (preg_match('/'.$regex.'/S', $string, $matches)) {
+ 		if ( isset($matches[2])) {
+ 			return true;
+ 		}
+ 		$string = substr($string, strlen($matches[0]));
+ 	}
+ 
+ 	return false;
+ }
+ 
  function ConvertToXmlAttribute( $value )
  {
! 	if ( defined( 'PHP_OS' ) )
  	{
  		$os = PHP_OS ;
***************
*** 45,57 ****
  		$os = php_uname() ;
  	}
! 	
! 	if ( strtoupper( substr( $os, 0, 3 ) ) === 'WIN' ) 
  	{
  		return ( utf8_encode( htmlspecialchars( $value ) ) ) ;
! 	} 
! 	else 
  	{
  		return ( htmlspecialchars( $value ) ) ;
! 	}	
  }
  
--- 68,80 ----
  		$os = php_uname() ;
  	}
! 
! 	if ( strtoupper( substr( $os, 0, 3 ) ) === 'WIN' || FindBadUtf8( $value ) )
  	{
  		return ( utf8_encode( htmlspecialchars( $value ) ) ) ;
! 	}
! 	else
  	{
  		return ( htmlspecialchars( $value ) ) ;
! 	}
  }
  
***************
*** 78,97 ****
  
  /**
!  * 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 ;
--- 101,128 ----
  
  /**
!  * 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' ) ;
! 
! 	//open_basedir restriction, see #1906
! 	if ( $fp === false || !flock( $fp, LOCK_SH ) )
! 	{
! 		return -1 ;
! 	}
! 
  	$chunk = fread( $fp, 1024 ) ;
+ 	flock( $fp, LOCK_UN ) ;
  	fclose( $fp ) ;
  
  	$chunk = strtolower( $chunk ) ;
  
! 	if (!$chunk)
  	{
  		return false ;
***************
*** 100,113 ****
  	$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 ;
--- 131,144 ----
  	$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 ;
***************
*** 116,120 ****
  
  	//type = javascript
! 	if ( preg_match( '!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk ) ) 
  	{
  		return true ;
--- 147,151 ----
  
  	//type = javascript
! 	if ( preg_match( '!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk ) )
  	{
  		return true ;
***************
*** 128,139 ****
  		return true ;
  	}
! 	
  	//url(javascript
! 	if ( preg_match( '!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk ) ) 
  	{
  		return true ;
! 	}			
  
! 	return false ;	
  }
  
--- 159,170 ----
  		return true ;
  	}
! 
  	//url(javascript
! 	if ( preg_match( '!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk ) )
  	{
  		return true ;
! 	}
  
! 	return false ;
  }
  
***************
*** 142,153 ****
   * 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');
  
--- 173,188 ----
   * 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 )
  {
+ 	if (!@is_readable($filePath)) {
+ 		return -1;
+ 	}
+ 
  	$imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'swf', 'psd', 'bmp', 'iff');
  
***************
*** 171,185 ****
  		}
  	}
! 	
  	if ( !in_array( $extension, $imageCheckExtensions ) ) {
  		return true;
  	}
! 	
  	if ( @getimagesize( $filePath ) === false ) {
  		return false ;
! 	}		
! 	
  	return true;
  }
  
! ?>
\ No newline at end of file
--- 206,220 ----
  		}
  	}
! 
  	if ( !in_array( $extension, $imageCheckExtensions ) ) {
  		return true;
  	}
! 
  	if ( @getimagesize( $filePath ) === false ) {
  		return false ;
! 	}
! 
  	return true;
  }
  
! ?>

Index: io.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/io.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** io.php	9 Feb 2008 12:53:59 -0000	1.1
--- io.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,34 ****
  	global $Config ;
  
! 	if ( $sCommand == "QuickUpload") 
  		return $Config['QuickUploadPath'][$resourceType] ;
  	else
--- 30,34 ----
  	global $Config ;
  
! 	if ( $sCommand == "QuickUpload")
  		return $Config['QuickUploadPath'][$resourceType] ;
  	else
***************
*** 39,43 ****
  {
  	global $Config ;
! 	if ( $sCommand == "QuickUpload") 
  	{
  		if ( strlen( $Config['QuickUploadAbsolutePath'][$resourceType] ) > 0 )
--- 39,43 ----
  {
  	global $Config ;
! 	if ( $sCommand == "QuickUpload")
  	{
  		if ( strlen( $Config['QuickUploadAbsolutePath'][$resourceType] ) > 0 )
***************
*** 89,92 ****
--- 89,93 ----
  function CreateServerFolder( $folderPath, $lastFolder = null )
  {
+ 	global $Config ;
  	$sParent = GetParentFolder( $folderPath ) ;
  
***************
*** 104,108 ****
  			return "Can't create $folderPath directory" ;
  		}
! 		
  		$sErrorMsg = CreateServerFolder( $sParent, $folderPath ) ;
  		if ( $sErrorMsg != '' )
--- 105,109 ----
  			return "Can't create $folderPath directory" ;
  		}
! 
  		$sErrorMsg = CreateServerFolder( $sParent, $folderPath ) ;
  		if ( $sErrorMsg != '' )
***************
*** 119,126 ****
  		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 ;
--- 120,139 ----
  		ini_set( 'track_errors', '1' ) ;
  
! 		if ( isset( $Config['ChmodOnFolderCreate'] ) && !$Config['ChmodOnFolderCreate'] )
! 		{
! 			mkdir( $folderPath ) ;
! 		}
! 		else
! 		{
! 			$permissions = 0777 ;
! 			if ( isset( $Config['ChmodOnFolderCreate'] ) )
! 			{
! 				$permissions = $Config['ChmodOnFolderCreate'] ;
! 			}
! 			// To create the folder with 0777 permissions, we need to set umask to zero.
! 			$oldumask = umask(0) ;
! 			mkdir( $folderPath, $permissions ) ;
! 			umask( $oldumask ) ;
! 		}
  
  		$sErrorMsg = $php_errormsg ;
***************
*** 138,144 ****
  function GetRootPath()
  {
!     if (!isset($_SERVER)) {
!         global $_SERVER;
!     }
  	$sRealPath = realpath( './' ) ;
  
--- 151,157 ----
  function GetRootPath()
  {
! 	if (!isset($_SERVER)) {
! 		global $_SERVER;
! 	}
  	$sRealPath = realpath( './' ) ;
  
***************
*** 147,151 ****
  
  	$sSelfPath = str_replace( '/', DIRECTORY_SEPARATOR, $sSelfPath ) ;
! 	
  	$position = strpos( $sRealPath, $sSelfPath ) ;
  
--- 160,164 ----
  
  	$sSelfPath = str_replace( '/', DIRECTORY_SEPARATOR, $sSelfPath ) ;
! 
  	$position = strpos( $sRealPath, $sSelfPath ) ;
  
***************
*** 181,188 ****
  	$arDenied	= $Config['DeniedExtensions'][$resourceType] ;
  
! 	if ( count($arAllowed) > 0 && !in_array( $sExtension, $arAllowed ) ) 
  		return false ;
  
! 	if ( count($arDenied) > 0 && in_array( $sExtension, $arDenied ) ) 
  		return false ;
  
--- 194,201 ----
  	$arDenied	= $Config['DeniedExtensions'][$resourceType] ;
  
! 	if ( count($arAllowed) > 0 && !in_array( $sExtension, $arAllowed ) )
  		return false ;
  
! 	if ( count($arDenied) > 0 && in_array( $sExtension, $arDenied ) )
  		return false ;
  
***************
*** 195,199 ****
  	if ( !in_array( $resourceType, $Config['ConfigAllowedTypes'] ) )
  		return false ;
! 	
  	return true ;
  }
--- 208,212 ----
  	if ( !in_array( $resourceType, $Config['ConfigAllowedTypes'] ) )
  		return false ;
! 
  	return true ;
  }
***************
*** 205,209 ****
  	if ( !in_array( $sCommand, $Config['ConfigAllowedCommands'] ) )
  		return false ;
! 	
  	return true ;
  }
--- 218,222 ----
  	if ( !in_array( $sCommand, $Config['ConfigAllowedCommands'] ) )
  		return false ;
! 
  	return true ;
  }
***************
*** 211,222 ****
  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
--- 224,237 ----
  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 ( !preg_match( '|/$|', $sCurrentFolder ) )
! 		$sCurrentFolder .= '/' ;
! 	if ( strpos( $sCurrentFolder, '/' ) !== 0 )
! 		$sCurrentFolder = '/' . $sCurrentFolder ;
  
  	// Ensure the folder path has no double-slashes
***************
*** 226,230 ****
  
  	// Check for invalid folder paths (..)
! 	if ( strpos( $sCurrentFolder, '..' ) )
  		SendError( 102, '' ) ;
  
--- 241,245 ----
  
  	// Check for invalid folder paths (..)
! 	if ( strpos( $sCurrentFolder, '..' ) || strpos( $sCurrentFolder, "\\" ))
  		SendError( 102, '' ) ;
  
***************
*** 238,242 ****
  
  	// Remove . \ / | : ? * " < >
! 	$sNewFolderName = preg_replace( '/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>/', '_', $sNewFolderName ) ;
  
  	return $sNewFolderName ;
--- 253,257 ----
  
  	// Remove . \ / | : ? * " < >
! 	$sNewFolderName = preg_replace( '/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFolderName ) ;
  
  	return $sNewFolderName ;
***************
*** 255,259 ****
  
  	// Remove \ / | : ? * " < >
! 	$sNewFileName = preg_replace( '/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>/', '_', $sNewFileName ) ;
  
  	return $sNewFileName ;
--- 270,274 ----
  
  	// Remove \ / | : ? * " < >
! 	$sNewFileName = preg_replace( '/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName ) ;
  
  	return $sNewFileName ;
***************
*** 263,267 ****
  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 ) . '") ;' ;
--- 278,315 ----
  function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' )
  {
! 	echo <<<EOF
! <script type="text/javascript">
! (function()
! {
! 	var d = document.domain ;
! 
! 	while ( true )
! 	{
! 		// Test if we can access a parent property.
! 		try
! 		{
! 			var test = window.top.opener.document.domain ;
! 			break ;
! 		}
! 		catch( e ) {}
! 
! 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
! 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
! 
! 		if ( d.length == 0 )
! 			break ;		// It was not able to detect the domain.
! 
! 		try
! 		{
! 			document.domain = d ;
! 		}
! 		catch (e)
! 		{
! 			break ;
! 		}
! 	}
! })() ;
! 
! EOF;
  	$rpl = array( '\\' => '\\\\', '"' => '\\"' ) ;
  	echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr( $fileUrl, $rpl ) . '","' . strtr( $fileName, $rpl ) . '", "' . strtr( $customMsg, $rpl ) . '") ;' ;
***************
*** 270,272 ****
  }
  
! ?>
\ No newline at end of file
--- 318,320 ----
  }
  
! ?>



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder
	fck_placeholder.html, 1.5, 1.6 fckplugin.js, 1.5, 1.6
Message-ID: <20080505003530.9056F10FE6A@qs1489.pair.com>

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

Modified Files:
	fck_placeholder.html fckplugin.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckplugin.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/fckplugin.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fckplugin.js	9 Feb 2008 12:54:00 -0000	1.5
--- fckplugin.js	5 May 2008 00:35:26 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 23,27 ****
  
  // Register the related command.
! FCKCommands.RegisterCommand( 'Placeholder', new FCKDialogCommand( 'Placeholder', FCKLang.PlaceholderDlgTitle, FCKPlugins.Items['placeholder'].Path + 'fck_placeholder.html', 340, 170 ) ) ;
  
  // Create the "Plaholder" toolbar button.
--- 23,27 ----
  
  // Register the related command.
! FCKCommands.RegisterCommand( 'Placeholder', new FCKDialogCommand( 'Placeholder', FCKLang.PlaceholderDlgTitle, FCKPlugins.Items['placeholder'].Path + 'fck_placeholder.html', 340, 160 ) ) ;
  
  // Create the "Plaholder" toolbar button.
***************
*** 185,187 ****
  
  	return node ;
! }
\ No newline at end of file
--- 185,187 ----
  
  	return node ;
! }

Index: fck_placeholder.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/fck_placeholder.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fck_placeholder.html	9 Feb 2008 12:54:00 -0000	1.5
--- fck_placeholder.html	5 May 2008 00:35:26 -0000	1.6
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 27,33 ****
  		<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 ;
--- 27,35 ----
  		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  		<meta content="noindex, nofollow" name="robots">
+ 		<script src="../../dialog/common/fck_dialog_common.js" type="text/javascript"></script>
  		<script language="javascript">
  
! var dialog = window.parent ;
! var oEditor = dialog.InnerDialogLoaded() ;
  var FCKLang = oEditor.FCKLang ;
  var FCKPlaceholders = oEditor.FCKPlaceholders ;
***************
*** 41,48 ****
  
  	// Show the "Ok" button.
! 	window.parent.SetOkButton( true ) ;
  }
  
! var eSelected = oEditor.FCKSelection.GetSelectedElement() ;
  
  function LoadSelected()
--- 43,53 ----
  
  	// Show the "Ok" button.
! 	dialog.SetOkButton( true ) ;
! 
! 	// Select text field on load.
! 	SelectField( 'txtName' ) ;
  }
  
! var eSelected = dialog.Selection.GetSelectedElement() ;
  
  function LoadSelected()
***************
*** 98,100 ****
  		</table>
  	</body>
! </html>
\ No newline at end of file
--- 103,105 ----
  		</table>
  	</body>
! </html>



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/dragresizetable
	fckplugin.js, 1.1, 1.2
Message-ID: <20080505003530.8D80110FE1B@qs1489.pair.com>

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

Modified Files:
	fckplugin.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckplugin.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/dragresizetable/fckplugin.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckplugin.js	9 Feb 2008 12:53:59 -0000	1.1
--- fckplugin.js	5 May 2008 00:35:26 -0000	1.2
***************
*** 11,14 ****
--- 11,15 ----
  	"_LastX" : null,
  	"_TableMap" : null,
+ 	"_doc" : document,
  	"_IsInsideNode" : function( w, domNode, pos )
  	{
***************
*** 100,104 ****
  		// Calculate maximum and minimum x-coordinate delta.
  		var borderIndex = FCKDragTableHandler._GetResizeBarPosition() ;
! 		var offset = FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
  		var table = FCKTools.GetElementAscensor( FCKDragTableHandler._LeftCell, "table" );
  		var minX = null ;
--- 101,105 ----
  		// Calculate maximum and minimum x-coordinate delta.
  		var borderIndex = FCKDragTableHandler._GetResizeBarPosition() ;
! 		var offset = FCKDragTableHandler._GetIframeOffset();
  		var table = FCKTools.GetElementAscensor( FCKDragTableHandler._LeftCell, "table" );
  		var minX = null ;
***************
*** 308,314 ****
  		var mouseX = evt.clientX ;
  		var mouseY = evt.clientY ;
! 		if ( node.ownerDocument == document )
  		{
! 			var offset = FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
  			mouseX -= offset.x ;
  			mouseY -= offset.y ;
--- 309,315 ----
  		var mouseX = evt.clientX ;
  		var mouseY = evt.clientY ;
! 		if ( FCKTools.GetElementDocument( node ) == document )
  		{
! 			var offset = this._GetIframeOffset() ;
  			mouseX -= offset.x ;
  			mouseY -= offset.y ;
***************
*** 372,378 ****
  		// Convert mouse coordinates in reference to the outer iframe.
  		var node = evt.srcElement || evt.target ;
! 		if ( node.ownerDocument == FCK.EditorDocument )
  		{
! 			var offset = FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
  			mouse.x += offset.x ;
  			mouse.y += offset.y ;
--- 373,379 ----
  		// Convert mouse coordinates in reference to the outer iframe.
  		var node = evt.srcElement || evt.target ;
! 		if ( FCKTools.GetElementDocument( node ) == FCK.EditorDocument )
  		{
! 			var offset = this._GetIframeOffset() ;
  			mouse.x += offset.x ;
  			mouse.y += offset.y ;
***************
*** 393,397 ****
  		if ( this._ResizeBar == null )
  		{
! 			this._ResizeBar = document.createElement( "div" ) ;
  			var paddingBar = this._ResizeBar ;
  			var paddingStyles = { 'position' : 'absolute', 'cursor' : 'e-resize' } ;
--- 394,398 ----
  		if ( this._ResizeBar == null )
  		{
! 			this._ResizeBar = this._doc.createElement( "div" ) ;
  			var paddingBar = this._ResizeBar ;
  			var paddingStyles = { 'position' : 'absolute', 'cursor' : 'e-resize' } ;
***************
*** 401,405 ****
  				paddingStyles.opacity = 0.10 ;
  			FCKDomTools.SetElementStyles( paddingBar, paddingStyles ) ;
! 			document.body.appendChild( paddingBar ) ;
  			FCKTools.AddEventListener( paddingBar, "mousemove", this._ResizeBarMouseMoveListener ) ;
  			FCKTools.AddEventListener( paddingBar, "mousedown", this._ResizeBarMouseDownListener ) ;
--- 402,408 ----
  				paddingStyles.opacity = 0.10 ;
  			FCKDomTools.SetElementStyles( paddingBar, paddingStyles ) ;
! 			this._avoidStyles( paddingBar );
! 			paddingBar.setAttribute('_fcktemp', true);
! 			this._doc.body.appendChild( paddingBar ) ;
  			FCKTools.AddEventListener( paddingBar, "mousemove", this._ResizeBarMouseMoveListener ) ;
  			FCKTools.AddEventListener( paddingBar, "mousedown", this._ResizeBarMouseDownListener ) ;
***************
*** 409,413 ****
  			// IE doesn't let the tranparent part of the padding block to receive mouse events unless there's something inside.
  			// So we need to create a spacer image to fill the block up.
! 			var filler = document.createElement( "img" ) ;
  			filler.border = 0 ;
  			filler.src = FCKConfig.BasePath + "images/spacer.gif" ;
--- 412,417 ----
  			// IE doesn't let the tranparent part of the padding block to receive mouse events unless there's something inside.
  			// So we need to create a spacer image to fill the block up.
! 			var filler = this._doc.createElement( "img" ) ;
! 			filler.setAttribute('_fcktemp', true);
  			filler.border = 0 ;
  			filler.src = FCKConfig.BasePath + "images/spacer.gif" ;
***************
*** 430,435 ****
  
  		var paddingBar = this._ResizeBar ;
! 		var offset = FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
! 		var tablePos = FCKTools.GetWindowPosition( w, table ) ;
  		var barHeight = table.offsetHeight ;
  		var barTop = offset.y + tablePos.y ;
--- 434,439 ----
  
  		var paddingBar = this._ResizeBar ;
! 		var offset = this._GetIframeOffset() ;
! 		var tablePos = this._GetTablePosition( w, table ) ;
  		var barHeight = table.offsetHeight ;
  		var barTop = offset.y + tablePos.y ;
***************
*** 472,476 ****
  		if ( paddingBar.getElementsByTagName( "div" ).length < 1 )
  		{
! 			visibleBar = document.createElement( "div" ) ;
  			paddingBar.appendChild( visibleBar ) ;
  		}
--- 476,482 ----
  		if ( paddingBar.getElementsByTagName( "div" ).length < 1 )
  		{
! 			visibleBar = this._doc.createElement( "div" ) ;
! 			this._avoidStyles( visibleBar );
! 			visibleBar.setAttribute('_fcktemp', true);
  			paddingBar.appendChild( visibleBar ) ;
  		}
***************
*** 498,502 ****
--- 504,526 ----
  					left	: '-100000px'
  				} ) ;
+ 	},
+ 	"_GetIframeOffset" : function ()
+ 	{
+ 		return FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
+ 	},
+ 	"_GetTablePosition" : function ( w, table )
+ 	{
+ 		return FCKTools.GetWindowPosition( w, table ) ;
+ 	},
+ 	"_avoidStyles" : function( element )
+ 	{
+ 		FCKDomTools.SetElementStyles( element,
+ 			{
+ 				padding		: '0',
+ 				backgroundImage	: 'none',
+ 				border		: '0'
+ 			} ) ;
  	}
+ 
  };
  



From blaine at qs1489.pair.com  Sun May  4 20:35:29 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:29 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py
	config.py, 1.1, 1.2 connector.py, 1.1, 1.2 fckcommands.py, 1.1,
	1.2 fckconnector.py, 1.1, 1.2 fckoutput.py, 1.1,
	1.2 fckutil.py, 1.1, 1.2 htaccess.txt, 1.1, 1.2 upload.py, 1.1,
	1.2 wsgi.py, 1.1, 1.2 zope.py, 1.1, 1.2
Message-ID: <20080505003529.B50F810FE2E@qs1489.pair.com>

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

Modified Files:
	config.py connector.py fckcommands.py fckconnector.py 
	fckoutput.py fckutil.py htaccess.txt upload.py wsgi.py zope.py 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: config.py
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/config.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.py	9 Feb 2008 12:53:59 -0000	1.1
--- config.py	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  """
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  """
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 20,31 ****
   * == 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
--- 20,31 ----
   * == 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
***************
*** 33,50 ****
  #                        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
--- 33,50 ----
  #                        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
***************
*** 54,68 ****
  # 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"
--- 54,79 ----
  # 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']
! 
! # After file is uploaded, sometimes it is required to change its permissions
! # so that it was possible to access it at the later time.
! # If possible, it is recommended to set more restrictive permissions, like 0755.
! # Set to 0 to disable this feature.
! # Note: not needed on Windows-based servers.
! ChmodOnUpload = 0755
! 
! # See comments above.
! # Used when creating folders that does not exist.
! ChmodOnFolderCreate = 0755
  
  # Do not touch this 3 lines, see "Configuration settings for each Resource Type"
***************
*** 73,79 ****
  #	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.
  #
--- 84,90 ----
  #	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.
  #
***************
*** 82,92 ****
  #
  #	- 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.
--- 93,103 ----
  #
  #	- 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.
***************
*** 95,106 ****
  #
  #	- 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.
--- 106,117 ----
  #
  #	- 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.
***************
*** 109,113 ****
  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']
--- 120,124 ----
  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']
***************
*** 116,120 ****
  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']
--- 127,131 ----
  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']

Index: zope.py
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/zope.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** zope.py	9 Feb 2008 12:53:59 -0000	1.1
--- zope.py	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2007 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
--- 3,7 ----
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2008 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
***************
*** 24,29 ****
  
  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.
  
--- 24,29 ----
  
  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.
  
***************
*** 49,53 ****
  		self.context = context
  		self.request = FCKeditorRequest(context)
! 	
  	def getZopeRootContext(self):
  		if self.zopeRootContext is None:
--- 49,53 ----
  		self.context = context
  		self.request = FCKeditorRequest(context)
! 
  	def getZopeRootContext(self):
  		if self.zopeRootContext is None:
***************
*** 187,189 ****
  return connector.FCKeditorConnectorZope(context=context).doResponse()
  """
- 
--- 187,188 ----

Index: upload.py
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/upload.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.py	9 Feb 2008 12:53:59 -0000	1.1
--- upload.py	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2007 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
--- 3,7 ----
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2008 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
***************
*** 32,37 ****
  
  class FCKeditorQuickUpload(	FCKeditorConnectorBase,
! 							UploadFileCommandMixin, 
! 							BaseHttpMixin, BaseHtmlMixin):	
  	def doResponse(self):
  		"Main function. Process the request, set headers and return a string as response."
--- 32,37 ----
  
  class FCKeditorQuickUpload(	FCKeditorConnectorBase,
! 							UploadFileCommandMixin,
! 							BaseHttpMixin, BaseHtmlMixin):
  	def doResponse(self):
  		"Main function. Process the request, set headers and return a string as response."
***************
*** 49,70 ****
  		# 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
--- 49,70 ----
  		# 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
***************
*** 80,84 ****
  			if not header is None:
  				print '%s: %s' % header
! 		print 
  		print data
  	except:
--- 80,84 ----
  			if not header is None:
  				print '%s: %s' % header
! 		print
  		print data
  	except:

Index: connector.py
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/connector.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.py	9 Feb 2008 12:53:59 -0000	1.1
--- connector.py	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2007 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
--- 3,7 ----
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2008 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
***************
*** 38,42 ****
  							GetFoldersAndFilesCommandMixin,
  							CreateFolderCommandMixin,
! 							UploadFileCommandMixin, 
  							BaseHttpMixin, BaseXmlMixin, BaseHtmlMixin  ):
  	"The Standard connector class."
--- 38,42 ----
  							GetFoldersAndFilesCommandMixin,
  							CreateFolderCommandMixin,
! 							UploadFileCommandMixin,
  							BaseHttpMixin, BaseXmlMixin, BaseHtmlMixin  ):
  	"The Standard connector class."
***************
*** 58,84 ****
  		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. ")
--- 58,84 ----
  		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. ")
***************
*** 87,94 ****
  		if (command == "FileUpload"):
  			return self.uploadFile(resourceType, currentFolder)
! 		
  		# Create Url
  		url = combinePaths( self.webUserFilesFolder, currentFolder )
! 		
  		# Begin XML
  		s += self.createXmlHeader(command, resourceType, currentFolder, url)
--- 87,94 ----
  		if (command == "FileUpload"):
  			return self.uploadFile(resourceType, currentFolder)
! 
  		# Create Url
  		url = combinePaths( self.webUserFilesFolder, currentFolder )
! 
  		# Begin XML
  		s += self.createXmlHeader(command, resourceType, currentFolder, url)
***************
*** 100,105 ****
  		s += selector[command](resourceType, currentFolder)
  		s += self.createXmlFooter()
! 		return s	
! 	
  # Running from command line (plain old CGI)
  if __name__ == '__main__':
--- 100,105 ----
  		s += selector[command](resourceType, currentFolder)
  		s += self.createXmlFooter()
! 		return s
! 
  # Running from command line (plain old CGI)
  if __name__ == '__main__':
***************
*** 110,114 ****
  		for header in conn.headers:
  			print '%s: %s' % header
! 		print 
  		print data
  	except:
--- 110,114 ----
  		for header in conn.headers:
  			print '%s: %s' % header
! 		print
  		print data
  	except:

Index: fckcommands.py
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/fckcommands.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckcommands.py	9 Feb 2008 12:53:59 -0000	1.1
--- fckcommands.py	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2007 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
--- 3,7 ----
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2008 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
***************
*** 101,105 ****
  						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
--- 101,105 ----
  						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
***************
*** 111,117 ****
  		"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):
--- 111,126 ----
  		"Purpose: physically creates a folder on the server"
  		# No need to check if the parent exists, just create all hierachy
! 
! 		try:
! 			permissions = Config.ChmodOnFolderCreate
! 			if not permissions:
! 				os.makedirs(folderPath)
! 		except AttributeError: #ChmodOnFolderCreate undefined
! 			permissions = 0755
! 
! 		if permissions:
! 			oldumask = os.umask(0)
! 			os.makedirs(folderPath,mode=0755)
! 			os.umask( oldumask )
  
  class UploadFileCommandMixin (object):
***************
*** 126,130 ****
  			# Get the file name
  			newFileName = newFile.filename
! 			newFileName = sanitizeFileName( newFileName ) 
  			newFileNameOnly = removeExtension(newFileName)
  			newFileExtension = getExtension(newFileName).lower()
--- 135,139 ----
  			# Get the file name
  			newFileName = newFile.filename
! 			newFileName = sanitizeFileName( newFileName )
  			newFileNameOnly = removeExtension(newFileName)
  			newFileExtension = getExtension(newFileName).lower()
***************
*** 169,175 ****
  
  						if os.path.exists ( newFilePath ):
! 							oldumask = os.umask(0) 
! 							os.chmod( newFilePath, 0755 ) 
! 							os.umask( oldumask ) 
  
  						newFileUrl = self.webUserFilesFolder + currentFolder + newFileName
--- 178,192 ----
  
  						if os.path.exists ( newFilePath ):
! 							doChmod = False
! 							try:
! 								doChmod = Config.ChmodOnUpload
! 								permissions = Config.ChmodOnUpload
! 							except AttributeError: #ChmodOnUpload undefined
! 								doChmod = True
! 								permissions = 0755
! 							if ( doChmod ):
! 								oldumask = os.umask(0)
! 								os.chmod( newFilePath, permissions )
! 								os.umask( oldumask )
  
  						newFileUrl = self.webUserFilesFolder + currentFolder + newFileName

Index: wsgi.py
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/wsgi.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wsgi.py	9 Feb 2008 12:53:59 -0000	1.1
--- wsgi.py	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2007 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
--- 3,7 ----
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2008 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
***************
*** 34,38 ****
  
  # Running from WSGI capable server (recomended)
! def App(environ, start_response): 
  	"WSGI entry point. Run the connector"
  	if environ['SCRIPT_NAME'].endswith("connector.py"):
--- 34,38 ----
  
  # Running from WSGI capable server (recomended)
! def App(environ, start_response):
  	"WSGI entry point. Run the connector"
  	if environ['SCRIPT_NAME'].endswith("connector.py"):
***************
*** 55,58 ****
  		start_response("500 Internal Server Error",[("Content-type","text/html")])
  		file = StringIO()
! 		cgitb.Hook(file = file).handle()    
  		yield file.getvalue()
--- 55,58 ----
  		start_response("500 Internal Server Error",[("Content-type","text/html")])
  		file = StringIO()
! 		cgitb.Hook(file = file).handle()
  		yield file.getvalue()

Index: fckconnector.py
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/fckconnector.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckconnector.py	9 Feb 2008 12:53:59 -0000	1.1
--- fckconnector.py	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2007 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
--- 3,7 ----
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2008 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
***************
*** 39,43 ****
  		"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
--- 39,43 ----
  		"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

Index: htaccess.txt
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/htaccess.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** htaccess.txt	9 Feb 2008 12:53:59 -0000	1.1
--- htaccess.txt	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,3 ****
! # replace the name of this file to .htaccess (if using apache), 
  # and set the proper options and paths according your enviroment
  
--- 1,3 ----
! # replace the name of this file to .htaccess (if using apache),
  # and set the proper options and paths according your enviroment
  
***************
*** 20,23 ****
  
  # Plain old CGI
! #Options +ExecCGI 
  #AddHandler cgi-script py
--- 20,23 ----
  
  # Plain old CGI
! #Options +ExecCGI
  #AddHandler cgi-script py

Index: fckoutput.py
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/fckoutput.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckoutput.py	9 Feb 2008 12:53:59 -0000	1.1
--- fckoutput.py	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2007 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
--- 3,7 ----
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2008 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
***************
*** 54,63 ****
  		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.
--- 54,63 ----
  		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.
***************
*** 94,98 ****
  				self.sendErrorNode (number, text) +
  				"""</Connector>""" )
! 		
  	def sendErrorNode(self, number, text):
  		return """<Error number="%s" text="%s" />""" % (number, convertToXmlAttribute(text))
--- 94,98 ----
  				self.sendErrorNode (number, text) +
  				"""</Connector>""" )
! 
  	def sendErrorNode(self, number, text):
  		return """<Error number="%s" text="%s" />""" % (number, convertToXmlAttribute(text))
***************
*** 103,111 ****
  		"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 ( '"', '\\"' ),
! 			}
\ No newline at end of file
--- 103,142 ----
  		"This is the function that sends the results of the uploading process"
  		return """<script type="text/javascript">
! 			(function()
! 			{
! 				var d = document.domain ;
! 
! 				while ( true )
! 				{
! 					// Test if we can access a parent property.
! 					try
! 					{
! 						var test = window.top.opener.document.domain ;
! 						break ;
! 					}
! 					catch( e ) {}
! 
! 					// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
! 					d = d.replace( /.*?(?:\.|$)/, '' ) ;
! 
! 					if ( d.length == 0 )
! 						break ;		// It was not able to detect the domain.
! 
! 					try
! 					{
! 						document.domain = d ;
! 					}
! 					catch (e)
! 					{
! 						break ;
! 					}
! 				}
! 			})() ;
! 
! 			window.parent.OnUploadCompleted(%(errorNumber)s,"%(fileUrl)s","%(fileName)s","%(customMsg)s");
  			</script>""" % {
  			'errorNumber': errorNo,
  			'fileUrl': fileUrl.replace ('"', '\\"'),
! 			'fileName': fileName.replace ( '"', '\\"' ) ,
  			'customMsg': customMsg.replace ( '"', '\\"' ),
! 			}

Index: fckutil.py
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/fckutil.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckutil.py	9 Feb 2008 12:53:59 -0000	1.1
--- fckutil.py	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2007 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
--- 3,7 ----
  """
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2008 Frederico Caldeira Knabben
  
  == BEGIN LICENSE ==
***************
*** 21,25 ****
  == END LICENSE ==
  
! Utility functions for the File Manager Connector for Python 
  
  """
--- 21,25 ----
  == END LICENSE ==
  
! Utility functions for the File Manager Connector for Python
  
  """
***************
*** 50,57 ****
  
  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)
--- 50,57 ----
  
  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)
***************
*** 62,67 ****
  def sanitizeFolderName( newFolderName ):
  	"Do a cleanup of the folder name to avoid possible problems"
! 	# Remove . \ / | : ? *
! 	return re.sub( '\\.|\\\\|\\/|\\||\\:|\\?|\\*', '_', newFolderName )
  
  def sanitizeFileName( newFileName ):
--- 62,67 ----
  def sanitizeFolderName( newFolderName ):
  	"Do a cleanup of the folder name to avoid possible problems"
! 	# Remove . \ / | : ? * " < > and control characters
! 	return re.sub( '(?u)\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[^\u0000-\u001f\u007f-\u009f]', '_', newFolderName )
  
  def sanitizeFileName( newFileName ):
***************
*** 73,81 ****
  	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).
--- 73,81 ----
  	newFileName = os.path.basename (newFileName)	# strip directories
  	# Remove \ / | : ? *
! 	return re.sub ( '(?u)/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[^\u0000-\u001f\u007f-\u009f]/', '_', newFileName )
  
  def getCurrentFolder(currentFolder):
! 	if not currentFolder:
! 		currentFolder = '/'
  
  	# Check the current folder syntax (must begin and end with a slash).
***************
*** 84,97 ****
  	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):
--- 84,97 ----
  	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 or '\\' in currentFolder:
  		return None
  
! 	return currentFolder
  
  def mapServerPath( environ, url):
***************
*** 102,106 ****
  
  def mapServerFolder(resourceTypePath, folderPath):
! 	return combinePaths ( resourceTypePath  , folderPath ) 
  
  def getRootPath(environ):
--- 102,106 ----
  
  def mapServerFolder(resourceTypePath, folderPath):
! 	return combinePaths ( resourceTypePath  , folderPath )
  
  def getRootPath(environ):
***************
*** 112,127 ****
  		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 ]
- 
--- 112,126 ----
  		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  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/tablecommands
	fckplugin.js, 1.4, 1.5
Message-ID: <20080505003530.B686D10FE6E@qs1489.pair.com>

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

Modified Files:
	fckplugin.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckplugin.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/tablecommands/fckplugin.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckplugin.js	9 Feb 2008 12:54:01 -0000	1.4
--- fckplugin.js	5 May 2008 00:35:26 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/lang
	es.js, NONE, 1.1 de.js, 1.4, 1.5 en.js, 1.5, 1.6 fr.js, 1.5,
	1.6 it.js, 1.5, 1.6 pl.js, 1.3, 1.4
Message-ID: <20080505003530.9706A10FE6B@qs1489.pair.com>

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

Modified Files:
	de.js en.js fr.js it.js pl.js 
Added Files:
	es.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: de.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/lang/de.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** de.js	9 Feb 2008 12:54:00 -0000	1.4
--- de.js	5 May 2008 00:35:26 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 25,27 ****
  FCKLang.PlaceholderDlgName		= 'Platzhalter Name' ;
  FCKLang.PlaceholderErrNoName	= 'Bitte den Namen des Platzhalters schreiben' ;
! FCKLang.PlaceholderErrNameInUse	= 'Der angegebene Namen ist schon in Gebrauch' ;
\ No newline at end of file
--- 25,27 ----
  FCKLang.PlaceholderDlgName		= 'Platzhalter Name' ;
  FCKLang.PlaceholderErrNoName	= 'Bitte den Namen des Platzhalters schreiben' ;
! FCKLang.PlaceholderErrNameInUse	= 'Der angegebene Namen ist schon in Gebrauch' ;

Index: en.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/lang/en.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** en.js	9 Feb 2008 12:54:00 -0000	1.5
--- en.js	5 May 2008 00:35:26 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 25,27 ****
  FCKLang.PlaceholderDlgName		= 'Placeholder Name' ;
  FCKLang.PlaceholderErrNoName	= 'Please type the placeholder name' ;
! FCKLang.PlaceholderErrNameInUse	= 'The specified name is already in use' ;
\ No newline at end of file
--- 25,27 ----
  FCKLang.PlaceholderDlgName		= 'Placeholder Name' ;
  FCKLang.PlaceholderErrNoName	= 'Please type the placeholder name' ;
! FCKLang.PlaceholderErrNameInUse	= 'The specified name is already in use' ;

Index: fr.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/lang/fr.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fr.js	9 Feb 2008 12:54:00 -0000	1.5
--- fr.js	5 May 2008 00:35:26 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

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

Index: pl.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/lang/pl.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pl.js	9 Feb 2008 12:54:00 -0000	1.3
--- pl.js	5 May 2008 00:35:26 -0000	1.4
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 25,27 ****
  FCKLang.PlaceholderDlgName		= 'Nazwa nag????wka' ;
  FCKLang.PlaceholderErrNoName	= 'Prosz?? wprowadzi?? nazw?? nag????wka' ;
! FCKLang.PlaceholderErrNameInUse	= 'Podana nazwa jest ju?? w u??yciu' ;
\ No newline at end of file
--- 25,27 ----
  FCKLang.PlaceholderDlgName		= 'Nazwa nag????wka' ;
  FCKLang.PlaceholderErrNoName	= 'Prosz?? wprowadzi?? nazw?? nag????wka' ;
! FCKLang.PlaceholderErrNameInUse	= 'Podana nazwa jest ju?? w u??yciu' ;

Index: it.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/placeholder/lang/it.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** it.js	9 Feb 2008 12:54:00 -0000	1.5
--- it.js	5 May 2008 00:35:26 -0000	1.6
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/default/images
	dialog.sides.gif, NONE, 1.1 dialog.sides.png, NONE,
	1.1 dialog.sides.rtl.png, NONE, 1.1 sprites.gif, NONE,
	1.1 sprites.png, NONE, 1.1
Message-ID: <20080505003530.C0A0F10FE74@qs1489.pair.com>

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

Added Files:
	dialog.sides.gif dialog.sides.png dialog.sides.rtl.png 
	sprites.gif sprites.png 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

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

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

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

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

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



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/silver/images
	dialog.sides.gif, NONE, 1.1 dialog.sides.png, NONE,
	1.1 dialog.sides.rtl.png, NONE, 1.1 sprites.gif, NONE,
	1.1 sprites.png, NONE, 1.1
Message-ID: <20080505003530.ECAF310FE76@qs1489.pair.com>

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

Added Files:
	dialog.sides.gif dialog.sides.png dialog.sides.rtl.png 
	sprites.gif sprites.png 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

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

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

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

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

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



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/skins/silver
	fck_dialog_ie6.js, NONE, 1.1 fck_dialog.css, 1.4,
	1.5 fck_editor.css, 1.6, 1.7
Message-ID: <20080505003530.E20B410FE1D@qs1489.pair.com>

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

Modified Files:
	fck_dialog.css fck_editor.css 
Added Files:
	fck_dialog_ie6.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

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

Index: fck_editor.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/silver/fck_editor.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_editor.css	9 Feb 2008 12:54:01 -0000	1.6
--- fck_editor.css	5 May 2008 00:35:26 -0000	1.7
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 419,423 ****
  }
  
! .SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption
  {
      opacity: 0.30; /* Safari, Opera and Mozilla */
--- 419,423 ----
  }
  
! .SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
  {
      opacity: 0.30; /* Safari, Opera and Mozilla */

Index: fck_dialog.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/silver/fck_dialog.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_dialog.css	9 Feb 2008 12:54:01 -0000	1.4
--- fck_dialog.css	5 May 2008 00:35:26 -0000	1.5
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 22,30 ****
   */
  
! body
  {
  	margin: 0px;
  	padding: 10px;
- 	background-color: #f7f7f7;
  }
  
--- 22,35 ----
   */
  
! html, body
  {
+ 	background-color: transparent;
  	margin: 0px;
+ 	padding: 0px;
+ }
+ 
+ body
+ {
  	padding: 10px;
  }
  
***************
*** 42,63 ****
  .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;
--- 47,77 ----
  .PopupBody
  {
! 	height: 100%;
! 	width: 100%;
! 	overflow: hidden;
! 	background-color: transparent;
  	padding: 0px;
  }
  
+ #header
+ {
+ 	cursor: move;
+ }
+ 
  .PopupTitle
  {
  	font-weight: bold;
  	font-size: 14pt;
  	color: #504845;
  	background-color: #dedede;
+ 	padding: 3px 10px 3px 10px;
  }
  
  .PopupButtons
  {
+ 	position: absolute;
+ 	right: 0px;
+ 	left: 0px;
+ 	bottom: 0px;
  	border-top: #cec6b5 1px solid;
  	background-color: #DEDEDE;
***************
*** 79,83 ****
  .DarkBackground
  {
! 	background-color: #d7d79f;
  }
  
--- 93,97 ----
  .DarkBackground
  {
! 	background-color: #f2f2f2;
  }
  
***************
*** 138,143 ****
  }
  
! #tdBrowse 
  {
  	vertical-align: bottom;
! }
\ No newline at end of file
--- 152,402 ----
  }
  
! #tdBrowse
  {
  	vertical-align: bottom;
! }
! 
! /**
!  * Dialog frame related styles.
!  */
! 
! .contents
! {
! 	position: absolute;
! 	top: 2px;
! 	left: 16px;
! 	right: 16px;
! 	bottom: 20px;
! 	background-color: #f7f7f7;
! 	overflow: hidden;
! 	z-index: 1;
! }
! 
! .tl, .tr, .tc, .bl, .br, .bc
! {
! 	position: absolute;
! 	background-image: url(images/sprites.png);
! 	background-repeat: no-repeat;
! }
! 
! * html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
! {
! 	background-image: url(images/sprites.gif);
! }
! 
! .ml, .mr
! {
! 	position: absolute;
! 	background-image: url(images/dialog.sides.png);
! 	background-repeat: repeat-y;
! }
! 
! * html .ml, * html .mr
! {
! 	background-image: url(images/dialog.sides.gif);
! }
! 
! .rtl .ml, .rtl .mr
! {
! 	position: absolute;
! 	background-image: url(images/dialog.sides.rtl.png);
! 	background-repeat: repeat-y;
! }
! 
! * html .rtl .ml, * html .rtl .mr
! {
! 	background-image: url(images/dialog.sides.gif);
! }
! 
! .tl
! {
! 	top: 0px;
! 	left: 0px;
! 	width: 16px;
! 	height: 16px;
! 	background-position: -16px -16px;
! }
! 
! .rtl .tl
! {
! 	background-position: -16px -397px;
! }
! 
! .tr
! {
! 	top: 0px;
! 	right: 0px;
! 	width: 16px;
! 	height: 16px;
! 	background-position: -16px -76px;
! }
! 
! .rtl .tr
! {
! 	background-position: -16px -457px;
! }
! 
! .tc
! {
! 	top: 0px;
! 	right: 16px;
! 	left: 16px;
! 	height: 16px;
! 	background-position: 0px -136px;
! 	background-repeat: repeat-x;
! }
! 
! .ml
! {
! 	top: 16px;
! 	left: 0px;
! 	width: 16px;
! 	bottom: 51px;
! 	background-position: 0px 0px;
! }
! 
! .mr
! {
! 	top: 16px;
! 	right: 0px;
! 	width: 16px;
! 	bottom: 51px;
! 	background-position: -16px 0px;
! }
! 
! .bl
! {
! 	bottom: 0px;
! 	left: 0px;
! 	width: 30px;
! 	height: 51px;
! 	background-position: -16px -196px;
! }
! 
! .rtl .bl
! {
! 	background-position: -16px -517px;
! }
! 
! .br
! {
! 	bottom: 0px;
! 	right: 0px;
! 	width: 30px;
! 	height: 51px;
! 	background-position: -16px -263px;
! }
! 
! .rtl .br
! {
! 	background-position: -16px -584px;
! }
! 
! .bc
! {
! 	bottom: 0px;
! 	right: 30px;
! 	left: 30px;
! 	height: 51px;
! 	background-position: 0px -330px;
! 	background-repeat: repeat-x;
! }
! 
! /* For IE6. Do not change it. */
! * html .blocker
! {
! 	position: absolute;
! 	width: 100%;
! 	height: 100%;
! 	z-index: 12;
! 	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
! }
! 
! /* The layer used to cover the dialog when opening a child dialog. */
! .cover
! {
! 	position: absolute;
! 	top: 0px;
! 	left: 14px;
! 	right: 14px;
! 	bottom: 18px;
! 	z-index: 11;
! }
! 
! #closeButton
! {
! 	position: absolute;
! 	right: 0px;
! 	top: 0px;
! 	margin-top: 5px;
! 	margin-right: 10px;
! 	width: 20px;
! 	height: 20px;
! 	cursor: pointer;
! 	background-image: url(images/sprites.png);
! 	background-repeat: no-repeat;
! 	background-position: -16px -651px;
! }
! 
! * html #closeButton
! {
! 	cursor: hand;
! 	background-image: url(images/sprites.gif);
! }
! 
! .rtl #closeButton
! {
! 	right: auto;
! 	left: 10px;
! 	margin-right: 0px;
! }
! 
! #closeButton:hover
! {
! 	background-position: -16px -687px;
! }
! 
! #throbberBlock
! {
! 	z-index: 10;
! }
! 
! #throbberBlock div
! {
! 	float: left;
! 	width: 8px;
! 	height: 9px;
! 	margin-left: 2px;
! 	margin-right: 2px;
! 	font-size: 1px;	/* IE6 */
! }
! 
! /*
! 	Color Gradient Generator:
! 	http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4
! */
! 
! .throbber_1
! {
! 	background-color: #504845;
! }
! 
! .throbber_2
! {
! 	background-color: #736D6B;
! }
! 
! .throbber_3
! {
! 	background-color: #979391;
! }
! 
! .throbber_4
! {
! 	background-color: #BAB8B7;
! }
! 
! .throbber_5
! {
! 	background-color: #DEDEDE;
! }



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/autogrow
	fckplugin.js, 1.4, 1.5
Message-ID: <20080505003530.6B4BE10FE18@qs1489.pair.com>

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

Modified Files:
	fckplugin.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckplugin.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/autogrow/fckplugin.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckplugin.js	9 Feb 2008 12:53:59 -0000	1.4
--- fckplugin.js	5 May 2008 00:35:26 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 64,67 ****
--- 64,74 ----
  
  		window.frameElement.height = iMainFrameSize ;
+ 
+ 		// Gecko browsers use an onresize handler to update the innermost
+ 		// IFRAME's height. If the document is modified before the onresize
+ 		// is triggered, the plugin will miscalculate the new height. Thus,
+ 		// forcibly trigger onresize. #1336
+ 		if ( typeof window.onresize == 'function' )
+ 			window.onresize() ;
  	}
  }
***************
*** 90,92 ****
  }
  
! FCK.Events.AttachEvent( 'OnStatusChange', FCKAutoGrow_CheckEditorStatus ) ;
\ No newline at end of file
--- 97,99 ----
  }
  
! FCK.Events.AttachEvent( 'OnStatusChange', FCKAutoGrow_CheckEditorStatus ) ;



From blaine at qs1489.pair.com  Sun May  4 20:35:29 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:29 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php
	basexml.php, 1.1, 1.2 commands.php, 1.1, 1.2 config.php, 1.1,
	1.2 connector.php, 1.1, 1.2 io.php, 1.1, 1.2 upload.php, 1.1,
	1.2 util.php, 1.1, 1.2
Message-ID: <20080505003529.9566310FE2C@qs1489.pair.com>

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

Modified Files:
	basexml.php commands.php config.php connector.php io.php 
	upload.php util.php 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: connector.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/connector.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.php	9 Feb 2008 12:53:59 -0000	1.1
--- connector.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 50,55 ****
  	$sCurrentFolder	= GetCurrentFolder() ;
  
! 	// Check if it is an allowed command 
! 	if ( ! IsAllowedCommand( $sCommand ) ) 
  		SendError( 1, 'The "' . $sCommand . '" command isn\'t allowed' ) ;
  
--- 50,55 ----
  	$sCurrentFolder	= GetCurrentFolder() ;
  
! 	// Check if it is an allowed command
! 	if ( ! IsAllowedCommand( $sCommand ) )
  		SendError( 1, 'The "' . $sCommand . '" command isn\'t allowed' ) ;
  
***************
*** 85,87 ****
  	exit ;
  }
! ?>
\ No newline at end of file
--- 85,87 ----
  	exit ;
  }
! ?>

Index: commands.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/commands.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** commands.php	9 Feb 2008 12:53:59 -0000	1.1
--- commands.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 185,197 ****
  		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' ;
--- 185,198 ----
  		if ( isset( $Config['SecureImageUploads'] ) )
  		{
! 			if ( ( $isImageValid = IsImageValid( $oFile['tmp_name'], $sExtension ) ) === false )
  			{
  				$sErrorNumber = '202' ;
  			}
  		}
! 
  		if ( isset( $Config['HtmlExtensions'] ) )
  		{
! 			if ( !IsHtmlExtension( $sExtension, $Config['HtmlExtensions'] ) &&
! 				( $detectHtml = DetectHtml( $oFile['tmp_name'] ) ) === true )
  			{
  				$sErrorNumber = '202' ;
***************
*** 220,225 ****
  					if ( is_file( $sFilePath ) )
  					{
  						$oldumask = umask(0) ;
! 						chmod( $sFilePath, 0777 ) ;
  						umask( $oldumask ) ;
  					}
--- 221,238 ----
  					if ( is_file( $sFilePath ) )
  					{
+ 						if ( isset( $Config['ChmodOnUpload'] ) && !$Config['ChmodOnUpload'] )
+ 						{
+ 							break ;
+ 						}
+ 
+ 						$permissions = 0777;
+ 
+ 						if ( isset( $Config['ChmodOnUpload'] ) && $Config['ChmodOnUpload'] )
+ 						{
+ 							$permissions = $Config['ChmodOnUpload'] ;
+ 						}
+ 
  						$oldumask = umask(0) ;
! 						chmod( $sFilePath, $permissions ) ;
  						umask( $oldumask ) ;
  					}
***************
*** 228,231 ****
--- 241,259 ----
  				}
  			}
+ 
+ 			if ( file_exists( $sFilePath ) )
+ 			{
+ 				//previous checks failed, try once again
+ 				if ( isset( $isImageValid ) && $isImageValid === -1 && IsImageValid( $sFilePath, $sExtension ) === false )
+ 				{
+ 					@unlink( $sFilePath ) ;
+ 					$sErrorNumber = '202' ;
+ 				}
+ 				else if ( isset( $detectHtml ) && $detectHtml === -1 && DetectHtml( $sFilePath ) === true )
+ 				{
+ 					@unlink( $sFilePath ) ;
+ 					$sErrorNumber = '202' ;
+ 				}
+ 			}
  		}
  		else
***************
*** 243,245 ****
  	exit ;
  }
! ?>
\ No newline at end of file
--- 271,273 ----
  	exit ;
  }
! ?>

Index: upload.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/upload.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.php	9 Feb 2008 12:53:59 -0000	1.1
--- upload.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 44,51 ****
  $sType = isset( $_GET['Type'] ) ? $_GET['Type'] : 'File' ;
  
! $sCurrentFolder	= GetCurrentFolder() ; 
  
  // Is enabled the upload?
! if ( ! IsAllowedCommand( $sCommand ) ) 
  	SendUploadResults( '1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed' ) ;
  
--- 44,51 ----
  $sType = isset( $_GET['Type'] ) ? $_GET['Type'] : 'File' ;
  
! $sCurrentFolder	= GetCurrentFolder() ;
  
  // Is enabled the upload?
! if ( ! IsAllowedCommand( $sCommand ) )
  	SendUploadResults( '1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed' ) ;
  
***************
*** 57,59 ****
  FileUpload( $sType, $sCurrentFolder, $sCommand )
  
! ?>
\ No newline at end of file
--- 57,59 ----
  FileUpload( $sType, $sCurrentFolder, $sCommand )
  
! ?>

Index: basexml.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/basexml.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** basexml.php	9 Feb 2008 12:53:59 -0000	1.1
--- basexml.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 67,71 ****
  {
  	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
! 	{ 
  		SendErrorNode( $number, $text ) ;
  		CreateXmlFooter() ;
--- 67,71 ----
  {
  	if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] )
! 	{
  		SendErrorNode( $number, $text ) ;
  		CreateXmlFooter() ;
***************
*** 79,85 ****
  
  		echo '<Connector>' ;
! 		
  		SendErrorNode( $number, $text ) ;
! 		
  		echo '</Connector>' ;
  	}
--- 79,85 ----
  
  		echo '<Connector>' ;
! 
  		SendErrorNode( $number, $text ) ;
! 
  		echo '</Connector>' ;
  	}
***************
*** 91,93 ****
  	echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
  }
! ?>
\ No newline at end of file
--- 91,93 ----
  	echo '<Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" />' ;
  }
! ?>

Index: config.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/config.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.php	9 Feb 2008 12:53:59 -0000	1.1
--- config.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 49,60 ****
  $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') ;
  
--- 49,60 ----
  $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') ;
  
***************
*** 63,66 ****
--- 63,77 ----
  $Config['HtmlExtensions'] = array("html", "htm", "xml", "xsd", "txt", "js") ;
  
+ // After file is uploaded, sometimes it is required to change its permissions
+ // so that it was possible to access it at the later time.
+ // If possible, it is recommended to set more restrictive permissions, like 0755.
+ // Set to 0 to disable this feature.
+ // Note: not needed on Windows-based servers.
+ $Config['ChmodOnUpload'] = 0777 ;
+ 
+ // See comments above.
+ // Used when creating folders that does not exist.
+ $Config['ChmodOnFolderCreate'] = 0777 ;
+ 
  /*
  	Configuration settings for each Resource Type
***************
*** 124,128 ****
  $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'] ;
--- 135,139 ----
  $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'] ;
***************
*** 131,135 ****
  $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'] ;
--- 142,146 ----
  $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'] ;
***************
*** 138,142 ****
  $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'] ;
--- 149,153 ----
  $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'] ;

Index: util.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/util.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** util.php	9 Feb 2008 12:53:59 -0000	1.1
--- util.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 35,41 ****
  }
  
  function ConvertToXmlAttribute( $value )
  {
! 	if ( defined( 'PHP_OS' ) ) 
  	{
  		$os = PHP_OS ;
--- 35,64 ----
  }
  
+ function FindBadUtf8( $string )
+ {
+ 	$regex =
+ 	'([\x00-\x7F]'.
+ 	'|[\xC2-\xDF][\x80-\xBF]'.
+ 	'|\xE0[\xA0-\xBF][\x80-\xBF]'.
+ 	'|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
+ 	'|\xED[\x80-\x9F][\x80-\xBF]'.
+ 	'|\xF0[\x90-\xBF][\x80-\xBF]{2}'.
+ 	'|[\xF1-\xF3][\x80-\xBF]{3}'.
+ 	'|\xF4[\x80-\x8F][\x80-\xBF]{2}'.
+ 	'|(.{1}))';
+ 
+ 	while (preg_match('/'.$regex.'/S', $string, $matches)) {
+ 		if ( isset($matches[2])) {
+ 			return true;
+ 		}
+ 		$string = substr($string, strlen($matches[0]));
+ 	}
+ 
+ 	return false;
+ }
+ 
  function ConvertToXmlAttribute( $value )
  {
! 	if ( defined( 'PHP_OS' ) )
  	{
  		$os = PHP_OS ;
***************
*** 45,57 ****
  		$os = php_uname() ;
  	}
! 	
! 	if ( strtoupper( substr( $os, 0, 3 ) ) === 'WIN' ) 
  	{
  		return ( utf8_encode( htmlspecialchars( $value ) ) ) ;
! 	} 
! 	else 
  	{
  		return ( htmlspecialchars( $value ) ) ;
! 	}	
  }
  
--- 68,80 ----
  		$os = php_uname() ;
  	}
! 
! 	if ( strtoupper( substr( $os, 0, 3 ) ) === 'WIN' || FindBadUtf8( $value ) )
  	{
  		return ( utf8_encode( htmlspecialchars( $value ) ) ) ;
! 	}
! 	else
  	{
  		return ( htmlspecialchars( $value ) ) ;
! 	}
  }
  
***************
*** 78,97 ****
  
  /**
!  * 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 ;
--- 101,128 ----
  
  /**
!  * 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' ) ;
! 
! 	//open_basedir restriction, see #1906
! 	if ( $fp === false || !flock( $fp, LOCK_SH ) )
! 	{
! 		return -1 ;
! 	}
! 
  	$chunk = fread( $fp, 1024 ) ;
+ 	flock( $fp, LOCK_UN ) ;
  	fclose( $fp ) ;
  
  	$chunk = strtolower( $chunk ) ;
  
! 	if (!$chunk)
  	{
  		return false ;
***************
*** 100,113 ****
  	$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 ;
--- 131,144 ----
  	$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 ;
***************
*** 116,120 ****
  
  	//type = javascript
! 	if ( preg_match( '!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk ) ) 
  	{
  		return true ;
--- 147,151 ----
  
  	//type = javascript
! 	if ( preg_match( '!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk ) )
  	{
  		return true ;
***************
*** 128,139 ****
  		return true ;
  	}
! 	
  	//url(javascript
! 	if ( preg_match( '!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk ) ) 
  	{
  		return true ;
! 	}			
  
! 	return false ;	
  }
  
--- 159,170 ----
  		return true ;
  	}
! 
  	//url(javascript
! 	if ( preg_match( '!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk ) )
  	{
  		return true ;
! 	}
  
! 	return false ;
  }
  
***************
*** 142,153 ****
   * 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');
  
--- 173,188 ----
   * 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 )
  {
+ 	if (!@is_readable($filePath)) {
+ 		return -1;
+ 	}
+ 
  	$imageCheckExtensions = array('gif', 'jpeg', 'jpg', 'png', 'swf', 'psd', 'bmp', 'iff');
  
***************
*** 171,185 ****
  		}
  	}
! 	
  	if ( !in_array( $extension, $imageCheckExtensions ) ) {
  		return true;
  	}
! 	
  	if ( @getimagesize( $filePath ) === false ) {
  		return false ;
! 	}		
! 	
  	return true;
  }
  
! ?>
\ No newline at end of file
--- 206,220 ----
  		}
  	}
! 
  	if ( !in_array( $extension, $imageCheckExtensions ) ) {
  		return true;
  	}
! 
  	if ( @getimagesize( $filePath ) === false ) {
  		return false ;
! 	}
! 
  	return true;
  }
  
! ?>

Index: io.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/io.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** io.php	9 Feb 2008 12:53:59 -0000	1.1
--- io.php	5 May 2008 00:35:25 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 30,34 ****
  	global $Config ;
  
! 	if ( $sCommand == "QuickUpload") 
  		return $Config['QuickUploadPath'][$resourceType] ;
  	else
--- 30,34 ----
  	global $Config ;
  
! 	if ( $sCommand == "QuickUpload")
  		return $Config['QuickUploadPath'][$resourceType] ;
  	else
***************
*** 39,43 ****
  {
  	global $Config ;
! 	if ( $sCommand == "QuickUpload") 
  	{
  		if ( strlen( $Config['QuickUploadAbsolutePath'][$resourceType] ) > 0 )
--- 39,43 ----
  {
  	global $Config ;
! 	if ( $sCommand == "QuickUpload")
  	{
  		if ( strlen( $Config['QuickUploadAbsolutePath'][$resourceType] ) > 0 )
***************
*** 89,92 ****
--- 89,93 ----
  function CreateServerFolder( $folderPath, $lastFolder = null )
  {
+ 	global $Config ;
  	$sParent = GetParentFolder( $folderPath ) ;
  
***************
*** 104,108 ****
  			return "Can't create $folderPath directory" ;
  		}
! 		
  		$sErrorMsg = CreateServerFolder( $sParent, $folderPath ) ;
  		if ( $sErrorMsg != '' )
--- 105,109 ----
  			return "Can't create $folderPath directory" ;
  		}
! 
  		$sErrorMsg = CreateServerFolder( $sParent, $folderPath ) ;
  		if ( $sErrorMsg != '' )
***************
*** 119,126 ****
  		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 ;
--- 120,139 ----
  		ini_set( 'track_errors', '1' ) ;
  
! 		if ( isset( $Config['ChmodOnFolderCreate'] ) && !$Config['ChmodOnFolderCreate'] )
! 		{
! 			mkdir( $folderPath ) ;
! 		}
! 		else
! 		{
! 			$permissions = 0777 ;
! 			if ( isset( $Config['ChmodOnFolderCreate'] ) )
! 			{
! 				$permissions = $Config['ChmodOnFolderCreate'] ;
! 			}
! 			// To create the folder with 0777 permissions, we need to set umask to zero.
! 			$oldumask = umask(0) ;
! 			mkdir( $folderPath, $permissions ) ;
! 			umask( $oldumask ) ;
! 		}
  
  		$sErrorMsg = $php_errormsg ;
***************
*** 138,144 ****
  function GetRootPath()
  {
!     if (!isset($_SERVER)) {
!         global $_SERVER;
!     }
  	$sRealPath = realpath( './' ) ;
  
--- 151,157 ----
  function GetRootPath()
  {
! 	if (!isset($_SERVER)) {
! 		global $_SERVER;
! 	}
  	$sRealPath = realpath( './' ) ;
  
***************
*** 147,151 ****
  
  	$sSelfPath = str_replace( '/', DIRECTORY_SEPARATOR, $sSelfPath ) ;
! 	
  	$position = strpos( $sRealPath, $sSelfPath ) ;
  
--- 160,164 ----
  
  	$sSelfPath = str_replace( '/', DIRECTORY_SEPARATOR, $sSelfPath ) ;
! 
  	$position = strpos( $sRealPath, $sSelfPath ) ;
  
***************
*** 181,188 ****
  	$arDenied	= $Config['DeniedExtensions'][$resourceType] ;
  
! 	if ( count($arAllowed) > 0 && !in_array( $sExtension, $arAllowed ) ) 
  		return false ;
  
! 	if ( count($arDenied) > 0 && in_array( $sExtension, $arDenied ) ) 
  		return false ;
  
--- 194,201 ----
  	$arDenied	= $Config['DeniedExtensions'][$resourceType] ;
  
! 	if ( count($arAllowed) > 0 && !in_array( $sExtension, $arAllowed ) )
  		return false ;
  
! 	if ( count($arDenied) > 0 && in_array( $sExtension, $arDenied ) )
  		return false ;
  
***************
*** 195,199 ****
  	if ( !in_array( $resourceType, $Config['ConfigAllowedTypes'] ) )
  		return false ;
! 	
  	return true ;
  }
--- 208,212 ----
  	if ( !in_array( $resourceType, $Config['ConfigAllowedTypes'] ) )
  		return false ;
! 
  	return true ;
  }
***************
*** 205,209 ****
  	if ( !in_array( $sCommand, $Config['ConfigAllowedCommands'] ) )
  		return false ;
! 	
  	return true ;
  }
--- 218,222 ----
  	if ( !in_array( $sCommand, $Config['ConfigAllowedCommands'] ) )
  		return false ;
! 
  	return true ;
  }
***************
*** 211,222 ****
  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
--- 224,237 ----
  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 ( !preg_match( '|/$|', $sCurrentFolder ) )
! 		$sCurrentFolder .= '/' ;
! 	if ( strpos( $sCurrentFolder, '/' ) !== 0 )
! 		$sCurrentFolder = '/' . $sCurrentFolder ;
  
  	// Ensure the folder path has no double-slashes
***************
*** 226,230 ****
  
  	// Check for invalid folder paths (..)
! 	if ( strpos( $sCurrentFolder, '..' ) )
  		SendError( 102, '' ) ;
  
--- 241,245 ----
  
  	// Check for invalid folder paths (..)
! 	if ( strpos( $sCurrentFolder, '..' ) || strpos( $sCurrentFolder, "\\" ))
  		SendError( 102, '' ) ;
  
***************
*** 238,242 ****
  
  	// Remove . \ / | : ? * " < >
! 	$sNewFolderName = preg_replace( '/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>/', '_', $sNewFolderName ) ;
  
  	return $sNewFolderName ;
--- 253,257 ----
  
  	// Remove . \ / | : ? * " < >
! 	$sNewFolderName = preg_replace( '/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFolderName ) ;
  
  	return $sNewFolderName ;
***************
*** 255,259 ****
  
  	// Remove \ / | : ? * " < >
! 	$sNewFileName = preg_replace( '/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>/', '_', $sNewFileName ) ;
  
  	return $sNewFileName ;
--- 270,274 ----
  
  	// Remove \ / | : ? * " < >
! 	$sNewFileName = preg_replace( '/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName ) ;
  
  	return $sNewFileName ;
***************
*** 263,267 ****
  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 ) . '") ;' ;
--- 278,315 ----
  function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' )
  {
! 	echo <<<EOF
! <script type="text/javascript">
! (function()
! {
! 	var d = document.domain ;
! 
! 	while ( true )
! 	{
! 		// Test if we can access a parent property.
! 		try
! 		{
! 			var test = window.top.opener.document.domain ;
! 			break ;
! 		}
! 		catch( e ) {}
! 
! 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
! 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
! 
! 		if ( d.length == 0 )
! 			break ;		// It was not able to detect the domain.
! 
! 		try
! 		{
! 			document.domain = d ;
! 		}
! 		catch (e)
! 		{
! 			break ;
! 		}
! 	}
! })() ;
! 
! EOF;
  	$rpl = array( '\\' => '\\\\', '"' => '\\"' ) ;
  	echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr( $fileUrl, $rpl ) . '","' . strtr( $fileName, $rpl ) . '", "' . strtr( $customMsg, $rpl ) . '") ;' ;
***************
*** 270,272 ****
  }
  
! ?>
\ No newline at end of file
--- 318,320 ----
  }
  
! ?>



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/skins/office2003
	fck_dialog_ie6.js, NONE, 1.1 fck_dialog.css, 1.4,
	1.5 fck_editor.css, 1.6, 1.7
Message-ID: <20080505003530.D265910FE16@qs1489.pair.com>

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

Modified Files:
	fck_dialog.css fck_editor.css 
Added Files:
	fck_dialog_ie6.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

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

Index: fck_editor.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/office2003/fck_editor.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fck_editor.css	9 Feb 2008 12:54:01 -0000	1.6
--- fck_editor.css	5 May 2008 00:35:26 -0000	1.7
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 422,426 ****
  }
  
! .SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption
  {
      opacity: 0.30; /* Safari, Opera and Mozilla */
--- 422,426 ----
  }
  
! .SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
  {
      opacity: 0.30; /* Safari, Opera and Mozilla */

Index: fck_dialog.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/skins/office2003/fck_dialog.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_dialog.css	9 Feb 2008 12:54:01 -0000	1.4
--- fck_dialog.css	5 May 2008 00:35:26 -0000	1.5
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 22,30 ****
   */
  
! body
  {
  	margin: 0px;
  	padding: 10px;
- 	background-color: #f7f8fd;
  }
  
--- 22,35 ----
   */
  
! html, body
  {
+ 	background-color: transparent;
  	margin: 0px;
+ 	padding: 0px;
+ }
+ 
+ body
+ {
  	padding: 10px;
  }
  
***************
*** 42,49 ****
  .PopupBody
  {
! 	margin: 0px;
  	padding: 0px;
  }
  
  .PopupTitle
  {
--- 47,62 ----
  .PopupBody
  {
! 	height: 100%;
! 	width: 100%;
! 	overflow: hidden;
! 	background-color: transparent;
  	padding: 0px;
  }
  
+ #header
+ {
+ 	cursor: move;
+ }
+ 
  .PopupTitle
  {
***************
*** 57,60 ****
--- 70,77 ----
  .PopupButtons
  {
+ 	position: absolute;
+ 	right: 0px;
+ 	left: 0px;
+ 	bottom: 0px;
  	border-top: #466ca6 1px solid;
  	background-color: #8cb2fd;
***************
*** 76,80 ****
  .DarkBackground
  {
! 	background-color: #d7d79f;
  }
  
--- 93,97 ----
  .DarkBackground
  {
! 	background-color: #eaf2f8;
  }
  
***************
*** 120,124 ****
  .PopupTabSelected
  {
! 	font-weight:bold;
  	cursor: default;
  	padding-top: 4px;
--- 137,141 ----
  .PopupTabSelected
  {
! 	font-weight: bold;
  	cursor: default;
  	padding-top: 4px;
***************
*** 135,140 ****
  }
  
! #tdBrowse 
  {
  	vertical-align: bottom;
! }
\ No newline at end of file
--- 152,402 ----
  }
  
! #tdBrowse
  {
  	vertical-align: bottom;
! }
! 
! /**
!  * Dialog frame related styles.
!  */
! 
! .contents
! {
! 	position: absolute;
! 	top: 2px;
! 	left: 16px;
! 	right: 16px;
! 	bottom: 20px;
! 	background-color: #f7f8fD;
! 	overflow: hidden;
! 	z-index: 1;
! }
! 
! .tl, .tr, .tc, .bl, .br, .bc
! {
! 	position: absolute;
! 	background-image: url(images/sprites.png);
! 	background-repeat: no-repeat;
! }
! 
! * html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
! {
! 	background-image: url(images/sprites.gif);
! }
! 
! .ml, .mr
! {
! 	position: absolute;
! 	background-image: url(images/dialog.sides.png);
! 	background-repeat: repeat-y;
! }
! 
! * html .ml, * html .mr
! {
! 	background-image: url(images/dialog.sides.gif);
! }
! 
! .rtl .ml, .rtl .mr
! {
! 	position: absolute;
! 	background-image: url(images/dialog.sides.rtl.png);
! 	background-repeat: repeat-y;
! }
! 
! * html .rtl .ml, * html .rtl .mr
! {
! 	background-image: url(images/dialog.sides.gif);
! }
! 
! .tl
! {
! 	top: 0px;
! 	left: 0px;
! 	width: 16px;
! 	height: 16px;
! 	background-position: -16px -16px;
! }
! 
! .rtl .tl
! {
! 	background-position: -16px -397px;
! }
! 
! .tr
! {
! 	top: 0px;
! 	right: 0px;
! 	width: 16px;
! 	height: 16px;
! 	background-position: -16px -76px;
! }
! 
! .rtl .tr
! {
! 	background-position: -16px -457px;
! }
! 
! .tc
! {
! 	top: 0px;
! 	right: 16px;
! 	left: 16px;
! 	height: 16px;
! 	background-position: 0px -136px;
! 	background-repeat: repeat-x;
! }
! 
! .ml
! {
! 	top: 16px;
! 	left: 0px;
! 	width: 16px;
! 	bottom: 51px;
! 	background-position: 0px 0px;
! }
! 
! .mr
! {
! 	top: 16px;
! 	right: 0px;
! 	width: 16px;
! 	bottom: 51px;
! 	background-position: -16px 0px;
! }
! 
! .bl
! {
! 	bottom: 0px;
! 	left: 0px;
! 	width: 30px;
! 	height: 51px;
! 	background-position: -16px -196px;
! }
! 
! .rtl .bl
! {
! 	background-position: -16px -517px;
! }
! 
! .br
! {
! 	bottom: 0px;
! 	right: 0px;
! 	width: 30px;
! 	height: 51px;
! 	background-position: -16px -263px;
! }
! 
! .rtl .br
! {
! 	background-position: -16px -584px;
! }
! 
! .bc
! {
! 	bottom: 0px;
! 	right: 30px;
! 	left: 30px;
! 	height: 51px;
! 	background-position: 0px -330px;
! 	background-repeat: repeat-x;
! }
! 
! /* For IE6. Do not change it. */
! * html .blocker
! {
! 	position: absolute;
! 	width: 100%;
! 	height: 100%;
! 	z-index: 12;
! 	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
! }
! 
! /* The layer used to cover the dialog when opening a child dialog. */
! .cover
! {
! 	position: absolute;
! 	top: 0px;
! 	left: 14px;
! 	right: 14px;
! 	bottom: 18px;
! 	z-index: 11;
! }
! 
! #closeButton
! {
! 	position: absolute;
! 	right: 0px;
! 	top: 0px;
! 	margin-top: 5px;
! 	margin-right: 10px;
! 	width: 20px;
! 	height: 20px;
! 	cursor: pointer;
! 	background-image: url(images/sprites.png);
! 	background-repeat: no-repeat;
! 	background-position: -16px -651px;
! }
! 
! * html #closeButton
! {
! 	cursor: hand;
! 	background-image: url(images/sprites.gif);
! }
! 
! .rtl #closeButton
! {
! 	right: auto;
! 	left: 10px;
! 	margin-right: 0px;
! }
! 
! #closeButton:hover
! {
! 	background-position: -16px -687px;
! }
! 
! #throbberBlock
! {
! 	z-index: 10;
! }
! 
! #throbberBlock div
! {
! 	float: left;
! 	width: 8px;
! 	height: 9px;
! 	margin-left: 2px;
! 	margin-right: 2px;
! 	font-size: 1px;	/* IE6 */
! }
! 
! /*
! 	Color Gradient Generator:
! 	http://www.herethere.net/~samson/php/color_gradient/?cbegin=0E3460&cend=8cb2fd&steps=4
! */
! 
! .throbber_1
! {
! 	background-color: #0E3460;
! }
! 
! .throbber_2
! {
! 	background-color: #2D5387;
! }
! 
! .throbber_3
! {
! 	background-color: #4D73AE;
! }
! 
! .throbber_4
! {
! 	background-color: #6C92D5;
! }
! 
! .throbber_5
! {
! 	background-color: #8CB2FD;
! }



From blaine at qs1489.pair.com  Sun May  4 20:35:29 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:29 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors
	test.html, 1.1, 1.2 uploadtest.html, 1.1, 1.2
Message-ID: <20080505003529.B31EE10FE2D@qs1489.pair.com>

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

Modified Files:
	test.html uploadtest.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: test.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/test.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test.html	9 Feb 2008 12:53:59 -0000	1.1
--- test.html	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 25,29 ****
--- 25,62 ----
  <head>
  	<title>FCKeditor - Connectors Tests</title>
+ 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  	<script type="text/javascript">
+ 
+ // Automatically detect the correct document.domain (#1919).
+ (function()
+ {
+ 	var d = document.domain ;
+ 
+ 	while ( true )
+ 	{
+ 		// Test if we can access a parent property.
+ 		try
+ 		{
+ 			var test = window.opener.document.domain ;
+ 			break ;
+ 		}
+ 		catch( e ) {}
+ 
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+ 
+ 		if ( d.length == 0 )
+ 			break ;		// It was not able to detect the domain.
+ 
+ 		try
+ 		{
+ 			document.domain = d ;
+ 		}
+ 		catch (e)
+ 		{
+ 			break ;
+ 		}
+ 	}
+ })() ;
  
  function BuildBaseUrl( command )

Index: uploadtest.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/uploadtest.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** uploadtest.html	9 Feb 2008 12:53:59 -0000	1.1
--- uploadtest.html	5 May 2008 00:35:25 -0000	1.2
***************
*** 1,5 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 24,29 ****
--- 24,62 ----
  	<head>
  		<title>FCKeditor - Uploaders Tests</title>
+ 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  		<script type="text/javascript">
  
+ // Automatically detect the correct document.domain (#1919).
+ (function()
+ {
+ 	var d = document.domain ;
+ 
+ 	while ( true )
+ 	{
+ 		// Test if we can access a parent property.
+ 		try
+ 		{
+ 			var test = window.opener.document.domain ;
+ 			break ;
+ 		}
+ 		catch( e ) {}
+ 
+ 		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+ 		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+ 
+ 		if ( d.length == 0 )
+ 			break ;		// It was not able to detect the domain.
+ 
+ 		try
+ 		{
+ 			document.domain = d ;
+ 		}
+ 		catch (e)
+ 		{
+ 			break ;
+ 		}
+ 	}
+ })() ;
+ 
  function SendFile()
  {
***************
*** 42,48 ****
  	txtUrl.value = '' ;
  
! 	frmUpload.action = sUploaderUrl;
  	if (document.getElementById('cmbType').value) {
! 		frmUpload.action = frmUpload.action + '?Type='+document.getElementById('cmbType').value;
  	}
  	frmUpload.submit() ;
--- 75,86 ----
  	txtUrl.value = '' ;
  
! 	var date = new Date()
! 
! 	frmUpload.action = sUploaderUrl + '?time=' + date.getTime();
  	if (document.getElementById('cmbType').value) {
! 		frmUpload.action = frmUpload.action + '&Type='+document.getElementById('cmbType').value;
! 	}
! 	if (document.getElementById('CurrentFolder').value) {
! 		frmUpload.action = frmUpload.action + '&CurrentFolder='+document.getElementById('CurrentFolder').value;
  	}
  	frmUpload.submit() ;
***************
*** 89,93 ****
  						<tr>
  							<td nowrap>
! 								Select the "File Uploader" to use:<br>
  								<select id="cmbUploaderUrl">
  									<option selected value="asp/upload.asp">ASP</option>
--- 127,131 ----
  						<tr>
  							<td nowrap>
! 								Select the "File Uploader" to use: <br>
  								<select id="cmbUploaderUrl">
  									<option selected value="asp/upload.asp">ASP</option>
***************
*** 112,115 ****
--- 150,157 ----
  							</select>
  						</td>
+ 						<td>
+ 						Current Folder: <br>
+ 						<input type="text" name="CurrentFolder" id="CurrentFolder" value="/">
+ 						</td>
  							<td nowrap>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
  							<td width="100%">
***************
*** 126,129 ****
--- 168,172 ----
  									Upload a new file:<br>
  									<input type="file" name="NewFile"><br>
+ 
  									<input type="button" value="Send it to the Server" onclick="SendFile();">
  								</form>



From blaine at qs1489.pair.com  Sun May  4 20:35:28 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:28 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops
	fck_document_preview.html, 1.4, 1.5
Message-ID: <20080505003528.2BC2610FE1A@qs1489.pair.com>

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

Modified Files:
	fck_document_preview.html 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fck_document_preview.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fck_document_preview.html	9 Feb 2008 12:53:57 -0000	1.4
--- fck_document_preview.html	5 May 2008 00:35:24 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==



From blaine at qs1489.pair.com  Sun May  4 20:35:30 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:30 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/fckeditor/editor/plugins/autogrow
	fckplugin.js, 1.4, 1.5
Message-ID: <20080505003530.6B4BE10FE18@qs1489.pair.com>

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

Modified Files:
	fckplugin.js 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckplugin.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/plugins/autogrow/fckplugin.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckplugin.js	9 Feb 2008 12:53:59 -0000	1.4
--- fckplugin.js	5 May 2008 00:35:26 -0000	1.5
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 64,67 ****
--- 64,74 ----
  
  		window.frameElement.height = iMainFrameSize ;
+ 
+ 		// Gecko browsers use an onresize handler to update the innermost
+ 		// IFRAME's height. If the document is modified before the onresize
+ 		// is triggered, the plugin will miscalculate the new height. Thus,
+ 		// forcibly trigger onresize. #1336
+ 		if ( typeof window.onresize == 'function' )
+ 			window.onresize() ;
  	}
  }
***************
*** 90,92 ****
  }
  
! FCK.Events.AttachEvent( 'OnStatusChange', FCKAutoGrow_CheckEditorStatus ) ;
\ No newline at end of file
--- 97,99 ----
  }
  
! FCK.Events.AttachEvent( 'OnStatusChange', FCKAutoGrow_CheckEditorStatus ) ;



From blaine at qs1489.pair.com  Sun May  4 20:35:25 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 00:35:25 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor _documentation.html,
	1.5, 1.6 _upgrade.html, 1.1, 1.2 _whatsnew.html, 1.7,
	1.8 _whatsnew_history.html, 1.1, 1.2 fckconfig.js, 1.11,
	1.12 fckeditor.js, 1.7, 1.8 fckeditor.php, 1.6,
	1.7 fckeditor_php4.php, 1.1, 1.2 fckeditor_php5.php, 1.1,
	1.2 fckpackager.xml, 1.1, 1.2 fckstyles.xml, 1.4,
	1.5 fcktemplates.xml, 1.6, 1.7 license.txt, 1.3, 1.4
Message-ID: <20080505003556.0A82610FE14@qs1489.pair.com>

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

Modified 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 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: fckeditor.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/fckeditor.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fckeditor.php	9 Feb 2008 12:53:56 -0000	1.6
--- fckeditor.php	5 May 2008 00:35:23 -0000	1.7
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 26,42 ****
   */
  
  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 )
--- 26,50 ----
   */
  
+ /**
+  * Check if browser is compatible with FCKeditor.
+  * Return true if is compatible.
+  *
+  * @return boolean
+  */
  function FCKeditor_IsCompatibleBrowser()
  {
! 	if ( isset( $_SERVER ) ) {
! 		$sAgent = $_SERVER['HTTP_USER_AGENT'] ;
! 	}
! 	else {
  		global $HTTP_SERVER_VARS ;
! 		if ( isset( $HTTP_SERVER_VARS ) ) {
! 			$sAgent = $HTTP_SERVER_VARS['HTTP_USER_AGENT'] ;
! 		}
! 		else {
! 			global $HTTP_USER_AGENT ;
! 			$sAgent = $HTTP_USER_AGENT ;
! 		}
  	}
  
  	if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false )
***************
*** 61,65 ****
  	}
  	else
! 		return false ;	
  }
  
--- 69,73 ----
  	}
  	else
! 		return false ;
  }
  
***************
*** 68,71 ****
  else
  	include_once( 'fckeditor_php5.php' ) ;
- 
- ?>
--- 76,77 ----

Index: fckstyles.xml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/fckstyles.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fckstyles.xml	9 Feb 2008 12:53:56 -0000	1.4
--- fckstyles.xml	5 May 2008 00:35:23 -0000	1.5
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 69,75 ****
  	</Style>
  
- 	<Style name="Strong Emphasis" element="strong" />
- 	<Style name="Emphasis" element="em" />
- 
  	<Style name="Big" element="big" />
  	<Style name="Small" element="small" />
--- 69,72 ----
***************
*** 112,114 ****
  		<Attribute name="align" value="right" />
  	</Style>
! </Styles>
\ No newline at end of file
--- 109,111 ----
  		<Attribute name="align" value="right" />
  	</Style>
! </Styles>

Index: _documentation.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/_documentation.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** _documentation.html	9 Feb 2008 12:53:56 -0000	1.5
--- _documentation.html	5 May 2008 00:35:23 -0000	1.6
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 33,38 ****
  		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>
--- 33,38 ----
  		FCKeditor Documentation</h1>
  	<p>
! 		You can find the official documentation for FCKeditor online, at <a href="http://docs.fckeditor.net/">
! 			http://docs.fckeditor.net/</a>.</p>
  </body>
  </html>

Index: fcktemplates.xml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/fcktemplates.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fcktemplates.xml	9 Feb 2008 12:53:56 -0000	1.6
--- fcktemplates.xml	5 May 2008 00:35:23 -0000	1.7
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==

Index: fckeditor.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/fckeditor.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** fckeditor.js	9 Feb 2008 12:53:56 -0000	1.7
--- fckeditor.js	5 May 2008 00:35:23 -0000	1.8
***************
*** 1,5 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 60,65 ****
  FCKeditor.MinWidth = 750 ;
  
! FCKeditor.prototype.Version			= '2.5.1' ;
! FCKeditor.prototype.VersionBuild	= '17566' ;
  
  FCKeditor.prototype.Create = function()
--- 60,65 ----
  FCKeditor.MinWidth = 750 ;
  
! FCKeditor.prototype.Version			= '2.6' ;
! FCKeditor.prototype.VersionBuild	= '18638' ;
  
  FCKeditor.prototype.Create = function()
***************
*** 77,81 ****
  	}
  
! 	var sHtml = '<div>' ;
  
  	if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
--- 77,81 ----
  	}
  
! 	var sHtml = '' ;
  
  	if ( !this.CheckBrowser || this._IsCompatibleBrowser() )
***************
*** 92,97 ****
  	}
  
- 	sHtml += '</div>' ;
- 
  	return sHtml ;
  }
--- 92,95 ----
***************
*** 206,216 ****
  	{
  		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
--- 204,214 ----
  	{
  		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
***************
*** 245,249 ****
  			if ( !name || name.length == 0 )
  				continue ;
! 			
  			if ( typeof arguments[0] == 'string' )
  			{
--- 243,247 ----
  			if ( !name || name.length == 0 )
  				continue ;
! 
  			if ( typeof arguments[0] == 'string' )
  			{
***************
*** 290,294 ****
  	// Opera 9.50+
  	if ( window.opera && window.opera.version && parseFloat( window.opera.version() ) >= 9.5 )
! 			return true ;
  
  	// Safari 3+
--- 288,298 ----
  	// Opera 9.50+
  	if ( window.opera && window.opera.version && parseFloat( window.opera.version() ) >= 9.5 )
! 		return true ;
! 
! 	// Adobe AIR
! 	// Checked before Safari because AIR have the WebKit rich text editor
! 	// features from Safari 3.0.4, but the version reported is 420.
! 	if ( sAgent.indexOf( ' adobeair/' ) != -1 )
! 		return ( sAgent.match( / adobeair\/(\d+)/ )[1] >= 1 ) ;	// Build must be at least v1
  
  	// Safari 3+

Index: _upgrade.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/_upgrade.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** _upgrade.html	9 Feb 2008 12:53:56 -0000	1.1
--- _upgrade.html	5 May 2008 00:35:23 -0000	1.2
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 33,38 ****
  		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>
--- 33,39 ----
  		FCKeditor Upgrade</h1>
  	<p>
! 		Please check the following URL for notes regarding upgrade:<br />
! 		<a href="http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Installation/Upgrading">
! 			http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Installation/Upgrading</a></p>
  </body>
  </html>

Index: fckpackager.xml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/fckpackager.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckpackager.xml	9 Feb 2008 12:53:56 -0000	1.1
--- fckpackager.xml	5 May 2008 00:35:23 -0000	1.2
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 28,49 ****
  	<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".
--- 28,49 ----
  	<Header><![CDATA[/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 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".
***************
*** 99,103 ****
  		<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" />
--- 99,103 ----
  		<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" />
***************
*** 152,156 ****
  		<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" />
--- 152,155 ----
***************
*** 159,162 ****
--- 158,162 ----
  		<File path="editor/_source/classes/fckcontextmenu.js" />
  		<File path="editor/_source/internals/fck_contextmenu.js" />
+ 		<File path="editor/_source/classes/fckhtmliterator.js" />
  
  		<File path="editor/_source/classes/fckplugin.js" />
***************
*** 248,252 ****
  		<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" />
--- 248,251 ----
***************
*** 255,258 ****
--- 254,258 ----
  		<File path="editor/_source/classes/fckcontextmenu.js" />
  		<File path="editor/_source/internals/fck_contextmenu.js" />
+ 		<File path="editor/_source/classes/fckhtmliterator.js" />
  
  		<File path="editor/_source/classes/fckplugin.js" />

Index: fckconfig.js
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/fckconfig.js,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** fckconfig.js	9 Feb 2008 12:53:56 -0000	1.11
--- fckconfig.js	5 May 2008 00:35:23 -0000	1.12
***************
*** 1,5 ****
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 1,5 ----
  ???/*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 44,47 ****
--- 44,50 ----
  
  FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ;
+ FCKConfig.SkinEditorCSS = '' ;	// FCKConfig.SkinPath + "|<minified css>" ;
+ FCKConfig.SkinDialogCSS = '' ;	// FCKConfig.SkinPath + "|<minified css>" ;
+ 
  FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCKConfig.SkinPath + 'images/toolbar.buttonarrow.gif' ] ;
  
***************
*** 123,126 ****
--- 126,130 ----
  	[ CTRL + 70 /*F*/, true ],
  	[ CTRL + 83 /*S*/, true ],
+ 	[ CTRL + 84 /*T*/, true ],
  	[ CTRL + 88 /*X*/, true ],
  	[ CTRL + 86 /*V*/, 'Paste' ],
***************
*** 136,141 ****
  	[ CTRL + 85 /*U*/, 'Underline' ],
  	[ CTRL + SHIFT + 83 /*S*/, 'Save' ],
! 	[ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ],
! 	[ CTRL + 9 /*TAB*/, 'Source' ]
  ] ;
  
--- 140,144 ----
  	[ CTRL + 85 /*U*/, 'Underline' ],
  	[ CTRL + SHIFT + 83 /*S*/, 'Save' ],
! 	[ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ]
  ] ;
  
***************
*** 190,194 ****
  FCKConfig.RemoveFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var' ;
  
! FCKConfig.CustomStyles = 
  {
  	'Red Title'	: { Element : 'h3', Styles : { 'color' : 'Red' } }
--- 193,200 ----
  FCKConfig.RemoveFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var' ;
  
! // Attributes that will be removed
! FCKConfig.RemoveAttributes = 'class,style,lang,width,height,align,hspace,valign' ;
! 
! FCKConfig.CustomStyles =
  {
  	'Red Title'	: { Element : 'h3', Styles : { 'color' : 'Red' } }
***************
*** 196,209 ****
  
  // Do not add, rename or remove styles here. Only apply definition changes.
! FCKConfig.CoreStyles = 
  {
  	// Basic Inline Styles.
! 	'Bold'			: { Element : 'b', Overrides : 'strong' },
! 	'Italic'		: { Element : 'i', Overrides : 'em' },
  	'Underline'		: { Element : 'u' },
  	'StrikeThrough'	: { Element : 'strike' },
  	'Subscript'		: { Element : 'sub' },
  	'Superscript'	: { Element : 'sup' },
! 	
  	// Basic Block Styles (Font Format Combo).
  	'p'				: { Element : 'p' },
--- 202,215 ----
  
  // Do not add, rename or remove styles here. Only apply definition changes.
! FCKConfig.CoreStyles =
  {
  	// Basic Inline Styles.
! 	'Bold'			: { Element : 'strong', Overrides : 'b' },
! 	'Italic'		: { Element : 'em', Overrides : 'i' },
  	'Underline'		: { Element : 'u' },
  	'StrikeThrough'	: { Element : 'strike' },
  	'Subscript'		: { Element : 'sub' },
  	'Superscript'	: { Element : 'sup' },
! 
  	// Basic Block Styles (Font Format Combo).
  	'p'				: { Element : 'p' },
***************
*** 217,244 ****
  	'h5'			: { Element : 'h5' },
  	'h6'			: { Element : 'h6' },
! 	
  	// Other formatting features.
! 	'FontFace' : 
! 	{ 
! 		Element		: 'span', 
! 		Styles		: { 'font-family' : '#("Font")' }, 
  		Overrides	: [ { Element : 'font', Attributes : { 'face' : null } } ]
  	},
! 	
  	'Size' :
! 	{ 
! 		Element		: 'span', 
! 		Styles		: { 'font-size' : '#("Size","fontSize")' }, 
  		Overrides	: [ { Element : 'font', Attributes : { 'size' : null } } ]
  	},
! 	
  	'Color' :
! 	{ 
! 		Element		: 'span', 
! 		Styles		: { 'color' : '#("Color","color")' }, 
  		Overrides	: [ { Element : 'font', Attributes : { 'color' : null } } ]
  	},
! 	
! 	'BackColor'		: { Element : 'span', Styles : { 'background-color' : '#("Color","color")' } }
  };
  
--- 223,252 ----
  	'h5'			: { Element : 'h5' },
  	'h6'			: { Element : 'h6' },
! 
  	// Other formatting features.
! 	'FontFace' :
! 	{
! 		Element		: 'span',
! 		Styles		: { 'font-family' : '#("Font")' },
  		Overrides	: [ { Element : 'font', Attributes : { 'face' : null } } ]
  	},
! 
  	'Size' :
! 	{
! 		Element		: 'span',
! 		Styles		: { 'font-size' : '#("Size","fontSize")' },
  		Overrides	: [ { Element : 'font', Attributes : { 'size' : null } } ]
  	},
! 
  	'Color' :
! 	{
! 		Element		: 'span',
! 		Styles		: { 'color' : '#("Color","color")' },
  		Overrides	: [ { Element : 'font', Attributes : { 'color' : null } } ]
  	},
! 
! 	'BackColor'		: { Element : 'span', Styles : { 'background-color' : '#("Color","color")' } },
! 
! 	'SelectionHighlight' : { Element : 'span', Styles : { 'background-color' : 'navy', 'color' : 'white' } }
  };
  
***************
*** 270,284 ****
  
  FCKConfig.LinkBrowser = true ;
! FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
  FCKConfig.LinkBrowserWindowWidth	= FCKConfig.ScreenWidth * 0.7 ;		// 70%
  FCKConfig.LinkBrowserWindowHeight	= FCKConfig.ScreenHeight * 0.7 ;	// 70%
  
  FCKConfig.ImageBrowser = true ;
! FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
  FCKConfig.ImageBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;	// 70% ;
  FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;	// 70% ;
  
  FCKConfig.FlashBrowser = true ;
! FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=../../connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
  FCKConfig.FlashBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;	//70% ;
  FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;	//70% ;
--- 278,292 ----
  
  FCKConfig.LinkBrowser = true ;
! FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
  FCKConfig.LinkBrowserWindowWidth	= FCKConfig.ScreenWidth * 0.7 ;		// 70%
  FCKConfig.LinkBrowserWindowHeight	= FCKConfig.ScreenHeight * 0.7 ;	// 70%
  
  FCKConfig.ImageBrowser = true ;
! FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
  FCKConfig.ImageBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;	// 70% ;
  FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;	// 70% ;
  
  FCKConfig.FlashBrowser = true ;
! FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=' + encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ) ;
  FCKConfig.FlashBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;	//70% ;
  FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;	//70% ;
***************
*** 303,306 ****
  FCKConfig.SmileyColumns = 8 ;
  FCKConfig.SmileyWindowWidth		= 320 ;
! FCKConfig.SmileyWindowHeight	= 240 ;
  
--- 311,316 ----
  FCKConfig.SmileyColumns = 8 ;
  FCKConfig.SmileyWindowWidth		= 320 ;
! FCKConfig.SmileyWindowHeight	= 210 ;
  
+ FCKConfig.BackgroundBlockerColor = '#ffffff' ;
+ FCKConfig.BackgroundBlockerOpacity = 0.50 ;

Index: fckeditor_php4.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/fckeditor_php4.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckeditor_php4.php	9 Feb 2008 12:53:56 -0000	1.1
--- fckeditor_php4.php	5 May 2008 00:35:23 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 28,40 ****
  class FCKeditor
  {
  	var $InstanceName ;
  	var $BasePath ;
  	var $Width ;
  	var $Height ;
  	var $ToolbarSet ;
  	var $Value ;
  	var $Config ;
  
! 	// PHP 4 Constructor
  	function FCKeditor( $instanceName )
  	{
--- 28,85 ----
  class FCKeditor
  {
+ 	/**
+ 	 * Name of the FCKeditor instance.
+ 	 *
+ 	 * @access protected
+ 	 * @var string
+ 	 */
  	var $InstanceName ;
+ 	/**
+ 	 * Path to FCKeditor relative to the document root.
+ 	 *
+ 	 * @var string
+ 	 */
  	var $BasePath ;
+ 	/**
+ 	 * Width of the FCKeditor.
+ 	 * Examples: 100%, 600
+ 	 *
+ 	 * @var mixed
+ 	 */
  	var $Width ;
+ 	/**
+ 	 * Height of the FCKeditor.
+ 	 * Examples: 400, 50%
+ 	 *
+ 	 * @var mixed
+ 	 */
  	var $Height ;
+ 	/**
+ 	 * Name of the toolbar to load.
+ 	 *
+ 	 * @var string
+ 	 */
  	var $ToolbarSet ;
+ 	/**
+ 	 * Initial value.
+ 	 *
+ 	 * @var string
+ 	 */
  	var $Value ;
+ 	/**
+ 	 * This is where additional configuration can be passed.
+ 	 * Example:
+ 	 * $oFCKeditor->Config['EnterMode'] = 'br';
+ 	 *
+ 	 * @var array
+ 	 */
  	var $Config ;
  
! 	/**
! 	 * Main Constructor.
! 	 * Refer to the _samples/php directory for examples.
! 	 *
! 	 * @param string $instanceName
! 	 */
  	function FCKeditor( $instanceName )
  	{
***************
*** 49,52 ****
--- 94,101 ----
  	}
  
+ 	/**
+ 	 * Display FCKeditor.
+ 	 *
+ 	 */
  	function Create()
  	{
***************
*** 54,66 ****
  	}
  
  	function CreateHtml()
  	{
  		$HtmlValue = htmlspecialchars( $this->Value ) ;
  
! 		$Html = '<div>' ;
! 		
  		if ( !isset( $_GET ) ) {
  			global $HTTP_GET_VARS ;
! 		    $_GET = $HTTP_GET_VARS ;
  		}
  
--- 103,120 ----
  	}
  
+ 	/**
+ 	 * Return the HTML code required to run FCKeditor.
+ 	 *
+ 	 * @return string
+ 	 */
  	function CreateHtml()
  	{
  		$HtmlValue = htmlspecialchars( $this->Value ) ;
  
! 		$Html = '' ;
! 
  		if ( !isset( $_GET ) ) {
  			global $HTTP_GET_VARS ;
! 			$_GET = $HTTP_GET_VARS ;
  		}
  
***************
*** 101,109 ****
  		}
  
- 		$Html .= '</div>' ;
- 
  		return $Html ;
  	}
  
  	function IsCompatible()
  	{
--- 155,166 ----
  		}
  
  		return $Html ;
  	}
  
+ 	/**
+ 	 * Returns true if browser is compatible with FCKeditor.
+ 	 *
+ 	 * @return boolean
+ 	 */
  	function IsCompatible()
  	{
***************
*** 111,114 ****
--- 168,177 ----
  	}
  
+ 	/**
+ 	 * Get settings from Config array as a single string.
+ 	 *
+ 	 * @access protected
+ 	 * @return string
+ 	 */
  	function GetConfigFieldString()
  	{
***************
*** 134,137 ****
--- 197,208 ----
  	}
  
+ 	/**
+ 	 * Encode characters that may break the configuration string
+ 	 * generated by GetConfigFieldString().
+ 	 *
+ 	 * @access protected
+ 	 * @param string $valueToEncode
+ 	 * @return string
+ 	 */
  	function EncodeConfig( $valueToEncode )
  	{
***************
*** 144,147 ****
  	}
  }
- 
- ?>
--- 215,216 ----

Index: fckeditor_php5.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/fckeditor_php5.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** fckeditor_php5.php	9 Feb 2008 12:53:56 -0000	1.1
--- fckeditor_php5.php	5 May 2008 00:35:23 -0000	1.2
***************
*** 2,6 ****
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  /*
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 28,41 ****
  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 ;
--- 28,86 ----
  class FCKeditor
  {
! 	/**
! 	 * Name of the FCKeditor instance.
! 	 *
! 	 * @access protected
! 	 * @var string
! 	 */
! 	public $InstanceName ;
! 	/**
! 	 * Path to FCKeditor relative to the document root.
! 	 *
! 	 * @var string
! 	 */
! 	public $BasePath ;
! 	/**
! 	 * Width of the FCKeditor.
! 	 * Examples: 100%, 600
! 	 *
! 	 * @var mixed
! 	 */
! 	public $Width ;
! 	/**
! 	 * Height of the FCKeditor.
! 	 * Examples: 400, 50%
! 	 *
! 	 * @var mixed
! 	 */
! 	public $Height ;
! 	/**
! 	 * Name of the toolbar to load.
! 	 *
! 	 * @var string
! 	 */
! 	public $ToolbarSet ;
! 	/**
! 	 * Initial value.
! 	 *
! 	 * @var string
! 	 */
! 	public $Value ;
! 	/**
! 	 * This is where additional configuration can be passed.
! 	 * Example:
! 	 * $oFCKeditor->Config['EnterMode'] = 'br';
! 	 *
! 	 * @var array
! 	 */
! 	public $Config ;
  
! 	/**
! 	 * Main Constructor.
! 	 * Refer to the _samples/php directory for examples.
! 	 *
! 	 * @param string $instanceName
! 	 */
! 	public function __construct( $instanceName )
   	{
  		$this->InstanceName	= $instanceName ;
***************
*** 49,62 ****
  	}
  
! 	function Create()
  	{
  		echo $this->CreateHtml() ;
  	}
  
! 	function CreateHtml()
  	{
  		$HtmlValue = htmlspecialchars( $this->Value ) ;
  
! 		$Html = '<div>' ;
  
  		if ( $this->IsCompatible() )
--- 94,116 ----
  	}
  
! 	/**
! 	 * Display FCKeditor.
! 	 *
! 	 */
! 	public function Create()
  	{
  		echo $this->CreateHtml() ;
  	}
  
! 	/**
! 	 * Return the HTML code required to run FCKeditor.
! 	 *
! 	 * @return string
! 	 */
! 	public function CreateHtml()
  	{
  		$HtmlValue = htmlspecialchars( $this->Value ) ;
  
! 		$Html = '' ;
  
  		if ( $this->IsCompatible() )
***************
*** 96,110 ****
  		}
  
- 		$Html .= '</div>' ;
- 
  		return $Html ;
  	}
  
! 	function IsCompatible()
  	{
  		return FCKeditor_IsCompatibleBrowser() ;
  	}
  
! 	function GetConfigFieldString()
  	{
  		$sParams = '' ;
--- 150,173 ----
  		}
  
  		return $Html ;
  	}
  
! 	/**
! 	 * Returns true if browser is compatible with FCKeditor.
! 	 *
! 	 * @return boolean
! 	 */
! 	public function IsCompatible()
  	{
  		return FCKeditor_IsCompatibleBrowser() ;
  	}
  
! 	/**
! 	 * Get settings from Config array as a single string.
! 	 *
! 	 * @access protected
! 	 * @return string
! 	 */
! 	public function GetConfigFieldString()
  	{
  		$sParams = '' ;
***************
*** 129,133 ****
  	}
  
! 	function EncodeConfig( $valueToEncode )
  	{
  		$chars = array(
--- 192,204 ----
  	}
  
! 	/**
! 	 * Encode characters that may break the configuration string
! 	 * generated by GetConfigFieldString().
! 	 *
! 	 * @access protected
! 	 * @param string $valueToEncode
! 	 * @return string
! 	 */
! 	public function EncodeConfig( $valueToEncode )
  	{
  		$chars = array(
***************
*** 139,142 ****
  	}
  }
- 
- ?>
\ No newline at end of file
--- 210,211 ----

Index: license.txt
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/license.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** license.txt	9 Feb 2008 12:53:56 -0000	1.3
--- license.txt	5 May 2008 00:35:23 -0000	1.4
***************
*** 1,4 ****
  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
--- 1,4 ----
  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! Copyright (C) 2003-2008 Frederico Caldeira Knabben
  
  Licensed under the terms of any of the following licenses at your
***************
*** 1245,1247 ****
       use the text of this Exhibit A rather than the text found in the
       Original Code Source Code for Your Modifications.]
- 
--- 1245,1246 ----

Index: _whatsnew.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/_whatsnew.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** _whatsnew.html	9 Feb 2008 12:53:56 -0000	1.7
--- _whatsnew.html	5 May 2008 00:35:23 -0000	1.8
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 34,69 ****
  		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>
--- 34,289 ----
  		FCKeditor ChangeLog - What's New?</h1>
  	<h3>
! 		Version 2.6</h3>
! 	<p>
! 		No changes. The stabilization of the 2.6 RC was completed successfully, as expected.</p>
! 	<h3>
! 		Version 2.6 RC</h3>
  	<p>
  		New Features and Improvements:</p>
  	<ul>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2017">#2017</a>] The FCKeditorAPI.Instances
! 			object can now be used to access all FCKeditor instances available in the page.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1980">#1980</a>] <span
! 			style="color: #ff0000">Attention:</span> By default, the editor now produces &lt;strong&gt;
! 			and &lt;em&gt; instead of &lt;b&gt; and &lt;i&gt;.</li>
  	</ul>
  	<p>
  		Fixed Bugs:</p>
  	<ul>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1924">#1924</a>] The dialog
! 			close button is now correctly positioned in IE in RTL languages.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1933">#1933</a>] Placeholder
! 			dialog will now display the placeholder value correctly in IE.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/957">#957</a>] Pressing
! 			Enter or typing after a placeholder with the placeholder plugin will no longer generate
! 			colored text.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1952">#1952</a>] Fixed
! 			an issue in FCKTools.FixCssUrls that, other than wrong, was breaking Opera.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1695">#1695</a>] Removed
! 			Ctrl-Tab hotkey for Source mode and allowed Ctrl-T to work in Firefox.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1666">#1666</a>] Fixed
! 			permission denied errors during opening popup menus in IE6 under domain relaxation
! 			mode.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1934">#1934</a>] Fixed
! 			JavaScript errors when calling Selection.EnsureSelection() in dialogs.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1920">#1920</a>] Fixed
! 			SSL warning message when opening image and flash dialogs under HTTPS in IE6.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1955">#1955</a>] [<a
! 			target="_blank" href="http://dev.fckeditor.net/ticket/1981">#1981</a>] [<a target="_blank"
! 				href="http://dev.fckeditor.net/ticket/1985">#1985</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/1989">#1989</a>]
! 			Fixed XHTML source formatting errors in non-IE browsers.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2000">#2000</a>] The #
! 			character is now properly encoded in file names returned by the File Browser.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1945">#1945</a>] New folders
! 			and file names are now properly sanitized against control characters. </li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1944">#1944</a>] Backslash
! 			character is now disallowed in current folder path.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1055">#1055</a>] Added
! 			logic to override JavaScript errors occurring inside the editing frame due to user
! 			added JavaScript code.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1647">#1647</a>] Hitting
! 			ENTER on list items containing block elements will now create new list item elements,
! 			instead of adding further blocks to the same list item.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1411">#1411</a>] Label
! 			only combos now get properly grayed out when moving to source view.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2009">#2009</a>] Fixed
! 			an important bug regarding styles removal on styled text boundaries, introduced
! 			with the 2.6 Beta 1. </li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2011">#2011</a>] Internal
! 			CSS &lt;style&gt; tags where being outputted when FullPage=true.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2016">#2016</a>] The Link
! 			dialog now properly selects the first field when opening it to modify mailto or
! 			anchor links. This problem was also throwing an error in IE.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2021">#2021</a>] The caret
! 			will no longer remain behind in the editing area when the placeholder dialog is
! 			opened.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2024">#2024</a>] Fixed
! 			JavaScript error in IE when the user tries to open dialogs in Source mode.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1853">#1853</a>] Setting
! 			ShiftEnterMode to p or div now works correctly when EnterMode is br.</li>
! 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1838">#1838</a>] Fixed
! 			the issue where context menus sometimes don't disappear after selecting an option.
  		</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2028">#2028</a>] Fixed
+ 			JavaScript error when EnterMode=br and user tries to insert a page break.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2002">#2002</a>] Fixed
+ 			the issue where the maximize editor button does not vertically expand the editing
+ 			area in Firefox.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1842">#1842</a>] PHP integration:
+ 			fixed filename encoding problems in file browser.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1832">#1832</a>] Calling
+ 			FCK.InsertHtml() in non-IE browsers would now activate the document processor as
+ 			expected.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1998">#1998</a>] The native
+ 			XMLHttpRequest class is now used in IE, whenever it is available.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1792">#1792</a>] In IE,
+ 			the browser was able to enter in an infinite loop when working with multiple editors
+ 			in the same page. </li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1948">#1948</a>] Some
+ 			CSS rules are reset to dialog elements to avoid conflict with the page CSS.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1965">#1965</a>] IE was
+ 			having problems with SpellerPages, causing some errors to be thrown when completing
+ 			the spell checking in some situations.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2042">#2042</a>] The FitWindow
+ 			command was throwing an error if executed in an editor where its relative button
+ 			is not present in the toolbar.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/922">#922</a>] Implemented
+ 			a generic document processor for &lt;OBJECT&gt; and &lt;EMBED&gt; tags.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1831">#1831</a>] Fixed
+ 			the issue where the placeholder icon for &lt;EMBED&gt; tags does not always show
+ 			up in IE7.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2049">#2049</a>] Fixed
+ 			a deleted cursor CSS attribute in the minified CSS inside fck_dialog_common.js.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1806">#1806</a>] In IE,
+ 			the caret will not any more move to the previous line when selecting a Format style
+ 			inside an empty paragraph.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1990">#1990</a>] In IE,
+ 			dialogs using API calls which deals with the selection, like InsertHtml now can
+ 			be sure the selection will be placed in the correct position.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1997">#1997</a>] With
+ 			IE, the first character of table captions where being lost on table creation.</li>
+ 		<li>The selection and cursor position was not being properly handled when creating some
+ 			elements like forms and tables.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/662">#662</a>] In the
+ 			Perl sample files, the GetServerPath function will now calculate the path properly.</li>
+ 	</ul>
+ 	<h3>
+ 		Version 2.6 Beta 1</h3>
+ 	<p>
+ 		New Features and Improvements:</p>
+ 	<ul>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/35">#35</a>] <strong>New
+ 			(and cool!) floating dialog system</strong>, avoiding problems with popup blockers
+ 			and enhancing the editor usability.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1886">#1886</a>] <strong>
+ 			Adobe AIR</strong> compatibility.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/123">#123</a>] Full support
+ 			for <strong>document.domain</strong> with automatic domain detection.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1622">#1622</a>] New <strong>
+ 			inline CSS cache</strong> feature, making it possible to avoid downloading the CSS
+ 			files for the editing area and skins. For that, it is enough to set the EditorAreaCSS,
+ 			SkinEditorCSS and SkinDialogCSS to string values in the format "/absolute/path/for/urls/|&lt;minified
+ 			CSS styles". All internal CSS links are already using this feature. </li>
+ 		<li>New language file for <strong>Canadian French</strong>.</li>
+ 	</ul>
+ 	<p>
+ 		Fixed Bugs:</p>
+ 	<ul>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1643">#1643</a>] Resolved
+ 			several "strict warning" messages in Firefox when running FCKeditor.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1522">#1522</a>] The ENTER
+ 			key will now work properly in IE with the cursor at the start of a formatted block.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1503">#1503</a>] It's
+ 			possible to define in the Styles that a Style (with an empty class) must be shown
+ 			selected only when no class is present in the current element, and selecting that
+ 			item will clear the current class (it does apply to any attribute, not only classes).</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/191">#191</a>] The scrollbars
+ 			are now being properly shown in Firefox Mac when placing FCKeditor inside a hidden
+ 			div.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/503">#503</a>] Orphaned
+ 			&lt;li&gt; elements now get properly enclosed in a &lt;ul&gt; on output.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/309">#309</a>] The ENTER
+ 			key will not any more break &lt;button&gt; elements at the beginning of paragraphs.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1654">#1654</a>] The editor
+ 			was not loading on a specific unknown situation. The breaking point has been removed.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1707">#1707</a>] The editor
+ 			no longer hangs when operating on documents imported from Microsoft Word.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1514">#1514</a>] Floating
+ 			panels attached to a shared toolbar among multiple FCKeditor instances are no longer
+ 			misplaced when the editing areas are absolutely or relatively positioned.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1715">#1715</a>] The ShowDropDialog
+ 			is now enforced only when ForcePasteAsPlainText = true.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1336">#1336</a>] Sometimes
+ 			the autogrow plugin didn't work properly in Firefox.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1728">#1728</a>] External
+ 			toolbars are now properly sized in Opera.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1782">#1782</a>] Clicking
+ 			on radio buttons or checkboxes in the editor in IE will no longer cause lockups
+ 			in IE.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/805">#805</a>] The FCKConfig.Keystrokes
+ 			commands where executed even if the command itself was disabled.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/982">#982</a>] The button
+ 			to empty the box in the "Paste from Word" has been removed as it leads to confusion
+ 			for some users.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1682">#1682</a>] Editing
+ 			control elements in Firefox, Opera and Safari now works properly.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1613">#1613</a>] The editor
+ 			was surrounded by a &lt;div&gt; element that wasn't really needed.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/676">#676</a>] If a form
+ 			control was moved in IE after creating it, then it did lose its name.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/738">#738</a>] It wasn't
+ 			possible to change the type of an existing button.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1854">#1854</a>] Indentation
+ 			now works inside table cells.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1717">#1717</a>] The editor
+ 			was entering on looping on some specific cases when dealing with invalid source
+ 			markup.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1530">#1530</a>] Pasting
+ 			text into the "Find what" fields in the Find and Replace dialog would now activate
+ 			the find and replace buttons.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1828">#1828</a>] The Find/Replace
+ 			dialog will no longer display wrong starting positions for the match when there
+ 			are multiple and identical characters preceding the character at the real starting
+ 			point of the match.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1878">#1878</a>] Fixed
+ 			a JavaScript error which occurs in the Find/Replace dialog when the user presses
+ 			"Find" or "Replace" after the "No match found" message has appeared.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1355">#1355</a>] Line
+ 			breaks and spaces are now conserved when converting to and from the "Formatted"
+ 			format.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1670">#1670</a>] Improved
+ 			the background color behind smiley icons and special characters in their corresponding
+ 			dialogs.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1693">#1693</a>] Custom
+ 			error messages are now properly displayed in the file browser.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/970">#970</a>] The text
+ 			and value fields in the selection box dialog will no longer extend beyond the dialog
+ 			limits when the user inputs a very long text or value for one of the selection options.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/479">#479</a>] Fixed the
+ 			issue where pressing Enter in an &lt;o:p&gt; tag in IE does not generate line breaks.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/481">#481</a>] Fixed the
+ 			issue where the image preview in image dialog sometimes doesn't display after selecting
+ 			the image from server browser.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1488">#1488</a>] PHP integration:
+ 			the FCKeditor class is now more PHP5/6 friendly ("public" keyword is used instead
+ 			of depreciated "var").</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1815">#1815</a>] PHP integration:
+ 			removed closing tag: "?&gt;", so no additional whitespace added when files are included.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1906">#1906</a>] PHP file
+ 			browser: fixed problems with DetectHtml() function when open_basedir was set.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1871">#1871</a>] PHP file
+ 			browser: permissions applied with the chmod command are now configurable.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1872">#1872</a>] Perl
+ 			file browser: permissions applied with the chmod command are now configurable.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1873">#1873</a>] Python
+ 			file browser: permissions applied with the chmod command are now configurable.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1572">#1572</a>] ColdFusion
+ 			integration: fixed issues with setting the editor height.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1692">#1692</a>] ColdFusion
+ 			file browser: it is possible now to define TempDirectory to avoid issues with GetTempdirectory()
+ 			returning an empty string.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1379">#1379</a>] ColdFusion
+ 			file browser: resolved issues with OnRequestEnd.cfm breaking the file browser.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1509">#1509</a>] InsertHtml()
+ 			in IE will no longer turn the preceding normal whitespace into &amp;nbsp;.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/958">#958</a>] The AddItem
+ 			method now has an additional fifth parameter "customData" that will be sent to the
+ 			Execute method of the command for that menu item, allowing a single command to be
+ 			used for different menu items..</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1502">#1502</a>] The RemoveFormat
+ 			command now also removes the attributes from the cleaned text. The list of attributes
+ 			is configurable with FCKConfig.RemoveAttributes.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1596">#1596</a>] On Safari,
+ 			dialogs have now right-to-left layout when it runs a RTL language, like Arabic.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1344">#1344</a>] Added
+ 			warning message on Copy and Cut operation failure on IE due to paste permission
+ 			settings.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1868">#1868</a>] Links
+ 			to file browser has been changed to avoid requests containing double dots.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1229">#1229</a>] Converting
+ 			multiple contiguous paragraphs to Formatted will now be merged into a single &lt;PRE&gt;
+ 			block.</li>
+ 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1627">#1627</a>] Samples
+ 			failed to load from local filesystem in IE7.</li>
  	</ul>
  	<p>

Index: _whatsnew_history.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/_whatsnew_history.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** _whatsnew_history.html	9 Feb 2008 12:53:56 -0000	1.1
--- _whatsnew_history.html	5 May 2008 00:35:23 -0000	1.2
***************
*** 2,6 ****
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2007 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
--- 2,6 ----
  <!--
   * FCKeditor - The text editor for Internet - http://www.fckeditor.net
!  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
   *
   * == BEGIN LICENSE ==
***************
*** 33,36 ****
--- 33,70 ----
  	<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>
  	<h3>
  		Version 2.5</h3>



From blaine at qs1489.pair.com  Sun May  4 22:04:01 2008
From: blaine at qs1489.pair.com (Blaine Lang)
Date: Mon, 05 May 2008 02:04:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.619,1.620
Message-ID: <20080505020401.E61EB10FE12@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.619
retrieving revision 1.620
diff -C2 -d -r1.619 -r1.620
*** history	1 May 2008 19:27:47 -0000	1.619
--- history	5 May 2008 02:03:59 -0000	1.620
***************
*** 12,15 ****
--- 12,16 ----
  
  Other changes:
+ - Updated FCKEditor to v2.6 [Blaine]
  - LDAP remote authentication module, provided by Jessica Blank / MTV Networks
  - The {lang_attribute} can only properly be set in a multi-language setup



From dhaun at qs1489.pair.com  Mon May  5 14:05:37 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 05 May 2008 18:05:37 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional style.css,
	1.97, 1.98
Message-ID: <20080505180537.45C0D10FE12@qs1489.pair.com>

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

Modified Files:
	style.css 
Log Message:
Adapt for changes in {blockid} creation


Index: style.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/style.css,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** style.css	4 Jan 2008 03:22:15 -0000	1.97
--- style.css	5 May 2008 18:05:35 -0000	1.98
***************
*** 219,223 ****
  }
  /* Menus in blocks *****************************************************************/
! #Admins_Only ul, #User_Functions ul, #Topics ul {
    list-style:none;
    padding:0px;
--- 219,223 ----
  }
  /* Menus in blocks *****************************************************************/
! #AdminsOnly ul, #UserFunctions ul, #Topics ul {
    list-style:none;
    padding:0px;



From dhaun at qs1489.pair.com  Mon May  5 14:10:05 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 05 May 2008 18:10:05 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html siteconfig.php,1.10,1.11
Message-ID: <20080505181005.171D010FE12@qs1489.pair.com>

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

Modified Files:
	siteconfig.php 
Log Message:
Let's call this 1.5.0b1


Index: siteconfig.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/siteconfig.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** siteconfig.php	2 Feb 2008 15:04:37 -0000	1.10
--- siteconfig.php	5 May 2008 18:10:03 -0000	1.11
***************
*** 32,36 ****
  }
  if (!defined('VERSION')) {
!   define('VERSION', '1.5.0');
  }
  
--- 32,36 ----
  }
  if (!defined('VERSION')) {
!   define('VERSION', '1.5.0b1');
  }
  



From dhaun at qs1489.pair.com  Mon May  5 14:10:05 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 05 May 2008 18:10:05 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs changes.html, 1.70,
	1.71 history, 1.620, 1.621
Message-ID: <20080505181005.310E410FE14@qs1489.pair.com>

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

Modified Files:
	changes.html history 
Log Message:
Let's call this 1.5.0b1


Index: changes.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/changes.html,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** changes.html	20 Apr 2008 17:51:59 -0000	1.70
--- changes.html	5 May 2008 18:10:03 -0000	1.71
***************
*** 36,40 ****
--- 36,42 ----
      OpenID, so that they don't need to create a new account with your site but
      still get all the benefits of a normal registered user.</li>
+ <li>New LDAP remote authentication module.</li>
  <li>The Links plugin now has hierarchical (sub-)categories.</li>
+ <li>Updated <a href="http://fckeditor.net/">FCKeditor</a> to version 2.6.</li>
  <li>Rewrite of the underlying story code. Amongst other things, this should
      finally resolve all outstanding issues with the handling of special

Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.620
retrieving revision 1.621
diff -C2 -d -r1.620 -r1.621
*** history	5 May 2008 02:03:59 -0000	1.620
--- history	5 May 2008 18:10:03 -0000	1.621
***************
*** 1,6 ****
  Geeklog History/Changes:
  
! ??? ??, 2008 (1.5.0)
! ------------
  
  This release incorporates the following projects implemented during
--- 1,6 ----
  Geeklog History/Changes:
  
! May 5, 2008 (1.5.0b1)
! -----------
  
  This release incorporates the following projects implemented during
***************
*** 16,25 ****
  - The {lang_attribute} can only properly be set in a multi-language setup
    (bug #0000616) [Dirk]
- - Calendar block now includes events from the current day (in progress or all
-   day events, bug 0000604, patch from forums)
  - Removed Blogger remote authentication option. Blogger.com have changed their
    authentication process, so this module no longer works.
! - Emails sent from Geeklog will now have an X-Originating-IP header to help
!   track spam / abuse [Dirk]
  - The topic editor allowed you to enter topic IDs with more than 20 characters
    (reported by Markus Wollschl?ger) [Dirk]
--- 16,23 ----
  - The {lang_attribute} can only properly be set in a multi-language setup
    (bug #0000616) [Dirk]
  - Removed Blogger remote authentication option. Blogger.com have changed their
    authentication process, so this module no longer works.
! - Emails sent from Geeklog now have an X-Originating-IP header to help track
!   spam or abuse [Dirk]
  - The topic editor allowed you to enter topic IDs with more than 20 characters
    (reported by Markus Wollschl?ger) [Dirk]
***************
*** 107,111 ****
    most cases, though [Dirk]
  - Added optional Wikitext postmode for stories [Oliver]
! - Addded optional noreply-email address option to config.php to prevent
    spammers retrieving the admin's email address from registering online [Oliver]
  - Added support for "Microsummaries" to index.php.
--- 105,109 ----
    most cases, though [Dirk]
  - Added optional Wikitext postmode for stories [Oliver]
! - Added optional noreply-email address option to config.php to prevent
    spammers retrieving the admin's email address from registering online [Oliver]
  - Added support for "Microsummaries" to index.php.
***************
*** 153,156 ****
--- 151,156 ----
  Calendar plugin (1.0.2)
  ---------------
+ - Calendar block now includes events from the current day (in progress or all
+   day events, bug 0000604, patch from forums)
  - Fixed deleting events submissions from the Events editor [Dirk]
  - The global $_STATES has been removed from Geeklog. The state in an event's



From dhaun at qs1489.pair.com  Mon May  5 16:04:40 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 05 May 2008 20:04:40 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-user.php,1.45,1.46
Message-ID: <20080505200440.B13E010FE12@qs1489.pair.com>

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

Modified Files:
	lib-user.php 
Log Message:
No need to escape the & here - notifications are sent as plain text


Index: lib-user.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-user.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** lib-user.php	9 Dec 2007 18:05:39 -0000	1.45
--- lib-user.php	5 May 2008 20:04:38 -0000	1.46
***************
*** 364,368 ****
      } else {
          // user has been created, or has activated themselves:
!         $mailbody .= "$LANG29[4] <{$_CONF['site_url']}/users.php?mode=profile&amp;uid={$uid}>\n\n";
      }
      $mailbody .= "\n------------------------------\n";
--- 364,368 ----
      } else {
          // user has been created, or has activated themselves:
!         $mailbody .= "$LANG29[4] <{$_CONF['site_url']}/users.php?mode=profile&uid={$uid}>\n\n";
      }
      $mailbody .= "\n------------------------------\n";



From dhaun at qs1489.pair.com  Tue May  6 14:20:45 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Tue, 06 May 2008 18:20:45 +0000
Subject: [geeklog-cvs] Geeklog-1.x/language catalan_utf-8.php, 1.3,
	1.4 japanese.php, 1.42, 1.43 japanese_utf-8.php, 1.26, 1.27
Message-ID: <20080506182045.71DD210FE12@qs1489.pair.com>

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

Modified Files:
	catalan_utf-8.php japanese.php japanese_utf-8.php 
Log Message:
Fixed invalid <brXHTML> tag in some language files (bug #0000621)


Index: japanese_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/japanese_utf-8.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** japanese_utf-8.php	2 May 2008 15:08:10 -0000	1.26
--- japanese_utf-8.php	6 May 2008 18:20:43 -0000	1.27
***************
*** 627,631 ****
      4 => '???????????????',
      5 => '??????????????????',
!     6 => '???????????????????????????????????????????????????????????????<brXHTML>?????????????????????????????????????????????????????????',
      7 => '????????????'
  );
--- 627,631 ----
      4 => '???????????????',
      5 => '??????????????????',
!     6 => '???????????????????????????????????????????????????????????????<br' . XHTML . '>?????????????????????????????????????????????????????????',
      7 => '????????????'
  );
***************
*** 889,893 ****
      50 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
      51 => '?????????????????????',
!     52 => '<brXHTML>???: ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
      53 => '????????????',
      54 => '????????????',
--- 889,893 ----
      50 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
      51 => '?????????????????????',
!     52 => '<br' . XHTML . '>???: ????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
      53 => '????????????',
      54 => '????????????',
***************
*** 996,1000 ****
      8 => '???????????????????????????????????????????????????????????????',
      9 => '???????????????????????????????????????????????????Geeklog??????????????????<a href=http://www.geeklog.net>Geeklog</a>????????????????????????????????????????????????????????????????????????????????????????????????????????????',
!     10 => '<brXHTML><b>?????????????????????????????????????????????????????????</b><brXHTML><brXHTML>',
      11 => '??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
      12 => 'plugineditor()???????????????????????????????????????????????????',
--- 996,1000 ----
      8 => '???????????????????????????????????????????????????????????????',
      9 => '???????????????????????????????????????????????????Geeklog??????????????????<a href=http://www.geeklog.net>Geeklog</a>????????????????????????????????????????????????????????????????????????????????????????????????????????????',
!     10 => '<br' . XHTML . '><b>?????????????????????????????????????????????????????????</b><br' . XHTML . '><br' . XHTML . '>',
      11 => '??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
      12 => 'plugineditor()???????????????????????????????????????????????????',
***************
*** 1160,1164 ****
      75 => '????????????????????????POST request?????????????????????????????????',
      76 => '????????????????????????????????????????????????',
!     77 => '??????:<brXHTML>?????????????????????????????????????????????UTF-8???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????PHP?????? mbstring ????????????????????????????????????????????????UTF-8?????????????????????????????????????????????????????????????????????????????????',
      78 => '??????????????????????????????????????????????????????????????????????????????????????????????????????',
      79 => '???????????????????????????????????????????????????????????????????????????????????????????????????????????????',
--- 1160,1164 ----
      75 => '????????????????????????POST request?????????????????????????????????',
      76 => '????????????????????????????????????????????????',
!     77 => '??????:<br' . XHTML . '>?????????????????????????????????????????????UTF-8???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????PHP?????? mbstring ????????????????????????????????????????????????UTF-8?????????????????????????????????????????????????????????????????????????????????',
      78 => '??????????????????????????????????????????????????????????????????????????????????????????????????????',
      79 => '???????????????????????????????????????????????????????????????????????????????????????????????????????????????',

Index: catalan_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/catalan_utf-8.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** catalan_utf-8.php	2 May 2008 15:08:09 -0000	1.3
--- catalan_utf-8.php	6 May 2008 18:20:43 -0000	1.4
***************
*** 1848,1850 ****
  );
  
! ?>
--- 1848,1850 ----
  );
  
! ?>
\ No newline at end of file

Index: japanese.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/language/japanese.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** japanese.php	2 May 2008 15:08:10 -0000	1.42
--- japanese.php	6 May 2008 18:20:43 -0000	1.43
***************
*** 627,631 ****
      4 => '??????????',
      5 => '????????????',
!     6 => '??????????????????????????????????????????<brXHTML>??????????????????????????????????????',
      7 => '????????'
  );
--- 627,631 ----
      4 => '??????????',
      5 => '????????????',
!     6 => '??????????????????????????????????????????<br' . XHTML . '>??????????????????????????????????????',
      7 => '????????'
  );
***************
*** 889,893 ****
      50 => '????????????????????????????????????????????????????????????????????????????????',
      51 => '??????????????',
!     52 => '<brXHTML>??: ????????????????????????????????????????????????????????????????????????????????????????',
      53 => '????????',
      54 => '????????',
--- 889,893 ----
      50 => '????????????????????????????????????????????????????????????????????????????????',
      51 => '??????????????',
!     52 => '<br' . XHTML . '>??: ????????????????????????????????????????????????????????????????????????????????????????',
      53 => '????????',
      54 => '????????',
***************
*** 996,1000 ****
      8 => '??????????????????????????????????????????',
      9 => '??????????????????????????????????Geeklog????????????<a href=http://www.geeklog.net>Geeklog</a>????????????????????????????????????????????????????????????????????????',
!     10 => '<brXHTML><b>??????????????????????????????????????</b><brXHTML><brXHTML>',
      11 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
      12 => 'plugineditor()??????????????????????????????????',
--- 996,1000 ----
      8 => '??????????????????????????????????????????',
      9 => '??????????????????????????????????Geeklog????????????<a href=http://www.geeklog.net>Geeklog</a>????????????????????????????????????????????????????????????????????????',
!     10 => '<br' . XHTML . '><b>??????????????????????????????????????</b><br' . XHTML . '><br' . XHTML . '>',
      11 => '????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????',
      12 => 'plugineditor()??????????????????????????????????',
***************
*** 1160,1164 ****
      75 => '????????????????POST request??????????????????????',
      76 => '????????????????????????????????',
!     77 => '????:<brXHTML>??????????????????????????????UTF-8??????????????????????????????????????????????????????????????????????????????????PHP???? mbstring ????????????????????????????????UTF-8??????????????????????????????????????????????????????',
      78 => '????????????????????????????????????????????????????????????????????',
      79 => '??????????????????????????????????????????????????????????????????????????',
--- 1160,1164 ----
      75 => '????????????????POST request??????????????????????',
      76 => '????????????????????????????????',
!     77 => '????:<br' . XHTML . '>??????????????????????????????UTF-8??????????????????????????????????????????????????????????????????????????????????PHP???? mbstring ????????????????????????????????UTF-8??????????????????????????????????????????????????????',
      78 => '????????????????????????????????????????????????????????????????????',
      79 => '??????????????????????????????????????????????????????????????????????????',



From dhaun at qs1489.pair.com  Tue May  6 14:20:45 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Tue, 06 May 2008 18:20:45 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/spamx/language japanese.php, 1.7,
	1.8 japanese_utf-8.php, 1.7, 1.8
Message-ID: <20080506182045.CF46B10FE15@qs1489.pair.com>

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

Modified Files:
	japanese.php japanese_utf-8.php 
Log Message:
Fixed invalid <brXHTML> tag in some language files (bug #0000621)


Index: japanese_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/language/japanese_utf-8.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** japanese_utf-8.php	2 May 2008 15:08:10 -0000	1.7
--- japanese_utf-8.php	6 May 2008 18:20:43 -0000	1.8
***************
*** 57,61 ****
      'actmod' => '??????????????????????????????',
      'avmod' => '?????????????????????????????????',
!     'coninst' => '<hrXHTML>???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????<brXHTML>??????????????????????????????????????????????????????????????? ',
      'fsc' => ' ????????????????????????????????????????????????????????????',
      'fsc1' => ' ????????????????????????',
--- 57,61 ----
      'actmod' => '??????????????????????????????',
      'avmod' => '?????????????????????????????????',
!     'coninst' => '<hrXHTML>???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????<br' . XHTML . '>??????????????????????????????????????????????????????????????? ',
      'fsc' => ' ????????????????????????????????????????????????????????????',
      'fsc1' => ' ????????????????????????',

Index: japanese.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/spamx/language/japanese.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** japanese.php	2 May 2008 15:08:10 -0000	1.7
--- japanese.php	6 May 2008 18:20:43 -0000	1.8
***************
*** 57,61 ****
      'actmod' => '????????????????????',
      'avmod' => '??????????????????????',
!     'coninst' => '<hrXHTML>??????????????????????????????????????????????????????????????????????????????????<brXHTML>?????????????????????????????????????????? ',
      'fsc' => ' ????????????????????????????????????????',
      'fsc1' => ' ????????????????',
--- 57,61 ----
      'actmod' => '????????????????????',
      'avmod' => '??????????????????????',
!     'coninst' => '<hrXHTML>??????????????????????????????????????????????????????????????????????????????????<br' . XHTML . '>?????????????????????????????????????????? ',
      'fsc' => ' ????????????????????????????????????????',
      'fsc1' => ' ????????????????',



From dhaun at qs1489.pair.com  Tue May  6 14:20:45 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Tue, 06 May 2008 18:20:45 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.621,1.622
Message-ID: <20080506182045.D089310FE16@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:
Fixed invalid <brXHTML> tag in some language files (bug #0000621)


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.621
retrieving revision 1.622
diff -C2 -d -r1.621 -r1.622
*** history	5 May 2008 18:10:03 -0000	1.621
--- history	6 May 2008 18:20:43 -0000	1.622
***************
*** 1,8 ****
  Geeklog History/Changes:
  
! May 5, 2008 (1.5.0b1)
! -----------
  
! This release incorporates the following projects implemented during
  the 2007 Google Summer of Code:
  
--- 1,8 ----
  Geeklog History/Changes:
  
! May ??, 2008 (1.5.0b2)
! ------------
  
! Geeklog 1.5.0 incorporates the following projects implemented during
  the 2007 Google Summer of Code:
  
***************
*** 12,15 ****
--- 12,23 ----
  
  Other changes:
+ - Fixed invalid <brXHTML> tag in some language files (bug #0000621) [Dirk]
+ - The URL sent in a user registration notification contained a &amp; where it
+   should have been a simple & [Dirk]
+ 
+ 
+ May 5, 2008 (1.5.0b1)
+ -----------
+ 
  - Updated FCKEditor to v2.6 [Blaine]
  - LDAP remote authentication module, provided by Jessica Blank / MTV Networks



From dhaun at qs1489.pair.com  Tue May  6 14:20:45 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Tue, 06 May 2008 18:20:45 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/calendar/language czech.php, 1.4,
	1.5 czech_utf-8.php, 1.2, 1.3 danish.php, 1.2,
	1.3 danish_utf-8.php, 1.2, 1.3 dutch.php, 1.5,
	1.6 dutch_utf-8.php, 1.2, 1.3 estonian.php, 1.4,
	1.5 estonian_utf-8.php, 1.4, 1.5 french_canada.php, 1.4,
	1.5 french_canada_utf-8.php, 1.2, 1.3 german.php, 1.7,
	1.8 german_formal.php, 1.5, 1.6 german_formal_utf-8.php, 1.4,
	1.5 german_utf-8.php, 1.5, 1.6 japanese.php, 1.7,
	1.8 japanese_utf-8.php, 1.7, 1.8 korean.php, 1.4,
	1.5 korean_utf-8.php, 1.4, 1.5 russian.php, 1.4,
	1.5 russian_utf-8.php, 1.4, 1.5 slovenian.php, 1.4,
	1.5 slovenian_utf-8.php, 1.4, 1.5 spanish.php, 1.2,
	1.3 spanish_utf-8.php, 1.4, 1.5 ukrainian.php, 1.4,
	1.5 ukrainian_koi8-u.php, 1.4, 1.5 ukrainian_utf-8.php, 1.4, 1.5
Message-ID: <20080506182045.BDDA610FE14@qs1489.pair.com>

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

Modified Files:
	czech.php czech_utf-8.php danish.php danish_utf-8.php 
	dutch.php dutch_utf-8.php estonian.php estonian_utf-8.php 
	french_canada.php french_canada_utf-8.php german.php 
	german_formal.php german_formal_utf-8.php german_utf-8.php 
	japanese.php japanese_utf-8.php korean.php korean_utf-8.php 
	russian.php russian_utf-8.php slovenian.php 
	slovenian_utf-8.php spanish.php spanish_utf-8.php 
	ukrainian.php ukrainian_koi8-u.php ukrainian_utf-8.php 
Log Message:
Fixed invalid <brXHTML> tag in some language files (bug #0000621)


Index: russian.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/russian.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** russian.php	2 May 2008 15:08:10 -0000	1.4
--- russian.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 157,161 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 157,161 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: korean.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/korean.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** korean.php	2 May 2008 15:08:10 -0000	1.4
--- korean.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 160,164 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 160,164 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: czech.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/czech.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** czech.php	2 May 2008 15:08:10 -0000	1.4
--- czech.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 157,161 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 157,161 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: japanese.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/japanese.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** japanese.php	2 May 2008 15:08:10 -0000	1.7
--- japanese.php	6 May 2008 18:20:43 -0000	1.8
***************
*** 160,164 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 160,164 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: german.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/german.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** german.php	2 May 2008 15:08:10 -0000	1.7
--- german.php	6 May 2008 18:20:43 -0000	1.8
***************
*** 158,162 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 158,162 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: danish_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/danish_utf-8.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** danish_utf-8.php	2 May 2008 15:08:10 -0000	1.2
--- danish_utf-8.php	6 May 2008 18:20:43 -0000	1.3
***************
*** 159,163 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 159,163 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: estonian.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/estonian.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** estonian.php	2 May 2008 15:08:10 -0000	1.4
--- estonian.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 161,165 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 161,165 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: slovenian.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/slovenian.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** slovenian.php	2 May 2008 15:08:10 -0000	1.4
--- slovenian.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 161,165 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 161,165 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: ukrainian_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/ukrainian_utf-8.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ukrainian_utf-8.php	2 May 2008 15:08:10 -0000	1.4
--- ukrainian_utf-8.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 157,161 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 157,161 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: spanish.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/spanish.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spanish.php	2 May 2008 15:08:10 -0000	1.2
--- spanish.php	6 May 2008 18:20:43 -0000	1.3
***************
*** 66,70 ****
      25 => 'No hay eventos pr?ximos',
      26 => 'Enviar un evento',
!     27 => "Al enviar un evento a {$_CONF['site_name']} se incluir? en el calendario maestro desde el cual otros usuarios pueden a?adirlo optativamente a su calendario personal. Este servicio <b>NO</b> debe usarse para eventos personales tales como cumplea?os y aniversarios.<br /><br />Una vez enviado un evento ?ste ser? redirigido a nuestros administradores y, si ellos lo aprueban, aparecer? en el calendario maestro.",
      28 => 'T?tulo',
      29 => 'Hora de terminaci?n',
--- 66,70 ----
      25 => 'No hay eventos pr?ximos',
      26 => 'Enviar un evento',
!     27 => "Al enviar un evento a {$_CONF['site_name']} se incluir? en el calendario maestro desde el cual otros usuarios pueden a?adirlo optativamente a su calendario personal. Este servicio <b>NO</b> debe usarse para eventos personales tales como cumplea?os y aniversarios.<br" . XHTML . "><br" . XHTML . ">Una vez enviado un evento ?ste ser? redirigido a nuestros administradores y, si ellos lo aprueban, aparecer? en el calendario maestro.",
      28 => 'T?tulo',
      29 => 'Hora de terminaci?n',
***************
*** 162,166 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 162,166 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: danish.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/danish.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** danish.php	2 May 2008 15:08:10 -0000	1.2
--- danish.php	6 May 2008 18:20:43 -0000	1.3
***************
*** 159,163 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 159,163 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: ukrainian_koi8-u.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/ukrainian_koi8-u.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ukrainian_koi8-u.php	2 May 2008 15:08:10 -0000	1.4
--- ukrainian_koi8-u.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 157,161 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 157,161 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: french_canada_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/french_canada_utf-8.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** french_canada_utf-8.php	2 May 2008 15:08:10 -0000	1.2
--- french_canada_utf-8.php	6 May 2008 18:20:43 -0000	1.3
***************
*** 160,164 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 160,164 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: korean_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/korean_utf-8.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** korean_utf-8.php	2 May 2008 15:08:10 -0000	1.4
--- korean_utf-8.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 160,164 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 160,164 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: spanish_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/spanish_utf-8.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spanish_utf-8.php	2 May 2008 15:08:10 -0000	1.4
--- spanish_utf-8.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 66,70 ****
      25 => 'No hay eventos pr??ximos',
      26 => 'Enviar un evento',
!     27 => "Al enviar un evento a {$_CONF['site_name']} se incluir?? en el calendario maestro desde el cual otros usuarios pueden a??adirlo optativamente a su calendario personal. Este servicio <b>NO</b> debe usarse para eventos personales tales como cumplea??os y aniversarios.<br /><br />Una vez enviado un evento ??ste ser?? redirigido a nuestros administradores y, si ellos lo aprueban, aparecer?? en el calendario maestro.",
      28 => 'T??tulo',
      29 => 'Hora de terminaci??n',
--- 66,70 ----
      25 => 'No hay eventos pr??ximos',
      26 => 'Enviar un evento',
!     27 => "Al enviar un evento a {$_CONF['site_name']} se incluir?? en el calendario maestro desde el cual otros usuarios pueden a??adirlo optativamente a su calendario personal. Este servicio <b>NO</b> debe usarse para eventos personales tales como cumplea??os y aniversarios.<br" . XHTML . "><br" . XHTML . ">Una vez enviado un evento ??ste ser?? redirigido a nuestros administradores y, si ellos lo aprueban, aparecer?? en el calendario maestro.",
      28 => 'T??tulo',
      29 => 'Hora de terminaci??n',
***************
*** 162,166 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 162,166 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: slovenian_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/slovenian_utf-8.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** slovenian_utf-8.php	2 May 2008 15:08:10 -0000	1.4
--- slovenian_utf-8.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 161,165 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 161,165 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: german_formal_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/german_formal_utf-8.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** german_formal_utf-8.php	2 May 2008 15:08:10 -0000	1.4
--- german_formal_utf-8.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 158,162 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 158,162 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: dutch.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/dutch.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dutch.php	2 May 2008 15:08:10 -0000	1.5
--- dutch.php	6 May 2008 18:20:43 -0000	1.6
***************
*** 158,162 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 158,162 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: dutch_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/dutch_utf-8.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dutch_utf-8.php	2 May 2008 15:08:10 -0000	1.2
--- dutch_utf-8.php	6 May 2008 18:20:43 -0000	1.3
***************
*** 158,162 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 158,162 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: russian_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/russian_utf-8.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** russian_utf-8.php	2 May 2008 15:08:10 -0000	1.4
--- russian_utf-8.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 157,161 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 157,161 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: estonian_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/estonian_utf-8.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** estonian_utf-8.php	2 May 2008 15:08:10 -0000	1.4
--- estonian_utf-8.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 161,165 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 161,165 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: ukrainian.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/ukrainian.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ukrainian.php	2 May 2008 15:08:10 -0000	1.4
--- ukrainian.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 157,161 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 157,161 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: french_canada.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/french_canada.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** french_canada.php	2 May 2008 15:08:10 -0000	1.4
--- french_canada.php	6 May 2008 18:20:43 -0000	1.5
***************
*** 160,164 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 160,164 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: japanese_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/japanese_utf-8.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** japanese_utf-8.php	2 May 2008 15:08:10 -0000	1.7
--- japanese_utf-8.php	6 May 2008 18:20:43 -0000	1.8
***************
*** 160,164 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 160,164 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: german_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/german_utf-8.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** german_utf-8.php	2 May 2008 15:08:10 -0000	1.5
--- german_utf-8.php	6 May 2008 18:20:43 -0000	1.6
***************
*** 158,162 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 158,162 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: german_formal.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/german_formal.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** german_formal.php	2 May 2008 15:08:10 -0000	1.5
--- german_formal.php	6 May 2008 18:20:43 -0000	1.6
***************
*** 158,162 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 158,162 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',

Index: czech_utf-8.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/czech_utf-8.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** czech_utf-8.php	2 May 2008 15:08:10 -0000	1.2
--- czech_utf-8.php	6 May 2008 18:20:43 -0000	1.3
***************
*** 157,161 ****
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<brXHTML>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',
--- 157,161 ----
      26 => 'Delete old entries',
      27 => 'These are the events that are older than ',
!     28 => ' months. Please click on the trashcan Icon on the bottom to delete them, or select a different timespan:<br' . XHTML . '>Find all entries that are older than ',
      29 => ' months.',
      30 => 'Update List',



From dhaun at qs1489.pair.com  Tue May  6 14:24:38 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Tue, 06 May 2008 18:24:38 +0000
Subject: [geeklog-cvs] tools/lm README,1.5,1.6 lm.php,1.6,1.7
Message-ID: <20080506182438.0E0EE10FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/tools/lm
In directory qs1489.pair.com:/tmp/cvs-serv76624

Modified Files:
	README lm.php 
Log Message:
Fixed handling of <br> tags for XHTML (and patch the accidentally created <brXHTML> tags)


Index: README
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** README	29 Apr 2008 18:47:45 -0000	1.5
--- README	6 May 2008 18:24:35 -0000	1.6
***************
*** 1,3 ****
! lm.php v1.0
  
  This script merges a Geeklog (foreign) language file with the english.php
--- 1,3 ----
! lm.php v1.0.1
  
  This script merges a Geeklog (foreign) language file with the english.php
***************
*** 51,62 ****
  History
  
! 0.1  first public release
! 0.2  make sure lines containing \n are enclosed in double quotes
! 0.3  added support for $LANG_PDF (Geeklog 1.3.10), introduced multibyte version
! 0.5  updated for Geeklog 1.4.0
! 0.6  updated for Geeklog 1.4.1
! 0.7  updated for Geeklog 1.5.0
! 0.8  merged lm.php and mblm.php into one script; added XHTML support
! 0.9  moved updating code into includes; now supports plugins
! 1.0  now supports core language files and all 5 default plugins
  
--- 51,63 ----
  History
  
! 0.1   first public release
! 0.2   make sure lines containing \n are enclosed in double quotes
! 0.3   added support for $LANG_PDF (Geeklog 1.3.10), introduced multibyte version
! 0.5   updated for Geeklog 1.4.0
! 0.6   updated for Geeklog 1.4.1
! 0.7   updated for Geeklog 1.5.0
! 0.8   merged lm.php and mblm.php into one script; added XHTML support
! 0.9   moved updating code into includes; now supports plugins
! 1.0   now supports core language files and all 5 default plugins
! 1.0.1 fixed handling of <br> tags and fixed accidentally created <brXHTML> tags
  

Index: lm.php
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/lm.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** lm.php	29 Apr 2008 18:47:45 -0000	1.6
--- lm.php	6 May 2008 18:24:35 -0000	1.7
***************
*** 33,37 ****
  // $Id$
  
! $VERSION = '1.0';
  
  // Prevent PHP from reporting uninitialized variables
--- 33,37 ----
  // $Id$
  
! $VERSION = '1.0.1';
  
  // Prevent PHP from reporting uninitialized variables
***************
*** 68,71 ****
--- 68,72 ----
  }
  
+ define('XHTML', '');
  
  // list of all variables accessed in the language file
***************
*** 145,148 ****
--- 146,152 ----
  {
      global $mb;
+ 
+     // fix accidentally created <brXHTML> tags in some 1.5.0b1 language files
+     $txt = my_str_replace('brXHTML', 'br', $txt);
  
      if ($mb) {



From dhaun at qs1489.pair.com  Wed May  7 14:48:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Wed, 07 May 2008 18:48:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.694,1.695
Message-ID: <20080507184819.B130610FE12@qs1489.pair.com>

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

Modified Files:
	lib-common.php 
Log Message:
Make sure the XHTML constant is defined in case the theme doesn't define it (cf. bug #0000622)


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.694
retrieving revision 1.695
diff -C2 -d -r1.694 -r1.695
*** lib-common.php	4 May 2008 21:50:11 -0000	1.694
--- lib-common.php	7 May 2008 18:48:17 -0000	1.695
***************
*** 327,333 ****
  // Include theme functions file which may/may not do anything
  
! if( file_exists( $_CONF['path_layout'] . 'functions.php' ))
! {
!     require_once( $_CONF['path_layout'] . 'functions.php' );
  }
  
--- 327,338 ----
  // Include theme functions file which may/may not do anything
  
! if (file_exists($_CONF['path_layout'] . 'functions.php')) {
!     require_once $_CONF['path_layout'] . 'functions.php';
! }
! 
! // ensure XHTML constant is defined to avoid problems elsewhere
! 
! if (!defined('XHTML')) {
!     define('XHTML', '');
  }
  
***************
*** 335,340 ****
  // fall back to 'gif' if they don't
  
! if( empty( $_IMAGE_TYPE ))
! {
      $_IMAGE_TYPE = 'gif';
  }
--- 340,344 ----
  // fall back to 'gif' if they don't
  
! if (empty($_IMAGE_TYPE)) {
      $_IMAGE_TYPE = 'gif';
  }



From dhaun at qs1489.pair.com  Wed May  7 14:48:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Wed, 07 May 2008 18:48:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.622,1.623
Message-ID: <20080507184819.C505E10FE14@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:
Make sure the XHTML constant is defined in case the theme doesn't define it (cf. bug #0000622)


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.622
retrieving revision 1.623
diff -C2 -d -r1.622 -r1.623
*** history	6 May 2008 18:20:43 -0000	1.622
--- history	7 May 2008 18:48:17 -0000	1.623
***************
*** 12,15 ****
--- 12,17 ----
  
  Other changes:
+ - Make sure the XHTML constant is defined if the theme doesn't already define
+   it (bug #0000622) [Dirk]
  - Fixed invalid <brXHTML> tag in some language files (bug #0000621) [Dirk]
  - The URL sent in a user registration notification contained a &amp; where it



From dhaun at qs1489.pair.com  Sat May 10 03:56:43 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 07:56:43 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.623,1.624
Message-ID: <20080510075643.9FB5510FE14@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:
COM_numberFormat should use floor, not abs (bug #0000624)


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.623
retrieving revision 1.624
diff -C2 -d -r1.623 -r1.624
*** history	7 May 2008 18:48:17 -0000	1.623
--- history	10 May 2008 07:56:41 -0000	1.624
***************
*** 12,15 ****
--- 12,16 ----
  
  Other changes:
+ - COM_numberFormat wouldn't handle decimals correctly (bug #0000624) [Dirk]
  - Make sure the XHTML constant is defined if the theme doesn't already define
    it (bug #0000622) [Dirk]



From dhaun at qs1489.pair.com  Sat May 10 03:56:43 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 07:56:43 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.695,1.696
Message-ID: <20080510075643.91AB810FE12@qs1489.pair.com>

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

Modified Files:
	lib-common.php 
Log Message:
COM_numberFormat should use floor, not abs (bug #0000624)


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.695
retrieving revision 1.696
diff -C2 -d -r1.695 -r1.696
*** lib-common.php	7 May 2008 18:48:17 -0000	1.695
--- lib-common.php	10 May 2008 07:56:41 -0000	1.696
***************
*** 5932,5936 ****
      global $_CONF;
  
!     if( $number - abs( $number ) > 0 ) // number has decimals
      {
          $dc = $_CONF['decimal_count'];
--- 5932,5936 ----
      global $_CONF;
  
!     if( $number - floor( $number ) > 0 ) // number has decimals
      {
          $dc = $_CONF['decimal_count'];



From dhaun at qs1489.pair.com  Sat May 10 04:43:01 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 08:43:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages/templates
	staticpage.thtml, 1.4, 1.5
Message-ID: <20080510084301.A404D10FE15@qs1489.pair.com>

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

Modified Files:
	staticpage.thtml 
Log Message:
Removed an extra } from staticpage.thtml


Index: staticpage.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/templates/staticpage.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** staticpage.thtml	5 Jan 2008 20:02:55 -0000	1.4
--- staticpage.thtml	10 May 2008 08:42:59 -0000	1.5
***************
*** 1,4 ****
  <span class="story-icons">{print_icon}{edit_icon}</span>
  {content}
! <p class="aligncenter">{lastupdate}<span style="padding-left:5px;padding-right:5px;visibility:{info_separator}}">|</span>{hits}</p>
  {commentbar}
--- 1,4 ----
  <span class="story-icons">{print_icon}{edit_icon}</span>
  {content}
! <p class="aligncenter">{lastupdate}<span style="padding-left:5px;padding-right:5px;visibility:{info_separator}">|</span>{hits}</p>
  {commentbar}



From dhaun at qs1489.pair.com  Sat May 10 04:43:01 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 08:43:01 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.624,1.625
Message-ID: <20080510084301.BA78910FE16@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:
Removed an extra } from staticpage.thtml


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.624
retrieving revision 1.625
diff -C2 -d -r1.624 -r1.625
*** history	10 May 2008 07:56:41 -0000	1.624
--- history	10 May 2008 08:42:59 -0000	1.625
***************
*** 12,15 ****
--- 12,17 ----
  
  Other changes:
+ - Removed an extra } from the Static Pages staticpage.thtml template file
+   (reported by Markus Wollschl?ger) [Dirk]
  - COM_numberFormat wouldn't handle decimals correctly (bug #0000624) [Dirk]
  - Make sure the XHTML constant is defined if the theme doesn't already define



From dhaun at qs1489.pair.com  Sat May 10 11:02:16 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 15:02:16 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs calendar.html, 1.10,
	1.11 links.html, 1.4, 1.5 theme.html, 1.78, 1.79
Message-ID: <20080510150216.D17ED10FE12@qs1489.pair.com>

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

Modified Files:
	calendar.html links.html theme.html 
Log Message:
Documentation updates - configuration and such


Index: links.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/links.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** links.html	5 Aug 2007 09:33:02 -0000	1.4
--- links.html	10 May 2008 15:02:14 -0000	1.5
***************
*** 14,20 ****
  <p>The links section used to be an integral part of the Geeklog core code, but have been moved to a plugin as of Geeklog 1.4.0.</p>
  
! <h2><a name="config.php">Configuration File</a></h2>
  
! <p>The links plugin has its own configuration file, located at <tt>/path/to/geeklog/plugins/links/config.php</tt>. There you will find the following options:</p>
  
  <table>
--- 14,22 ----
  <p>The links section used to be an integral part of the Geeklog core code, but have been moved to a plugin as of Geeklog 1.4.0.</p>
  
! <h2><a name="config.php">Configuration</a></h2>
  
! <p>The configuration of the Links plugin can be changed from the Configuration admin panel:</p>
! 
! <h3><a name="public">Public Links List Settings</a></h3>
  
  <table>
***************
*** 24,52 ****
  </tr>
  <tr>
-   <td><a name="desc_delete_links">delete_links</a></td>
-   <td>0</td>
-   <td>Defines what to do when a user is deleted that is the owner of a link.
-     When set to 0, all links owned by the deleted user will be assigned to a
-     user of the "Root" group (e.g. the site admin). When set to 1, the links
-     are deleted.</td>
- </tr>
- <tr class="r2">
-   <td><a name="desc_hidelinksmenu">hidelinksmenu</a></td>
-   <td>0</td>
-   <td>Whether to hide the "Links" entry from Geeklog's menu bar (when set to 1)
-     or to show it (when set to 0).</td>
- </tr>
- <tr>
-   <td><a name="desc_hidenewlinks">hidenewlinks</a></td>
-   <td>0</td>
-   <td>Whether new links should be hidden from the "What's New" block (when set
-     = 1) or whether to list them there (when set to = 0).</td>
- </tr>
- <tr class="r2">
-   <td><a name="desc_linkcols">linkcols</a></td>
-   <td>3</td>
-   <td>The number of link categories to display per column.</td>
- </tr>
- <tr>
    <td><a name="desc_linksloginrequired">linksloginrequired</a></td>
    <td>0</td>
--- 26,29 ----
***************
*** 60,72 ****
  </tr>
  <tr class="r2">
    <td><a name="desc_linksperpage">linksperpage</a></td>
    <td>10</td>
    <td>The number of links to show per page.</td>
  </tr>
  <tr>
!   <td><a name="desc_linksubmission">linksubmission</a></td>
!   <td>1</td>
!   <td>Whether links submitted by users will have to be approved by an admin
!     first (when set = 1) or show up immediately (when set = 0).</td>
  </tr>
  <tr class="r2">
--- 37,77 ----
  </tr>
  <tr class="r2">
+   <td><a name="desc_linkcols">linkcols</a></td>
+   <td>3</td>
+   <td>The number of link categories to display per column.</td>
+ </tr>
+ <tr>
    <td><a name="desc_linksperpage">linksperpage</a></td>
    <td>10</td>
    <td>The number of links to show per page.</td>
  </tr>
+ <tr class="r2">
+   <td><a name="desc_show_top10">show_top10</a></td>
+   <td><code>true</code></td>
+   <td>When both <code>$_LI_CONF['linkcols']</code> and
+     <code>$_LI_CONF['linksperpage']</code> are <em>not</em> 0, the plugin will
+     show a list of the 10 most clicked-on links on the Links plugin's index
+     page automatically. If you do not want that "top 10" list there, set this
+     option to <code>false</code>.</td>
+ </tr>
  <tr>
!   <td><a name="desc_show_category_descriptions">show_category_descriptions</a></td>
!   <td><code>true</code></td>
!   <td>Whether to show subcategory descriptions when viewing a category or not.</td>
! </tr>
! </table>
! 
! <h3><a name="admin">Links Admin Settings</a></h3>
! 
! <table>
! <tr><th width="25%">Variable</th>
!     <th width="25%">Default Value</th>
!     <th width="50%">Description</th>
! </tr>
! <tr>
!   <td><a name="desc_hidenewlinks">hidenewlinks</a></td>
!   <td>0</td>
!   <td>Whether new links should be hidden from the "What's New" block (when set
!     = 1) or whether to list them there (when set to = 0).</td>
  </tr>
  <tr class="r2">
***************
*** 78,81 ****
--- 83,98 ----
  </tr>
  <tr>
+   <td><a name="desc_hidelinksmenu">hidelinksmenu</a></td>
+   <td>0</td>
+   <td>Whether to hide the "Links" entry from Geeklog's menu bar (when set to 1)
+     or to show it (when set to 0).</td>
+ </tr>
+ <tr class="r2">
+   <td><a name="desc_linksubmission">linksubmission</a></td>
+   <td>1</td>
+   <td>Whether links submitted by users will have to be approved by an admin
+     first (when set = 1) or show up immediately (when set = 0).</td>
+ </tr>
+ <tr>
    <td><a name="desc_notification">notification</a></td>
    <td>0</td>
***************
*** 84,94 ****
  </tr>
  <tr class="r2">
!   <td><a name="desc_show_top10">show_top10</a></td>
!   <td><code>true</code></td>
!   <td>When both <code>$_LI_CONF['linkcols']</code> and
!     <code>$_LI_CONF['linksperpage']</code> are <em>not</em> 0, the plugin will
!     show a list of the 10 most clicked-on links on the Links plugin's index
!     page automatically. If you do not want that "top 10" list there, set this
!     option to <code>false</code>.</td>
  </tr>
  </table>
--- 101,127 ----
  </tr>
  <tr class="r2">
!   <td><a name="desc_delete_links">delete_links</a></td>
!   <td>0</td>
!   <td>Defines what to do when a user is deleted that is the owner of a link.
!     When set to 0, all links owned by the deleted user will be assigned to a
!     user of the "Root" group (e.g. the site admin). When set to 1, the links
!     are deleted.</td>
! </tr>
! <tr>
!   <td><a name="desc_aftersave">aftersave</a></td>
!   <td>'list'</td>
!   <td>Which page to go to after a links has been saved:
!     <ul>
!     <li>'item': go to the linked site(!)</li>
!     <li>'list': show admin's list of links (default)</li>
!     <li>'plugin': display the public list of links</li>
!     <li>'home': display the site's homepage</li>
!     <li>'admin': go to the "Admin Home" page, i.e. Command &amp; Control</li>
!     </ul></td>
! </tr>
! <tr class="r2">
!   <td><a name="desc_root">root</a></td>
!   <td>'site'</td>
!   <td>ID to use for the root of the link categories tree.</td>
  </tr>
  </table>

Index: calendar.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/calendar.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** calendar.html	2 Feb 2008 15:04:37 -0000	1.10
--- calendar.html	10 May 2008 15:02:14 -0000	1.11
***************
*** 15,21 ****
  but have been moved to a plugin as of Geeklog 1.4.1.</p>
  
! <h2><a name="config.php">Configuration File</a></h2>
  
! <p>The calendar plugin has its own configuration file, located at <tt>/path/to/geeklog/plugins/calendar/config.php</tt>. There you will find the following options:</p>
  
  <table>
--- 15,24 ----
  but have been moved to a plugin as of Geeklog 1.4.1.</p>
  
! <h2><a name="config.php">Configuration</a></h2>
  
! <p>The calendar's configuration can be changed from the Configuration admin
! panel:</p>
! 
! <h3><a name="general">General Calendar Settings</a></h3>
  
  <table>
***************
*** 36,48 ****
  </tr>
  <tr class="r2">
!   <td><a name="desc_delete_event">delete_event</a></td>
    <td>0</td>
!   <td>Defines what to do when a user is deleted that is the owner of an event.
!     When set to 0, all events owned by the deleted user will be assigned to a
!     user of the "Root" group (e.g. the site admin). When set to 1, the events
!     are deleted. This only applies to site events - a user's personal events
!     are always deleted.</td>
  </tr>
  <tr>
    <td><a name="desc_eventsubmission">eventsubmission</a></td>
    <td>1</td>
--- 39,53 ----
  </tr>
  <tr class="r2">
!   <td><a name="desc_hidecalendarmenu">hidecalendarmenu</a></td>
    <td>0</td>
!   <td>Whether to hide the "Calendar" entry from Geeklog's menu bar (when set to
!     1) or to show it (when set to 0).</td>
  </tr>
  <tr>
+   <td><a name="desc_personalcalendars">personalcalendars</a></td>
+   <td>0</td>
+   <td>Allow account holders to have a personal calendar</td>
+ </tr>
+ <tr class="r2">
    <td><a name="desc_eventsubmission">eventsubmission</a></td>
    <td>1</td>
***************
*** 50,66 ****
      first (when set = 1) or show up immediately (when set = 0).</td>
  </tr>
- <tr class="r2">
-   <td><a name="desc_event_types">event_types</a></td>
-   <td>Anniversary, Appointment, Birthday, Business, Education, Holiday, Meeting, Miscellaneous, Personal, Phone Call, Special Occasion, Travel, Vacation</td>
-   <td>The set of event types that are used both on the public calendar and the
-     user's personal calendar.</td>
- </tr>
  <tr>
!   <td><a name="desc_hidecalendarmenu">hidecalendarmenu</a></td>
!   <td>0</td>
!   <td>Whether to hide the "Calendar" entry from Geeklog's menu bar (when set to
!     1) or to show it (when set to 0).</td>
  </tr>
  <tr class="r2">
    <td><a name="desc_hour_mode">hour_mode</a></td>
    <td>12</td>
--- 55,71 ----
      first (when set = 1) or show up immediately (when set = 0).</td>
  </tr>
  <tr>
!   <td><a name="desc_showupcomingevents">showupcomingevents</a></td>
!   <td>1</td>
!   <td>Whether to show upcoming events (0 = no, 1 = yes) in a separate
!     block.</td>
  </tr>
  <tr class="r2">
+   <td><a name="desc_upcomingeventsrange">upcomingeventsrange</a></td>
+   <td>14</td>
+   <td>Number of days that the &quot;Upcoming Events&quot; block will look
+     ahead.</td>
+ </tr>
+ <tr>
    <td><a name="desc_hour_mode">hour_mode</a></td>
    <td>12</td>
***************
*** 70,73 ****
--- 75,84 ----
      href="config.html#desc_hour_mode">$_CONF['hour_mode']</a> by default.</td>
  </tr>
+ <tr class="r2">
+   <td><a name="desc_event_types">event_types</a></td>
+   <td>Anniversary, Appointment, Birthday, Business, Education, Holiday, Meeting, Miscellaneous, Personal, Phone Call, Special Occasion, Travel, Vacation</td>
+   <td>The set of event types that are used both on the public calendar and the
+     user's personal calendar.</td>
+ </tr>
  <tr>
    <td><a name="desc_notification">notification</a></td>
***************
*** 78,96 ****
  </tr>
  <tr class="r2">
!   <td><a name="desc_personalcalendars">personalcalendars</a></td>
    <td>0</td>
!   <td>Allow account holders to have a personal calendar</td>
  </tr>
  <tr>
!   <td><a name="desc_showupcomingevents">showupcomingevents</a></td>
!   <td>1</td>
!   <td>Whether to show upcoming events (0 = no, 1 = yes) in a separate
!     block.</td>
! </tr>
! <tr class="r2">
!   <td><a name="desc_upcomingeventsrange">upcomingeventsrange</a></td>
!   <td>14</td>
!   <td>Number of days that the &quot;Upcoming Events&quot; block will look
!     ahead.</td>
  </tr>
  </table>
--- 89,111 ----
  </tr>
  <tr class="r2">
!   <td><a name="desc_delete_event">delete_event</a></td>
    <td>0</td>
!   <td>Defines what to do when a user is deleted that is the owner of an event.
!     When set to 0, all events owned by the deleted user will be assigned to a
!     user of the "Root" group (e.g. the site admin). When set to 1, the events
!     are deleted. This only applies to site events - a user's personal events
!     are always deleted.</td>
  </tr>
  <tr>
!   <td><a name="desc_aftersave">aftersave</a></td>
!   <td>'list'</td>
!   <td>Which page to go to after an event has been saved:
!     <ul>
!     <li>'item': display the event details</li>
!     <li>'list': show admin's list of events (default)</li>
!     <li>'plugin': display the calendar</li>
!     <li>'home': display the site's homepage</li>
!     <li>'admin': go to the "Admin Home" page, i.e. Command &amp; Control</li>
!     </ul></td>
  </tr>
  </table>

Index: theme.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** theme.html	3 May 2008 20:01:58 -0000	1.78
--- theme.html	10 May 2008 15:02:14 -0000	1.79
***************
*** 172,175 ****
--- 172,199 ----
  lib-custom.php to output any HTML you like.</p>
  
+ <p><strong><a name="permalink">Adding a "permalink" to stories:</a></strong>
+ Many websites offer a so-called permalink, i.e. a link to a permanent URL for
+ the story. In Geeklog's default Professional theme, the article's headline
+ already provides the same functionality - it links to a permanent URL for the
+ story (pointing to article.php). However, since this is not very obvious and
+ since visitors often expect to find a "permalink" somewhere on the page, here's
+ how to add one yourself:</p>
+ <ol>
+ <li>Find a place in the story template files. The "story-footer" section in
+ <tt>storytext.thtml</tt> may be a good place since it already contains quite a
+ few story-related links.</li>
+ <li>Once you've found a place to put the permalink entry, enter this piece of
+ code:<br>
+ <code style="margin-left:2em">&lt;a href="{article_url}"&gt;{lang_permalink}&lt;a&gt;</code><br>
+ This will add a link to the article (<code>article_url</code>) using the word
+ "Permalink" from the current language file (<code>lang_permalink</code>).</li>
+ <li>Try it out. Be aware that at this point, your permalink entry only shows up
+ for non-featured articles. You may want to tweak the appearance a bit (using
+ CSS) or move the link around.</li>
+ <li>Add the same piece of code to the <tt>featuredstorytext.thtml</tt> and
+ <tt>archivestorytext.thtml</tt> templates so that the link also appears for
+ featured and archived stories.</li>
+ </ol>
+ 
  
  <h2><a name="changes">Theme changes in Geeklog 1.5.0</a></h2>



From dhaun at qs1489.pair.com  Sat May 10 12:35:24 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 16:35:24 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs calendar.html, 1.11,
	1.12 config.html, 1.87, 1.88 polls.html, 1.6, 1.7 spamx.html,
	1.23, 1.24 theme.html, 1.79, 1.80 themevars.html, 1.20,
	1.21 trackback.html, 1.9, 1.10
Message-ID: <20080510163524.E97FC10FE12@qs1489.pair.com>

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

Modified Files:
	calendar.html config.html polls.html spamx.html theme.html 
	themevars.html trackback.html 
Log Message:
More config related documentation updates


Index: trackback.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/trackback.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** trackback.html	5 Aug 2007 09:33:02 -0000	1.9
--- trackback.html	10 May 2008 16:35:22 -0000	1.10
***************
*** 65,69 ****
  <p>Your Geeklog site will, of course, be able to receive Trackbacks and Pingbacks to your stories. They will show up in a dedicated section below the story, similar to the section for comments. Once received, Geeklog will treat Trackbacks and Pingbacks the same, so you won't be able to tell the difference.</p>
  
! <p>When you disable Trackbacks and / or Pingbacks in <tt>config.php</tt>, you will also disable receiving them.</p>
  
  
--- 65,69 ----
  <p>Your Geeklog site will, of course, be able to receive Trackbacks and Pingbacks to your stories. They will show up in a dedicated section below the story, similar to the section for comments. Once received, Geeklog will treat Trackbacks and Pingbacks the same, so you won't be able to tell the difference.</p>
  
! <p>When you disable Trackbacks and / or Pingbacks in the configuration, you will also disable receiving them.</p>
  
  
***************
*** 81,85 ****
  <h2><a name="disable">Disabling Trackbacks</a></h2>
  
! <p>Since these functions may not be needed on certain sites (e.g. corporate sites), they can be switched off individually in <a href="config.html#desc_trackback_enabled">config.php</a>.</p>
  
  <p>Note that "Trackback" is sometimes used as a generic term for both trackbacks
--- 81,85 ----
  <h2><a name="disable">Disabling Trackbacks</a></h2>
  
! <p>Since these functions may not be needed on certain sites (e.g. corporate sites), they can be switched off individually in the <a href="config.html#desc_trackback_enabled">configuration</a>.</p>
  
  <p>Note that "Trackback" is sometimes used as a generic term for both trackbacks
***************
*** 91,95 ****
  only reference to trackbacks that you'll still see is the drop-down menu entry
  in the Admin's story editor (to enable/disable trackbacks on a per-story basis).
! But its setting is overridden by the <tt>config.php</tt> entries, so it can be
  ignored.</p>
  
--- 91,95 ----
  only reference to trackbacks that you'll still see is the drop-down menu entry
  in the Admin's story editor (to enable/disable trackbacks on a per-story basis).
! But its setting is overridden by the configuration settings, so it can be
  ignored.</p>
  

Index: spamx.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/spamx.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** spamx.html	5 Aug 2007 09:33:02 -0000	1.23
--- spamx.html	10 May 2008 16:35:22 -0000	1.24
***************
*** 155,158 ****
--- 155,160 ----
  <p>This would block all posts from user agents beginning with "libwww-perl".</p>
  
+ <!-- Currently not shipped with Geeklog
+ 
  <h3><a name="honeypot">Project Honeypot http:BL Filter</a></h3>
  
***************
*** 178,181 ****
--- 180,185 ----
      automatically.</p>
  
+ -->
+ 
  
  <h2><a name="action">Action Modules</a></h2>
***************
*** 195,199 ****
  to be added up with the number of the other action modules you want to enable
  and entered as the value for the <a href="config.html#desc_spamx">spamx config
! variable</a> in Geeklog's main <tt>config.php</tt> file.</p>
  
  <h3>Example</h3>
--- 199,203 ----
  to be added up with the number of the other action modules you want to enable
  and entered as the value for the <a href="config.html#desc_spamx">spamx config
! variable</a> in Geeklog's main configuration.</p>
  
  <h3>Example</h3>
***************
*** 201,207 ****
  <p>The Delete Action module has the value 128, while the Mail Admin Action
  module has the value 8. So to activate both modules, add 128 + 8 = 136 and
! enter that in your config.php:</p>
! 
! <pre>    $_CONF['spamx'] = 136;</pre>
  
  <p>The SLV Examine module is complemented by a <strong>SLV Action</strong>
--- 205,209 ----
  <p>The Delete Action module has the value 128, while the Mail Admin Action
  module has the value 8. So to activate both modules, add 128 + 8 = 136 and
! enter that in the Configuration admin panel.</p>
  
  <p>The SLV Examine module is complemented by a <strong>SLV Action</strong>
***************
*** 262,271 ****
  trackback URL matches the IP address that sent the trackback. Trackbacks that
  fail any of these tests are usually spam. Please refer to the <a
! href="config.html#desc_check_trackback_link">config.php documentation</a> for
! more information.</p>
  
  <h2><a name="config.php">Configuration File</a></h2>
  
! <p>The Spam-X plugin has its own configuration file, located at <tt>/path/to/geeklog/plugins/spamx/config.php</tt>. There you will find the following options:</p>
  
  <table>
--- 264,276 ----
  trackback URL matches the IP address that sent the trackback. Trackbacks that
  fail any of these tests are usually spam. Please refer to the <a
! href="config.html#desc_check_trackback_link">documentation for the
! configuration</a> for more information.</p>
  
  <h2><a name="config.php">Configuration File</a></h2>
  
! <p>The Spam-X plugin's configuration can be changed from the Configuration admin
! panel:</p>
! 
! <h3><a name="main">Spam-X Main Settings</a></h3>
  
  <table>
***************
*** 275,284 ****
  </tr>
  <tr>
!   <td><a name="desc_action">action</a></td>
!   <td>128</td>
!   <td>This only exists as a fallback in case <a
!     href="config.html#desc_spamx">$_CONF['spamx']</a> in Geeklog's main
!     <tt>config.php</tt> is not set. I.e. <code>$_CONF['spamx']</code> takes
!     precedence.</td>
  </tr>
  <tr class="r2">
--- 280,287 ----
  </tr>
  <tr>
!   <td><a name="desc_logging">logging</a></td>
!   <td><code>true</code></td>
!   <td>Whether to log recognized spam posts in the <tt>spamx.log</tt> logfile
!     (if set to <code>true</code>) or not (<code>false</code>).</td>
  </tr>
  <tr class="r2">
***************
*** 292,299 ****
  </tr>
  <tr>
!   <td><a name="desc_logging">logging</a></td>
!   <td><code>true</code></td>
!   <td>Whether to log recognized spam posts in the <tt>spamx.log</tt> logfile
!     (if set to <code>true</code>) or not (<code>false</code>).</td>
  </tr>
  <tr class="r2">
--- 295,301 ----
  </tr>
  <tr>
!   <td><a name="desc_timeout">timeout</a></td>
!   <td>5</td>
!   <td>Timeout (in seconds) for contacting external services such as SLV.</td>
  </tr>
  <tr class="r2">
***************
*** 304,310 ****
  </tr>
  <tr>
!   <td><a name="desc_timeout">timeout</a></td>
!   <td>5</td>
!   <td>Timeout (in seconds) for contacting external services such as SLV.</td>
  </tr>
  </table>
--- 306,315 ----
  </tr>
  <tr>
!   <td><a name="desc_action">action</a></td>
!   <td>128</td>
!   <td>This only exists as a fallback in case <a
!     href="config.html#desc_spamx">$_CONF['spamx']</a> in Geeklog's main
!     configuration is not set. I.e. <code>$_CONF['spamx']</code> takes
!     precedence.</td>
  </tr>
  </table>

Index: theme.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/theme.html,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** theme.html	10 May 2008 15:02:14 -0000	1.79
--- theme.html	10 May 2008 16:35:22 -0000	1.80
***************
*** 147,151 ****
  
  <p><strong><a name="left-blocks">Left blocks in the right column:</a></strong>
! <code>$_CONF['left_blocks_in_footer']</code> (in <tt>config.php</tt>) is a
  rather curious option. It makes the <code>{left_blocks}</code> variable
  available in the site's footer (i.e. <tt>footer.thtml</tt>) while at the same
--- 147,151 ----
  
  <p><strong><a name="left-blocks">Left blocks in the right column:</a></strong>
! <code>$_CONF['left_blocks_in_footer']</code> is a
  rather curious option. It makes the <code>{left_blocks}</code> variable
  available in the site's footer (i.e. <tt>footer.thtml</tt>) while at the same
***************
*** 160,167 ****
  blocks, will actually be displayed on the <em>right</em>.<br>
  The theme's <tt>header.thtml</tt>, <tt>footer.thtml</tt>, and
! <tt>leftblocks.thtml</tt> will probably need some adjustments. It is also
! recommended to leave the <code>$_CONF</code> variable unchanged in
! <tt>config.php</tt> and overwrite it in the theme's <tt>functions.php</tt>
! instead. That way, you can even leave your users a choice between, for example,
  a "normal" theme and one with the blocks on the right.</p>
  
--- 160,167 ----
  blocks, will actually be displayed on the <em>right</em>.<br>
  The theme's <tt>header.thtml</tt>, <tt>footer.thtml</tt>, and
! <tt>leftblocks.thtml</tt> will probably need some adjustments. The
! 'left_blocks_in_footer' option is therefore not available in the main
! configuration but should instead be set in the theme's <tt>functions.php</tt>
! file.  That way, you can even leave your users a choice between, for example,
  a "normal" theme and one with the blocks on the right.</p>
  
***************
*** 866,871 ****
    <li>In the Classic and Digital Monochrome themes the "contact" link now
      points to the form to send an email to the admin user instead of using a
!     <code>mailto:</code> link with the site's email address from
!     <tt>config.php</tt>.</li>
  </ul>
  
--- 866,871 ----
    <li>In the Classic and Digital Monochrome themes the "contact" link now
      points to the form to send an email to the admin user instead of using a
!     <code>mailto:</code> link with the site's email address from the
!     configuration.</li>
  </ul>
  

Index: polls.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/polls.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** polls.html	5 Aug 2007 09:33:02 -0000	1.6
--- polls.html	10 May 2008 16:35:22 -0000	1.7
***************
*** 15,21 ****
  moved to a plugin as of Geeklog 1.4.0.</p>
  
! <h2><a name="config.php">Configuration File</a></h2>
  
! <p>The polls plugin has its own configuration file, located at <tt>/path/to/geeklog/plugins/polls/config.php</tt>. There you will find the following options:</p>
  
  <table>
--- 15,24 ----
  moved to a plugin as of Geeklog 1.4.0.</p>
  
! <h2><a name="config.php">Configuration</a></h2>
  
! <p>The Polls plugin's configuration can be changed from the Configuration admin
! panel:</p>
! 
! <h3><a name="general">General Polls Settings</a></h3>
  
  <table>
***************
*** 31,35 ****
      Please note that <code>$_CONF['<a
      href="config.html#desc_loginrequired">loginrequired</a>']</code> in
!     <tt>config.php</tt> takes precedence over this setting. So when
      <code>'loginrequired'</code> is set to 1, anonymous users can not access
      the recent polls even when <code>'pollsloginrequired'</code> is set
--- 34,38 ----
      Please note that <code>$_CONF['<a
      href="config.html#desc_loginrequired">loginrequired</a>']</code> in
!     Geeklog's main configuration takes precedence over this setting. So when
      <code>'loginrequired'</code> is set to 1, anonymous users can not access
      the recent polls even when <code>'pollsloginrequired'</code> is set
***************
*** 43,51 ****
  </tr>
  <tr>
!   <td><a name="desc_maxanswers">maxanswers</a></td>
    <td>10</td>
!   <td>Maximum number of possible answers for the poll editor.</td>
  </tr>
  <tr class="r2">
    <td><a name="desc_answerorder">answerorder</a></td>
    <td>submitorder</td>
--- 46,59 ----
  </tr>
  <tr>
!   <td><a name="desc_maxquestions">maxquestions</a></td>
    <td>10</td>
!   <td>Maximum number of questions in a poll.</td>
  </tr>
  <tr class="r2">
+   <td><a name="desc_maxanswers">maxanswers</a></td>
+   <td>10</td>
+   <td>Maximum number of options per question.</td>
+ </tr>
+ <tr>
    <td><a name="desc_answerorder">answerorder</a></td>
    <td>submitorder</td>
***************
*** 53,67 ****
      in which they were entered ('submitorder').</td>
  </tr>
! <tr>
    <td><a name="desc_pollcookietime">pollcookietime</a></td>
    <td>86400</td>
    <td>Number of seconds to set a poll answer cookie to time out on.</td>
  </tr>
! <tr class="r2">
    <td><a name="desc_polladdresstime">polladdresstime</a></td>
    <td>604800</td>
    <td>Number of seconds to set a poll answer IP address to time out on.</td>
  </tr>
! <tr>
    <td><a name="desc_delete_polls">delete_polls</a></td>
    <td>0</td>
--- 61,75 ----
      in which they were entered ('submitorder').</td>
  </tr>
! <tr class="r2">
    <td><a name="desc_pollcookietime">pollcookietime</a></td>
    <td>86400</td>
    <td>Number of seconds to set a poll answer cookie to time out on.</td>
  </tr>
! <tr>
    <td><a name="desc_polladdresstime">polladdresstime</a></td>
    <td>604800</td>
    <td>Number of seconds to set a poll answer IP address to time out on.</td>
  </tr>
! <tr class="r2">
    <td><a name="desc_delete_polls">delete_polls</a></td>
    <td>0</td>
***************
*** 71,74 ****
--- 79,94 ----
      are deleted, including all the comments posted on that poll.</td>
  </tr>
+ <tr>
+   <td><a name="desc_aftersave">aftersave</a></td>
+   <td>'list'</td>
+   <td>Which page to go to after a poll has been saved:
+     <ul>
+     <li>'item': display the poll</li>
+     <li>'list': show admin's list of polls (default)</li>
+     <li>'plugin': display the public list of polls</li>
+     <li>'home': display the site's homepage</li>
+     <li>'admin': go to the "Admin Home" page, i.e. Command &amp; Control</li>
+     </ul></td>
+ </tr>
  </table>
  
***************
*** 90,97 ****
  
  <p>The amount of time your cookie and IP are stored can be changed in the polls
! plugin's <tt>config.php</tt>:</p>
  
! <pre>$_PO_CONF['pollcookietime']    = 86400;
! $_PO_CONF['polladdresstime']   = 604800;</pre>
  
  <p>Both times are in seconds, i.e. the cookie is valid for 24 hours and the IP
--- 110,117 ----
  
  <p>The amount of time your cookie and IP are stored can be changed in the polls
! plugin's configuration (see above):</p>
  
! <pre>$_PO_CONF['<a href="#desc_pollcookietime">pollcookietime</a>']    = 86400;
! $_PO_CONF['<a href="#desc_polladdresstime">polladdresstime</a>']   = 604800;</pre>
  
  <p>Both times are in seconds, i.e. the cookie is valid for 24 hours and the IP

Index: themevars.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/themevars.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** themevars.html	5 Aug 2007 09:33:02 -0000	1.20
--- themevars.html	10 May 2008 16:35:22 -0000	1.21
***************
*** 50,55 ****
      <td><tt>http://www.example.com</tt></td>
      <td>The URL of your Geeklog site (the exact same URL you specified in
!         <code>$_CONF['site_url']</code> in your <tt>config.php</tt>
!         file).</td></tr>
  <tr><td><code>layout_url</code></td>
      <td><tt>http://www.example.com/layout/professional</tt></td>
--- 50,54 ----
      <td><tt>http://www.example.com</tt></td>
      <td>The URL of your Geeklog site (the exact same URL you specified in
!         <code>$_CONF['site_url']</code> in the configuration.</td></tr>
  <tr><td><code>layout_url</code></td>
      <td><tt>http://www.example.com/layout/professional</tt></td>
***************
*** 157,162 ****
      <td><tt>http://www.example.com</tt></td>
      <td>The URL of your Geeklog site (the exact same URL you specified in
!         <code>$_CONF['site_url']</code> in your <tt>config.php</tt>
!         file).</td></tr>
  <tr><td><code>layout_url</code></td>
      <td><tt>http://www.example.com/layout/professional</tt></td>
--- 156,160 ----
      <td><tt>http://www.example.com</tt></td>
      <td>The URL of your Geeklog site (the exact same URL you specified in
!         <code>$_CONF['site_url']</code> in the configuration.</td></tr>
  <tr><td><code>layout_url</code></td>
      <td><tt>http://www.example.com/layout/professional</tt></td>
***************
*** 286,290 ****
  
  <p>The following variables are only available when
! <code>$_CONF['contributedbyline'] = 1;</code> in your <tt>config.php</tt>, i.e.
  when you allow the name of the story's author to be displayed:</p>
  
--- 284,288 ----
  
  <p>The following variables are only available when
! <code>$_CONF['contributedbyline'] = 1;</code> in the configuration, i.e.
  when you allow the name of the story's author to be displayed:</p>
  

Index: calendar.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/calendar.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** calendar.html	10 May 2008 15:02:14 -0000	1.11
--- calendar.html	10 May 2008 16:35:22 -0000	1.12
***************
*** 33,37 ****
      Please note that <code>$_CONF['<a
      href="config.html#desc_loginrequired">loginrequired</a>']</code> in
!     <tt>config.php</tt> takes precedence over this setting. So when
      <code>'loginrequired'</code> is set to 1, anonymous users can not access
      the calendar even when <code>'calendarloginrequired'</code> is set
--- 33,37 ----
      Please note that <code>$_CONF['<a
      href="config.html#desc_loginrequired">loginrequired</a>']</code> in
!     Geeklog's main configuration takes precedence over this setting. So when
      <code>'loginrequired'</code> is set to 1, anonymous users can not access
      the calendar even when <code>'calendarloginrequired'</code> is set
***************
*** 114,123 ****
  <h2><a name="others">Other Options</a></h2>
  
! <p>Please note that some of the options from Geeklog's main <tt>config.php</tt>
  are also relevant for the calendar plugin:</p>
  <ul>
  <li>Times and dates are formatted according to the current language and the
      <a href="config.html#locale">locale settings</a> from Geeklog's main
!     <tt>config.php</tt>.</li>
  </ul>
  
--- 114,123 ----
  <h2><a name="others">Other Options</a></h2>
  
! <p>Please note that some of the options from Geeklog's main configuration
  are also relevant for the calendar plugin:</p>
  <ul>
  <li>Times and dates are formatted according to the current language and the
      <a href="config.html#locale">locale settings</a> from Geeklog's main
!     configuration.</li>
  </ul>
  

Index: config.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/config.html,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** config.html	3 May 2008 11:23:50 -0000	1.87
--- config.html	10 May 2008 16:35:22 -0000	1.88
***************
*** 1486,1490 ****
  <h3><a name="date_formats">Locale and Date Formats</a></h3>
  
! <p>You can set the locale and date format in the config.php file. To set the
  locale, set the variable to the proper string or if you leave it blank it
  will pull the default locale from the operating system. The date formats
--- 1486,1490 ----
  <h3><a name="date_formats">Locale and Date Formats</a></h3>
  
! <p>You can set the locale and date format in the configuration. To set the
  locale, set the variable to the proper string or if you leave it blank it
  will pull the default locale from the operating system. The date formats



From dhaun at qs1489.pair.com  Sat May 10 12:51:48 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 16:51:48 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional style.css,
	1.98, 1.99
Message-ID: <20080510165148.DF56510FE12@qs1489.pair.com>

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

Modified Files:
	style.css 
Log Message:
We shouldn't need to set text-align:left for the <body>; it also conflicts with the dir attribute if dir="rtl"


Index: style.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/style.css,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** style.css	5 May 2008 18:05:35 -0000	1.98
--- style.css	10 May 2008 16:51:46 -0000	1.99
***************
*** 61,65 ****
    padding-left:1px;
    padding-right:1px;
-   text-align:left;
  }
  fieldset {
--- 61,64 ----



From dhaun at qs1489.pair.com  Sat May 10 17:03:25 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 21:03:25 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links/language README,1.1,1.2
Message-ID: <20080510210325.0526A10FE14@qs1489.pair.com>

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

Modified Files:
	README 
Log Message:
Removed references to config.php


Index: README
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/language/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	22 May 2005 18:23:16 -0000	1.1
--- README	10 May 2008 21:03:22 -0000	1.2
***************
*** 1,5 ****
! This directory contains the language files for the polls plugin. The
  plugin will pick the appropriate language file automatically based on the
! language settings in your user settings or the default language in config.php.
  
  If there is no language file for your language, then the plugin will revert
--- 1,5 ----
! This directory contains the language files for the links plugin. The
  plugin will pick the appropriate language file automatically based on the
! language settings in your user settings or the default language.
  
  If there is no language file for your language, then the plugin will revert



From dhaun at qs1489.pair.com  Sat May 10 17:03:24 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 21:03:24 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/calendar/language README, 1.1, 1.2
Message-ID: <20080510210324.EDDFC10FE12@qs1489.pair.com>

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

Modified Files:
	README 
Log Message:
Removed references to config.php


Index: README
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/language/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	8 Mar 2006 13:23:25 -0000	1.1
--- README	10 May 2008 21:03:22 -0000	1.2
***************
*** 1,5 ****
! This directory contains the language files for the calendarplugin. The 
  plugin will pick the appropriate language file automatically based on the 
! language settings in your user settings or the default language in config.php. 
  
  If there is no language file for your language, then the plugin will revert 
--- 1,5 ----
! This directory contains the language files for the calendar plugin. The 
  plugin will pick the appropriate language file automatically based on the 
! language settings in your user settings or the default language.
  
  If there is no language file for your language, then the plugin will revert 



From dhaun at qs1489.pair.com  Sat May 10 17:03:25 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 21:03:25 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages/language README, 1.3,
	1.4
Message-ID: <20080510210325.2060310FE16@qs1489.pair.com>

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

Modified Files:
	README 
Log Message:
Removed references to config.php


Index: README
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/language/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** README	9 Mar 2003 11:47:22 -0000	1.3
--- README	10 May 2008 21:03:23 -0000	1.4
***************
*** 1,5 ****
  This directory contains the language files for the Static Pages plugin. The
  plugin will pick the appropriate language file automatically based on the
! language settings in your user settings or the default language in config.php.
  
  If there is no language file for your language, then the plugin will revert
--- 1,5 ----
  This directory contains the language files for the Static Pages plugin. The
  plugin will pick the appropriate language file automatically based on the
! language settings in your user settings or the default language.
  
  If there is no language file for your language, then the plugin will revert



From dhaun at qs1489.pair.com  Sat May 10 17:03:25 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 21:03:25 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.696,1.697
Message-ID: <20080510210325.3D47610FE17@qs1489.pair.com>

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

Modified Files:
	lib-common.php 
Log Message:
Removed references to config.php


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.696
retrieving revision 1.697
diff -C2 -d -r1.696 -r1.697
*** lib-common.php	10 May 2008 07:56:41 -0000	1.696
--- lib-common.php	10 May 2008 21:03:23 -0000	1.697
***************
*** 3768,3772 ****
  *
  * Returns what HTML tags the system allows to be used inside content.
! * You can modify this by changing $_CONF['user_html'] in config.php
  * (for admins, see also $_CONF['admin_html']).
  *
--- 3768,3772 ----
  *
  * Returns what HTML tags the system allows to be used inside content.
! * You can modify this by changing $_CONF['user_html'] in the configuration
  * (for admins, see also $_CONF['admin_html']).
  *
***************
*** 6437,6441 ****
  * Uses (if available, and in this order)
  * - $LANG_CHARSET (from the current language file)
! * - $_CONF['default_charset'] (from config.php)
  * - 'iso-8859-1' (hard-coded fallback)
  *
--- 6437,6441 ----
  * Uses (if available, and in this order)
  * - $LANG_CHARSET (from the current language file)
! * - $_CONF['default_charset'] (from siteconfig.php)
  * - 'iso-8859-1' (hard-coded fallback)
  *



From dhaun at qs1489.pair.com  Sat May 10 17:03:25 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 21:03:25 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional README,
	1.2, 1.3
Message-ID: <20080510210325.54DA210FE19@qs1489.pair.com>

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

Modified Files:
	README 
Log Message:
Removed references to config.php


Index: README
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	9 Oct 2004 19:18:20 -0000	1.2
--- README	10 May 2008 21:03:23 -0000	1.3
***************
*** 181,185 ****
  If you would like to change the theme for your self alone, go into your
  preferences and change the look. If you would like to make the entire
! site pick up on the change go into your Geeklog/config.php and change
  the default theme to the name of the theme "professional".
  
--- 181,185 ----
  If you would like to change the theme for your self alone, go into your
  preferences and change the look. If you would like to make the entire
! site pick up on the change go into your Configuration panel and change
  the default theme to the name of the theme "professional".
  
***************
*** 202,204 ****
  
  
! Thank you for choosing Professional_139 AKA Professional
\ No newline at end of file
--- 202,204 ----
  
  
! Thank you for choosing Professional_139 AKA Professional



From dhaun at qs1489.pair.com  Sat May 10 17:03:25 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 21:03:25 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls/language README,1.1,1.2
Message-ID: <20080510210325.12B6910FE15@qs1489.pair.com>

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

Modified Files:
	README 
Log Message:
Removed references to config.php


Index: README
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/language/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	7 Jun 2005 18:55:45 -0000	1.1
--- README	10 May 2008 21:03:23 -0000	1.2
***************
*** 1,5 ****
  This directory contains the language files for the polls plugin. The
  plugin will pick the appropriate language file automatically based on the
! language settings in your user settings or the default language in config.php.
  
  If there is no language file for your language, then the plugin will revert
--- 1,5 ----
  This directory contains the language files for the polls plugin. The
  plugin will pick the appropriate language file automatically based on the
! language settings in your user settings or the default language.
  
  If there is no language file for your language, then the plugin will revert



From dhaun at qs1489.pair.com  Sat May 10 17:03:25 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sat, 10 May 2008 21:03:25 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install configinfo.php,
	1.5, 1.6
Message-ID: <20080510210325.47CA910FE18@qs1489.pair.com>

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

Modified Files:
	configinfo.php 
Log Message:
Removed references to config.php


Index: configinfo.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/configinfo.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configinfo.php	6 Sep 2006 05:31:00 -0000	1.5
--- configinfo.php	10 May 2008 21:03:23 -0000	1.6
***************
*** 3,13 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | configinfo.php                                                            |
  // |                                                                           |
! // | Display contents of config.php                                            |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2002-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Jeffrey Schoolcraft  - dream AT dr3amscap3 DOT com               |
--- 3,13 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | configinfo.php                                                            |
  // |                                                                           |
! // | Display current configuration settings                                    |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2002-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Jeffrey Schoolcraft  - dream AT dr3amscap3 DOT com               |
***************
*** 35,51 ****
  /**
  * This script will display file and permission information based on settings in
! * config.php  This is meant to be as a support tool when asked questions in #geeklog
! *
  *
! * @author   Jeffrey Schoolcraft <dream at dr3amscap3.com>
  *
  */
  
! if (file_exists ('../../../config.php')) {
!     require_once('../../../config.php');
! } else if (file_exists ('../../lib-common.php')) {
!     require_once('../../lib-common.php');
  } else {
!     die ("Sorry, config.php not found ...");
  }
  
--- 35,49 ----
  /**
  * This script will display file and permission information based on settings in
! * the configuration.  This is meant to be used as a support tool when asked
! * questions in #geeklog.
  *
! * @author   Jeffrey Schoolcraft <dream AT dr3amscap3 DOT com>
  *
  */
  
! if (file_exists('../../lib-common.php')) {
!     require_once '../../lib-common.php';
  } else {
!     die("Sorry, lib-common.php not found ...");
  }
  
***************
*** 53,58 ****
  $highlight_off    = '#D9D9D9';
  
! if (isset ($_CONF['site_url']) &&
!         strpos ($_CONF['site_url'], 'example.com') === false) {
      $docs = $_CONF['site_url'] . '/docs/config.html#desc_';
  } else {
--- 51,56 ----
  $highlight_off    = '#D9D9D9';
  
! if (isset($_CONF['site_url']) &&
!         strpos($_CONF['site_url'], 'example.com') === false) {
      $docs = $_CONF['site_url'] . '/docs/config.html#desc_';
  } else {
***************
*** 60,65 ****
  }
  
! if (isset ($_CONF['mail_settings']['password'])) {
!     unset ($_CONF['mail_settings']['password']);
  }
  
--- 58,63 ----
  }
  
! if (isset($_CONF['mail_settings']['password'])) {
!     unset($_CONF['mail_settings']['password']);
  }
  
***************
*** 68,72 ****
  $display .= '<table width="100%" cellspacing="0" cellpadding="0" border="0" style="border: thin black solid;">';
  
! foreach($_CONF as $option => $value) {
      $display .= '<tr';
      if ($n % 2 == 0) {
--- 66,70 ----
  $display .= '<table width="100%" cellspacing="0" cellpadding="0" border="0" style="border: thin black solid;">';
  
! foreach ($_CONF as $option => $value) {
      $display .= '<tr';
      if ($n % 2 == 0) {
***************
*** 82,86 ****
          $value=nl2br(ob_get_contents());
          ob_end_clean();
!     } elseif (is_bool ($value)) {
          $value = ($value === false) ? 'false' : 'true';
      } elseif (eregi('[a-z]+html', $option)) {
--- 80,84 ----
          $value=nl2br(ob_get_contents());
          ob_end_clean();
!     } elseif (is_bool($value)) {
          $value = ($value === false) ? 'false' : 'true';
      } elseif (eregi('[a-z]+html', $option)) {
***************
*** 96,97 ****
--- 94,97 ----
  
  echo $display;
+ 
+ ?>



From dhaun at qs1489.pair.com  Sun May 11 03:07:22 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 07:07:22 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.39,
	1.40
Message-ID: <20080511070722.3C6D610FE14@qs1489.pair.com>

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

Modified Files:
	config.class.php 
Log Message:
Don't include the 'subgroup' and 'fieldset' entries in the $_CONF arrays


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** config.class.php	3 May 2008 15:09:13 -0000	1.39
--- config.class.php	11 May 2008 07:07:20 -0000	1.40
***************
*** 109,113 ****
          global $_TABLES;
  
!         $sql_query = "SELECT name, value, group_name FROM {$_TABLES['conf_values']}";
          $result = DB_query($sql_query);
          while ($row = DB_fetchArray($result)) {
--- 109,113 ----
          global $_TABLES;
  
!         $sql_query = "SELECT name, value, group_name FROM {$_TABLES['conf_values']} WHERE (type <> 'subgroup') AND (type <> 'fieldset')";
          $result = DB_query($sql_query);
          while ($row = DB_fetchArray($result)) {



From dhaun at qs1489.pair.com  Sun May 11 03:07:22 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 07:07:22 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.625,1.626
Message-ID: <20080511070722.2BD5810FE12@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:
Don't include the 'subgroup' and 'fieldset' entries in the $_CONF arrays


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.625
retrieving revision 1.626
diff -C2 -d -r1.625 -r1.626
*** history	10 May 2008 08:42:59 -0000	1.625
--- history	11 May 2008 07:07:20 -0000	1.626
***************
*** 12,15 ****
--- 12,17 ----
  
  Other changes:
+ - Don't include the (internal) 'subgroup' and 'fieldset' entries in the $_CONF
+   arrays [Dirk]
  - Removed an extra } from the Static Pages staticpage.thtml template file
    (reported by Markus Wollschl?ger) [Dirk]



From dhaun at qs1489.pair.com  Sun May 11 03:25:10 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 07:25:10 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install configinfo.php,
	1.6, 1.7 index.php, 1.39, 1.40
Message-ID: <20080511072510.3866B10FE14@qs1489.pair.com>

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

Modified Files:
	configinfo.php index.php 
Log Message:
Eliminated some more references to config.php


Index: configinfo.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/configinfo.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configinfo.php	10 May 2008 21:03:23 -0000	1.6
--- configinfo.php	11 May 2008 07:25:08 -0000	1.7
***************
*** 62,66 ****
  }
  
! $display = "<html>\n<head><title>config.php</title></head>\n<body>\n";
  $n = 0;
  $display .= '<table width="100%" cellspacing="0" cellpadding="0" border="0" style="border: thin black solid;">';
--- 62,66 ----
  }
  
! $display = "<html>\n<head><title>Configuration Settings</title></head>\n<body>\n";
  $n = 0;
  $display .= '<table width="100%" cellspacing="0" cellpadding="0" border="0" style="border: thin black solid;">';

Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** index.php	1 May 2008 13:23:28 -0000	1.39
--- index.php	11 May 2008 07:25:08 -0000	1.40
***************
*** 40,44 ****
  // $Id$
  
! // this should help expose parse errors (e.g. in config.php) even when
  // display_errors is set to Off in php.ini
  if (function_exists ('ini_set')) {
--- 40,44 ----
  // $Id$
  
! // this should help expose parse errors even when
  // display_errors is set to Off in php.ini
  if (function_exists ('ini_set')) {



From dhaun at qs1489.pair.com  Sun May 11 03:25:10 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 07:25:10 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/calendar install_defaults.php, 1.4,
	1.5
Message-ID: <20080511072510.22D7210FE12@qs1489.pair.com>

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

Modified Files:
	install_defaults.php 
Log Message:
Eliminated some more references to config.php


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/install_defaults.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** install_defaults.php	4 May 2008 09:16:33 -0000	1.4
--- install_defaults.php	11 May 2008 07:25:08 -0000	1.5
***************
*** 54,58 ****
  
  // when set to 1 will only allow logged-in users to view the list of past events
! // (also see $_CONF['loginrequired'] in Geeklog's config.php)
  $_CA_DEFAULT['calendarloginrequired']   = 0;
  
--- 54,58 ----
  
  // when set to 1 will only allow logged-in users to view the list of past events
! // (also see $_CONF['loginrequired'] in Geeklog's main configuration)
  $_CA_DEFAULT['calendarloginrequired']   = 0;
  



From dhaun at qs1489.pair.com  Sun May 11 03:25:10 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 07:25:10 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/databases mssql.class.php, 1.6, 1.7
Message-ID: <20080511072510.7358510FE17@qs1489.pair.com>

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

Modified Files:
	mssql.class.php 
Log Message:
Eliminated some more references to config.php


Index: mssql.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/databases/mssql.class.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mssql.class.php	25 Nov 2007 06:59:56 -0000	1.6
--- mssql.class.php	11 May 2008 07:25:08 -0000	1.7
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | mssql.class.php                                                           |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | mssql.class.php                                                           |
***************
*** 9,13 ****
  // | mysql database class                                                      |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs, tony AT tonybibbs DOT com                            |
--- 9,13 ----
  // | mysql database class                                                      |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs, tony AT tonybibbs DOT com                            |
***************
*** 125,129 ****
  
          // Set the database
!         @mssql_select_db($this->_name) or die ('Cannot Connect to the database provided.  Please check the config.php settings.');
  
          if (!($this->_db)) {
--- 125,129 ----
  
          // Set the database
!         @mssql_select_db($this->_name) or die ('Cannot Connect to the database provided.  Please check the db-config.php settings.');
  
          if (!($this->_db)) {



From dhaun at qs1489.pair.com  Sun May 11 03:25:10 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 07:25:10 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system lib-custom.php, 1.38,
	1.39 lib-plugins.php, 1.144, 1.145 lib-sessions.php, 1.44, 1.45
Message-ID: <20080511072510.59F1810FE15@qs1489.pair.com>

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

Modified Files:
	lib-custom.php lib-plugins.php lib-sessions.php 
Log Message:
Eliminated some more references to config.php


Index: lib-plugins.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-plugins.php,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** lib-plugins.php	3 May 2008 15:09:13 -0000	1.144
--- lib-plugins.php	11 May 2008 07:25:08 -0000	1.145
***************
*** 2297,2301 ****
  
  /**
! * Forward the user depending on config.php-setting after saving something
  *
  * @param  string  $item_url   the url of the item saved
--- 2297,2301 ----
  
  /**
! * Forward the user depending on config setting after saving something
  *
  * @param  string  $item_url   the url of the item saved

Index: lib-custom.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-custom.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** lib-custom.php	25 Nov 2007 06:55:07 -0000	1.38
--- lib-custom.php	11 May 2008 07:25:08 -0000	1.39
***************
*** 130,134 ****
  /*  Sample Custom Member Functions to create and update Custom Membership registration and profile
  
!     Note1: Enable CustomRegistration Feature in config.php
      $_CONF['custom_registration'] = true;  // Set to true if you have custom code
  
--- 130,134 ----
  /*  Sample Custom Member Functions to create and update Custom Membership registration and profile
  
!     Note1: Enable CustomRegistration Feature in the configuration
      $_CONF['custom_registration'] = true;  // Set to true if you have custom code
  
***************
*** 440,444 ****
  /**
  * This is an example of a function that returns menu entries to be used for
! * the 'custom' entry in $_CONF['menu_elements'] (see config.php).
  *
  */
--- 440,444 ----
  /**
  * This is an example of a function that returns menu entries to be used for
! * the 'custom' entry in $_CONF['menu_elements'] (see configuration).
  *
  */

Index: lib-sessions.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/lib-sessions.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** lib-sessions.php	25 Nov 2007 06:55:07 -0000	1.44
--- lib-sessions.php	11 May 2008 07:25:08 -0000	1.45
***************
*** 3,7 ****
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.4                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-sessions.php                                                          |
--- 3,7 ----
  /* Reminder: always indent with 4 spaces (no tabs). */
  // +---------------------------------------------------------------------------+
! // | Geeklog 1.5                                                               |
  // +---------------------------------------------------------------------------+
  // | lib-sessions.php                                                          |
***************
*** 9,16 ****
  // | Geeklog session library.                                                  |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2006 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,16 ----
  // | Geeklog session library.                                                  |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony AT tonybibbs DOT com                     |
! // |          Mark Limburg     - mlimburg AT users DOT sourceforge DOT net     |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 234,238 ****
      // session ID.  This has the advantage of better security but it may
      // required dialed users to login every time.  You can turn the below
!     // code on in config.php (it's turned off by default)
      if ($md5_based == 1) {
          $ip = str_replace('.','',$remote_ip);
--- 234,238 ----
      // session ID.  This has the advantage of better security but it may
      // required dialed users to login every time.  You can turn the below
!     // code on in the configuration (it's turned off by default)
      if ($md5_based == 1) {
          $ip = str_replace('.','',$remote_ip);



From dhaun at qs1489.pair.com  Sun May 11 03:25:10 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 07:25:10 +0000
Subject: [geeklog-cvs] Geeklog-1.x/system/classes search.class.php, 1.65,
	1.66
Message-ID: <20080511072510.640E210FE16@qs1489.pair.com>

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

Modified Files:
	search.class.php 
Log Message:
Eliminated some more references to config.php


Index: search.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/search.class.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** search.class.php	20 Feb 2008 20:07:59 -0000	1.65
--- search.class.php	11 May 2008 07:25:08 -0000	1.66
***************
*** 186,190 ****
      /**
      * Return the user's username or full name for display, depending
!     * on the $_CONF['show_fullname'] config.php setting
      *
      * @author Dirk Haun <dirk AT haun-online DOT de
--- 186,190 ----
      /**
      * Return the user's username or full name for display, depending
!     * on the $_CONF['show_fullname'] configuration setting
      *
      * @author Dirk Haun <dirk AT haun-online DOT de



From dhaun at qs1489.pair.com  Sun May 11 03:56:03 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 07:56:03 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.697,1.698
Message-ID: <20080511075603.D860710FE12@qs1489.pair.com>

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

Modified Files:
	lib-common.php 
Log Message:
Cosmetics: Avoid extra blank in <img> tags


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.697
retrieving revision 1.698
diff -C2 -d -r1.697 -r1.698
*** lib-common.php	10 May 2008 21:03:23 -0000	1.697
--- lib-common.php	11 May 2008 07:56:01 -0000	1.698
***************
*** 6143,6147 ****
      }
  
!     $retval = "<img $attr_str alt=\"$alt\" " . XHTML . ">";
  
      return $retval;
--- 6143,6147 ----
      }
  
!     $retval = "<img $attr_str alt=\"$alt\"" . XHTML . ">";
  
      return $retval;



From dhaun at qs1489.pair.com  Sun May 11 12:40:02 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 16:40:02 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs links.html, 1.5,
	1.6 plugin.html, 1.21, 1.22 staticpages.html, 1.16, 1.17
Message-ID: <20080511164002.4A2B110FE12@qs1489.pair.com>

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

Modified Files:
	links.html plugin.html staticpages.html 
Log Message:
More references to config.php eliminated


Index: links.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/links.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** links.html	10 May 2008 15:02:14 -0000	1.5
--- links.html	11 May 2008 16:40:00 -0000	1.6
***************
*** 31,35 ****
      Please note that <code>$_CONF['<a
      href="config.html#desc_loginrequired">loginrequired</a>']</code> in
!     <tt>config.php</tt> takes precedence over this setting. So when
      <code>'loginrequired'</code> is set to 1, anonymous users can not access
      the links section even when <code>'linksloginrequired'</code> is set
--- 31,35 ----
      Please note that <code>$_CONF['<a
      href="config.html#desc_loginrequired">loginrequired</a>']</code> in
!     Geeklog's main configuration takes precedence over this setting. So when
      <code>'loginrequired'</code> is set to 1, anonymous users can not access
      the links section even when <code>'linksloginrequired'</code> is set

Index: staticpages.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/staticpages.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** staticpages.html	5 Aug 2007 09:33:02 -0000	1.16
--- staticpages.html	11 May 2008 16:40:00 -0000	1.17
***************
*** 127,135 ****
  <p align="center"><tt>http://yoursite/staticpages/index.php/about</tt></p>
  
! <p>To make use of URL rewriting, you will need to enable it in Geeklog's <tt>config.php</tt> file by setting</p>
! 
! <p><code>$_CONF['url_rewrite'] = true;</code></p>
! 
! <p>The Static Pages plugin is currently the only plugin known to make use of this feature.</p>
  
  <h3><a name="delete">Deleting pages with their owner</a></h3>
--- 127,131 ----
  <p align="center"><tt>http://yoursite/staticpages/index.php/about</tt></p>
  
! <p>To make use of URL rewriting, you will need to set the option "Enable URL Rewriting" to True in Geeklog's Configuration admin panel.</p>
  
  <h3><a name="delete">Deleting pages with their owner</a></h3>

Index: plugin.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/plugin.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** plugin.html	5 Aug 2007 09:33:02 -0000	1.21
--- plugin.html	11 May 2008 16:40:00 -0000	1.22
***************
*** 388,396 ****
      <tr>
          <td valign="top" class="codeheader">plugin_chkVersion_&lt;plugin name&gt;</td>
!         <td valign="top" class="code">Plugins should implement this function and return the code version. Plugins should use a variable in the plugins config.php for the code version which allows the developer to easily update it before releasing a new version. As of Geeklog 1.3.10, this API function is called in the plugin Editor to show the version of the current installed version and plugin code version. The plugin installed version is pulled from the plugins table and should be updated as part of the plugin install or future updates. This API function allows the site admin to know if the current plugin code is newer then the installed version. Plugin developers can read the installed version from the plugins table and determine automatically if any SQL updates are required or atleast update the plugin record to be the same as the code version.</td>
      </tr>
      <tr>
          <td valign="top" class="codeheader">plugin_runScheduledTask_&lt;plugin name&gt;</td>
!         <td valign="top" class="code">This function allows plugin developers to schedule a task to be run. This API will only be called when someone accesses the site but should be sufficient for most plugins that want to schedule some maintenance process or clean-up routine. The interval this API is called is set in the site's config.php and all plugins that have this function will then be called.</td>
      </tr>
  
--- 388,396 ----
      <tr>
          <td valign="top" class="codeheader">plugin_chkVersion_&lt;plugin name&gt;</td>
!         <td valign="top" class="code">Plugins should implement this function and return the code version. Plugins should use a variable in the plugin's functions.inc for the code version which allows the developer to easily update it before releasing a new version. As of Geeklog 1.3.10, this API function is called in the plugin Editor to show the version of the current installed version and plugin code version. The plugin installed version is pulled from the plugins table and should be updated as part of the plugin install or future updates. This API function allows the site admin to know if the current plugin code is newer then the installed version. Plugin developers can read the installed version from the plugins table and determine automatically if any SQL updates are required or atleast update the plugin record to be the same as the code version.</td>
      </tr>
      <tr>
          <td valign="top" class="codeheader">plugin_runScheduledTask_&lt;plugin name&gt;</td>
!         <td valign="top" class="code">This function allows plugin developers to schedule a task to be run. This API will only be called when someone accesses the site but should be sufficient for most plugins that want to schedule some maintenance process or clean-up routine. The interval this API is called is set in the site's configuration and all plugins that have this function will then be called.</td>
      </tr>
  
***************
*** 487,494 ****
  
  <dl>
! <dt>config.php:</dt><dd>configuration page for your plugin.&nbsp; We'd
!    prefer you to  data-drive most the values if possible but using config.php
!    is fine.&nbsp;  This file can be called whatever you want...you are not
!  restricted.</dd>
  <dt>functions.inc:</dt><dd>this is the file where you implement the Geeklog
     API and where your plugin code should reside.&nbsp; It MUST be named this
--- 487,496 ----
  
  <dl>
! <dt>config.php:</dt><dd>configuration file for your plugin.&nbsp; We'd suggest
!     that you try and use Geeklog's built-in configuration admin panel (as of
!     Geeklog 1.5) if at all possible instead, since it makes things much easier
!     for the users of your plugin. The Geeklog Wiki has some more information
!     on <a href="http://wiki.geeklog.net/wiki/index.php/PluginConfiguration">how
!     to use the configuration for a plugin</a>.</dd>
  <dt>functions.inc:</dt><dd>this is the file where you implement the Geeklog
     API and where your plugin code should reside.&nbsp; It MUST be named this



From dhaun at qs1489.pair.com  Sun May 11 16:48:04 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 20:48:04 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history, 1.626,
	1.627 staticpages.html, 1.17, 1.18
Message-ID: <20080511204804.6033210FE12@qs1489.pair.com>

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

Modified Files:
	history staticpages.html 
Log Message:
Updated static pages documentation and removed last references to config.php


Index: staticpages.html
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/staticpages.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** staticpages.html	11 May 2008 16:40:00 -0000	1.17
--- staticpages.html	11 May 2008 20:48:02 -0000	1.18
***************
*** 19,29 ****
  
  
- <h2><a name="history">History</a></h2>
- 
- <p>The plugin was originally written by Tony Bibbs and is included with Geeklog as a pre-installed plugin since Geeklog 1.3.5. An extended version of the plugin was started by Phill Gillespie and later supported by Tom Willet. The extended version was the first to allow the use of PHP in static pages and also supported proper Geeklog permissions.</p>
- 
- <p>With Geeklog 1.3.8 and Static Pages 1.3, these two versions were merged again. Static Pages 1.3 also introduced some new features that were not included in either of its predecessors.</p>
- 
- 
  <h2><a name="features">Features</a></h2>
  
--- 19,22 ----
***************
*** 34,38 ****
    <li>"<a href="#cloning">cloning</a>" of existing pages</li>
    <li>Makes use of Geeklog's <a href="#url">URL rewrite feature</a></li>
!   <li>Supports autolinks and provides a <code>[staticpage:]</code> autotag</li>
    <li>proper support for Geeklog permissions</li>
  </ul>
--- 27,31 ----
    <li>"<a href="#cloning">cloning</a>" of existing pages</li>
    <li>Makes use of Geeklog's <a href="#url">URL rewrite feature</a></li>
!   <li>Provides <code>[staticpage:]</code> and <code>[staticpage_content:]</code> autotags</li>
    <li>proper support for Geeklog permissions</li>
  </ul>
***************
*** 45,49 ****
  <p><strong>Important:</strong> For security reasons, the use of PHP in static pages is disabled by default. To enable it, you will have to grant the 'staticpages.PHP' permission to the "Static Page Admin" group. To do this, log in as the Admin and from the Admin's Only block, select "Groups". Find the "Static Page Admin" group and edit it by clicking on the name of the group. At the bottom of the page, you will find a list of "Rights" (permissions) that can be granted to all members of this group. Note that 'staticpages.delete' and 'staticpages.edit' are checked, while 'staticpages.PHP' is not checked. To allow members of the Static Page Admin group to use PHP in static pages, you will have to check the 'staticpages.PHP' checkbox and save your changes.</p>
  
! <p>In addition to the 'staticpages.PHP' permission discussed above, there is also a global flag, <code>$_SP_CONF['allow_php']</code>, that can be used to disable the use of PHP in static pages entirely. When set to 0, it will override the 'staticpages.PHP' permission and disable all use of PHP in static pages. The flag is located in the static pages' <tt>config.php</tt> file in the <tt>plugins/staticpages</tt> directory.</p>
  
  <h3><a name="usage">Usage</a></h3>
--- 38,43 ----
  <p><strong>Important:</strong> For security reasons, the use of PHP in static pages is disabled by default. To enable it, you will have to grant the 'staticpages.PHP' permission to the "Static Page Admin" group. To do this, log in as the Admin and from the Admin's Only block, select "Groups". Find the "Static Page Admin" group and edit it by clicking on the name of the group. At the bottom of the page, you will find a list of "Rights" (permissions) that can be granted to all members of this group. Note that 'staticpages.delete' and 'staticpages.edit' are checked, while 'staticpages.PHP' is not checked. To allow members of the Static Page Admin group to use PHP in static pages, you will have to check the 'staticpages.PHP' checkbox and save your changes.</p>
  
! <p>In addition to the 'staticpages.PHP' permission discussed above, there is also a global option to disable the use of PHP in static pages entirely. That option ("Allow PHP?") can be found in the Configuration admin panel for the static pages plugin. When set to "False", that option will override the 'staticpages.PHP
! ' permission and disable all use of PHP in static pages.</p>
  
  <h3><a name="usage">Usage</a></h3>
***************
*** 83,87 ****
  <h2><a name="frontpage">Using Static Pages on the index page</a></h2>
  
! <p>Geeklog 1.3.8 introduced a new concept for use by plugins, called Center Blocks. Basically, this means that any plugin can place blocks in the center area of a Geeklog site, i.e. among the stories.</p>
  
  <p>When you check the "Centerblock" option for a static page, you can use the "Position" and "Topic" drop-downs to chose where this static page will be displayed. For "Position", the options are "Top Of Page", "After Featured Story", "Bottom Of Page" (which should be self-explanatory) and "Entire Page". That last option, "Entire Page", will tell Geeklog that this static page will replace the entire index page - it will not display any stories, but only the contents of this static page. This is useful e.g. for "splash" screens or Welcome pages.</p>
--- 77,81 ----
  <h2><a name="frontpage">Using Static Pages on the index page</a></h2>
  
! <p>Geeklog's Center Blocks concept allows plugins to place blocks in the center area of a Geeklog site, i.e. among the stories.</p>
  
  <p>When you check the "Centerblock" option for a static page, you can use the "Position" and "Topic" drop-downs to chose where this static page will be displayed. For "Position", the options are "Top Of Page", "After Featured Story", "Bottom Of Page" (which should be self-explanatory) and "Entire Page". That last option, "Entire Page", will tell Geeklog that this static page will replace the entire index page - it will not display any stories, but only the contents of this static page. This is useful e.g. for "splash" screens or Welcome pages.</p>
***************
*** 95,101 ****
  <h3><a name="sort">Sorting</a></h3>
  
! <p><strong>Centerblocks:</strong> When you have more than one static page that would appear in the same section of the center area (e.g. two static pages that would be displayed at the top of the index page), you can chose the order in which they appear by setting the <code>$_SP_CONF['sort_by']</code> variable in the plugin's <tt>config.php</tt> file to one of <tt>id</tt> (sort by page id), <tt>date</tt> (sort by last changed date), or <tt>title</tt> (sort by page title). The default is to sort by page id. Please note that this order will only apply to centerblocks from static pages. All other plugins creating centerblocks will not be in that order. Also note that the centerblock is not necessarily looking like a standard Geeklog block. To achieve that, please check the field "Wrapping Static Pages in a block" below.</p>
  
- <p><strong>Menu entries:</strong> It's also possible to sort the static pages that are displayed in the site's menu (if you're using a theme that uses the <code>{plg_menu_elements}</code> variables in its <tt>header.thtml</tt>). Set the <code>$_SP_CONF['sort_menu_by']</code> variable (again, in the plugin's <tt>config.php</tt> file) to one of <tt>id</tt> (sort by page id), <tt>date</tt> (sort by last changed date), <tt>label</tt> (sort by the menu label), or <tt>title</tt> (sort by page title).</p>
  
  <h2><a name="block">Wrapping Static Pages in a block</a></h2>
--- 89,108 ----
  <h3><a name="sort">Sorting</a></h3>
  
! <p><strong>Centerblocks:</strong> When you have more than one static page that would appear in the same section of the center area (e.g. two static pages that would be displayed at the top of the index page), you can choose the order in which they appear from the Configuration admin panel for the static pages plugin. Your options are:</p>
! <ul>
! <li>Date (sort by last changed date)</li>
! <li>Page ID (sort by the page id; default)</li>
! <li>Page Title (sort by the page title)</li>
! </ul>
! <p>Please note that this order will only apply to centerblocks from static pages. All other plugins creating centerblocks will not be in that order. Also note that the centerblock is not necessarily looking like a standard Geeklog block. To achieve that, please check the field "Wrapping Static Pages in a block" below.</p>
! 
! <p><strong>Menu entries:</strong> It's also possible to sort the static pages that are displayed in the site's menu (if you're using a theme that uses the <code>{plg_menu_elements}</code> variables in its <tt>header.thtml</tt>). This sort order can also be changed in the Configuration admin panel for the static pages plugin:</p>
! <ul>
! <li>Date (sort by last changed date)</li>
! <li>Label (sort by the menu label text; default)</li>
! <li>Page ID (sort by the page id)</li>
! <li>Page Title (sort by the page title)</li>
! </ul>
  
  
  <h2><a name="block">Wrapping Static Pages in a block</a></h2>
***************
*** 103,107 ****
  <p>You can chose to have a static page wrapped in a Geeklog block-layout by checking the "wrap static page in a block" option in the static pages editor. If selected, the page's title will be used as the block title. Further, you can, as with normal blocks, enter a help URL. If this URL is entered, the block will display a help icon linking to that URL.</p>
  
! <p>The plugin's <tt>config.php</tt> file also has a flag, <code>$_SP_CONF['in_block']</code>, which is used as the default for this option.</p>
  
  
--- 110,114 ----
  <p>You can chose to have a static page wrapped in a Geeklog block-layout by checking the "wrap static page in a block" option in the static pages editor. If selected, the page's title will be used as the block title. Further, you can, as with normal blocks, enter a help URL. If this URL is entered, the block will display a help icon linking to that URL.</p>
  
! <p>The default for this option can be set in the Configuration admin panel for the static pages plugin.</p>
  
  
***************
*** 131,144 ****
  <h3><a name="delete">Deleting pages with their owner</a></h3>
  
! <p>As all objects in Geeklog, static pages have an owner (the user that created
! the static page). When that user's account is deleted for some reason, any
! static pages owned by that user can either be deleted as well or they can be
! assigned to another user in Geeklog's Root group. The <tt>config.php</tt> file
! for the Static Pages plugin has the following option:</p>
! <p align="center"><code>$_SP_CONF['delete_pages'] = 0;</code></p>
! <p>If set to 0 (which is the default), static pages will not be deleted with
! their owner, but assigned to a member of the Root group instead (the user with
! the lowest user ID, most likely the Admin). If you change this to 1, static
! pages will be deleted when their owner's account is deleted.</p>
  
  <div class="footer">
--- 138,144 ----
  <h3><a name="delete">Deleting pages with their owner</a></h3>
  
! <p>As all objects in Geeklog, static pages have an owner (the user that created the static page). When that user's account is deleted for some reason, any static pages owned by that user can either be deleted as well or they can be assigned to another user in Geeklog's Root group.</p>
! 
! <p>In the Configuration admin panel for the static pages plugin, you can set the "Delete Pages with Owner?" option to either "False" (which is also the default), meaning that static pages will not be deleted withtheir owner, but assigned to a member of the Root group instead (the user withthe lowest user ID, most likely the Admin). Setting the option to "True" means that static pages will be deleted when their owner's account is deleted.</p>
  
  <div class="footer">

Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.626
retrieving revision 1.627
diff -C2 -d -r1.626 -r1.627
*** history	11 May 2008 07:07:20 -0000	1.626
--- history	11 May 2008 20:48:02 -0000	1.627
***************
*** 12,15 ****
--- 12,17 ----
  
  Other changes:
+ - Removed references to config.php from the documentation, some READMEs, and
+   some source files (bug #0000627) [Dirk]
  - Don't include the (internal) 'subgroup' and 'fieldset' entries in the $_CONF
    arrays [Dirk]



From dhaun at qs1489.pair.com  Sun May 11 18:03:27 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 22:03:27 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/preferences
	userphoto.thtml, 1.5, 1.6
Message-ID: <20080511220327.D28A710FE15@qs1489.pair.com>

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

Modified Files:
	userphoto.thtml 
Log Message:
Hard-code text direction for <input type="file"> (for bug #0000150)


Index: userphoto.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/preferences/userphoto.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** userphoto.thtml	25 Nov 2007 06:59:34 -0000	1.5
--- userphoto.thtml	11 May 2008 22:03:25 -0000	1.6
***************
*** 1,4 ****
             <tr>
                  <td style="width:100px;"><label for="photo">{lang_userphoto}:</label></td>
!                 <td><input type="file" id="photo" name="photo" size="30"{xhtml}><br{xhtml}>{display_photo}</td>
             </tr>
--- 1,4 ----
             <tr>
                  <td style="width:100px;"><label for="photo">{lang_userphoto}:</label></td>
!                 <td><input type="file" dir="ltr" id="photo" name="photo" size="30"{xhtml}><br{xhtml}>{display_photo}</td>
             </tr>



From dhaun at qs1489.pair.com  Sun May 11 18:03:27 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 22:03:27 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin story.php, 1.267,
	1.268 user.php, 1.202, 1.203
Message-ID: <20080511220327.BA47510FE12@qs1489.pair.com>

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

Modified Files:
	story.php user.php 
Log Message:
Hard-code text direction for <input type="file"> (for bug #0000150)


Index: story.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/story.php,v
retrieving revision 1.267
retrieving revision 1.268
diff -C2 -d -r1.267 -r1.268
*** story.php	1 May 2008 19:43:42 -0000	1.267
--- story.php	11 May 2008 22:03:25 -0000	1.268
***************
*** 9,13 ****
  // | Geeklog story administration page.                                        |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
--- 9,13 ----
  // | Geeklog story administration page.                                        |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
***************
*** 605,609 ****
          $newallowed = $_CONF['maximagesperarticle'] - $icount;
          for ($z = $icount + 1; $z <= $_CONF['maximagesperarticle']; $z++) {
!             $fileinputs .= $z . ') <input type="file" name="file' . $z . '"' . XHTML . '>';
              if ($z < $_CONF['maximagesperarticle']) {
                  $fileinputs .= '<br' . XHTML . '>';
--- 605,610 ----
          $newallowed = $_CONF['maximagesperarticle'] - $icount;
          for ($z = $icount + 1; $z <= $_CONF['maximagesperarticle']; $z++) {
!             $fileinputs .= $z . ') <input type="file" dir="ltr" name="file'
!                         . $z . '"' . XHTML . '>';
              if ($z < $_CONF['maximagesperarticle']) {
                  $fileinputs .= '<br' . XHTML . '>';

Index: user.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.202
retrieving revision 1.203
diff -C2 -d -r1.202 -r1.203
*** user.php	5 May 2008 00:30:37 -0000	1.202
--- user.php	11 May 2008 22:03:25 -0000	1.203
***************
*** 1097,1101 ****
      $retval = '<form action="' . $_CONF['site_admin_url']
              . '/user.php" method="post" enctype="multipart/form-data"><div>'
!             . $LANG28[29] . ': <input type="file" name="importfile" size="40"' . XHTML . '>'
              . '<input type="hidden" name="mode" value="import"' . XHTML . '>'
              . '<input type="submit" name="submit" value="' . $LANG28[30]
--- 1097,1101 ----
      $retval = '<form action="' . $_CONF['site_admin_url']
              . '/user.php" method="post" enctype="multipart/form-data"><div>'
!             . $LANG28[29] . ': <input type="file" dir="ltr" name="importfile" size="40"' . XHTML . '>'
              . '<input type="hidden" name="mode" value="import"' . XHTML . '>'
              . '<input type="submit" name="submit" value="' . $LANG28[30]



From dhaun at qs1489.pair.com  Sun May 11 18:03:27 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Sun, 11 May 2008 22:03:27 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/topic
	topiceditor.thtml, 1.10, 1.11
Message-ID: <20080511220327.C565D10FE14@qs1489.pair.com>

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

Modified Files:
	topiceditor.thtml 
Log Message:
Hard-code text direction for <input type="file"> (for bug #0000150)


Index: topiceditor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/topic/topiceditor.thtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** topiceditor.thtml	8 Mar 2008 15:19:51 -0000	1.10
--- topiceditor.thtml	11 May 2008 22:03:25 -0000	1.11
***************
*** 23,27 ****
                                      <tr>
                                          <td class="alignright">{lang_uploadimage}:</td>
!                                         <td><input type="file" name="newicon"{xhtml}> ({lang_maxsize} {icon_dimensions})</td>
                                      </tr>
                                      <tr>
--- 23,27 ----
                                      <tr>
                                          <td class="alignright">{lang_uploadimage}:</td>
!                                         <td><input type="file" dir="ltr" name="newicon"{xhtml}> ({lang_maxsize} {icon_dimensions})</td>
                                      </tr>
                                      <tr>



From dhaun at qs1489.pair.com  Mon May 12 03:53:07 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 07:53:07 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/story
	storyeditor.thtml, 1.21, 1.22 storyeditor_advanced.thtml, 1.32, 1.33
Message-ID: <20080512075307.B550010FE12@qs1489.pair.com>

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

Modified Files:
	storyeditor.thtml storyeditor_advanced.thtml 
Log Message:
Hard-code the text direction for the date/time selection (for bug #0000150)


Index: storyeditor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/story/storyeditor.thtml,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** storyeditor.thtml	1 May 2008 19:43:42 -0000	1.21
--- storyeditor.thtml	12 May 2008 07:53:05 -0000	1.22
***************
*** 27,30 ****
--- 27,31 ----
                                          <td class="alignright" style="vertical-align:top;">{lang_date}:</td>
                                          <td>
+                                           <span dir="ltr">
                                              <select name="publish_month">
                                                  {publish_month_options}
***************
*** 45,51 ****
                                                  {publish_minute_options}
                                              </select>
!                                             {publishampm_selection}<br{xhtml}>
                                              <input type="hidden" name="publish_second" value="{publish_second}"{xhtml}>
!                                             {publish_date_explanation}
                                          </td>
                                      </tr>
--- 46,53 ----
                                                  {publish_minute_options}
                                              </select>
!                                             {publishampm_selection}
                                              <input type="hidden" name="publish_second" value="{publish_second}"{xhtml}>
!                                           </span><br{xhtml}>
!                                           {publish_date_explanation}
                                          </td>
                                      </tr>
***************
*** 93,96 ****
--- 95,99 ----
                                                      <td class="alignright" style="vertical-align:top;padding-right:5px;">{lang_date}:</td>
                                                      <td colspan="2">
+                                                       <span dir="ltr">
                                                          <select id="expire_month" name="expire_month">
                                                              {expire_month_options}
***************
*** 111,116 ****
                                                              {expire_minute_options}
                                                          </select>
!                                                         {expireampm_selection}<br{xhtml}>
                                                          <input type="hidden" name="expire_second" value="{expire_second}"{xhtml}>
                                                      </td>
                                                  </tr>
--- 114,120 ----
                                                              {expire_minute_options}
                                                          </select>
!                                                         {expireampm_selection}
                                                          <input type="hidden" name="expire_second" value="{expire_second}"{xhtml}>
+                                                       </span><br{xhtml}>
                                                      </td>
                                                  </tr>

Index: storyeditor_advanced.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/story/storyeditor_advanced.thtml,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** storyeditor_advanced.thtml	1 May 2008 19:43:42 -0000	1.32
--- storyeditor_advanced.thtml	12 May 2008 07:53:05 -0000	1.33
***************
*** 100,103 ****
--- 100,104 ----
                              <td class="alignright" style="vertical-align:top;">{lang_date}:</td>
                              <td>
+                               <span dir="ltr">
                                  <select name="publish_month">
                                      {publish_month_options}
***************
*** 118,124 ****
                                      {publish_minute_options}
                                  </select>
!                                 {publishampm_selection}<br{xhtml}>
                                  <input type="hidden" name="publish_second" value="{publish_second}"{xhtml}>
!                                 <br{xhtml}>{publish_date_explanation}
                              </td>
                          </tr>
--- 119,126 ----
                                      {publish_minute_options}
                                  </select>
!                                 {publishampm_selection}
                                  <input type="hidden" name="publish_second" value="{publish_second}"{xhtml}>
!                               </span><br{xhtml}><br{xhtml}>
!                               {publish_date_explanation}
                              </td>
                          </tr>
***************
*** 177,180 ****
--- 179,183 ----
                              <td class="alignright" style="vertical-align:top;padding-right:5px;">{lang_date}:</td>
                              <td colspan="2">
+                               <span dir="ltr">
                                  <select id="expire_month" name="expire_month">
                                      {expire_month_options}
***************
*** 192,197 ****
                                      {expire_minute_options}
                                  </select>
!                                 {expireampm_selection}<br{xhtml}>
                                  <input type="hidden" name="expire_second" value="{expire_second}"{xhtml}>
                              </td>
                          </tr>
--- 195,201 ----
                                      {expire_minute_options}
                                  </select>
!                                 {expireampm_selection}
                                  <input type="hidden" name="expire_second" value="{expire_second}"{xhtml}>
+                               </span><br{xhtml}>
                              </td>
                          </tr>



From dhaun at qs1489.pair.com  Mon May 12 04:05:18 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:05:18 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/lists
	index.html, NONE, 1.1
Message-ID: <20080512080518.0CF0510FE15@qs1489.pair.com>

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

Added Files:
	index.html 
Log Message:
Empty index.html, since we have them in all the other directories as well ...


--- NEW FILE: index.html ---



From dhaun at qs1489.pair.com  Mon May 12 04:05:18 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:05:18 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional/navbar
	index.html, NONE, 1.1
Message-ID: <20080512080518.1A9D010FE16@qs1489.pair.com>

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

Added Files:
	index.html 
Log Message:
Empty index.html, since we have them in all the other directories as well ...


--- NEW FILE: index.html ---



From dhaun at qs1489.pair.com  Mon May 12 04:05:18 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:05:18 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/pdfgenerator
	index.html, NONE, 1.1
Message-ID: <20080512080518.367F610FE18@qs1489.pair.com>

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

Added Files:
	index.html 
Log Message:
Empty index.html, since we have them in all the other directories as well ...


--- NEW FILE: index.html ---



From dhaun at qs1489.pair.com  Mon May 12 04:05:18 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:05:18 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/navbar/images
	index.html, NONE, 1.1
Message-ID: <20080512080518.2882D10FE17@qs1489.pair.com>

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

Added Files:
	index.html 
Log Message:
Empty index.html, since we have them in all the other directories as well ...


--- NEW FILE: index.html ---



From dhaun at qs1489.pair.com  Mon May 12 04:05:18 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:05:18 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/pdfgenerator
	index.html, NONE, 1.1
Message-ID: <20080512080518.367F610FE18@qs1489.pair.com>

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

Added Files:
	index.html 
Log Message:
Empty index.html, since we have them in all the other directories as well ...


--- NEW FILE: index.html ---



From dhaun at qs1489.pair.com  Mon May 12 04:05:17 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:05:17 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/common
	index.html, NONE, 1.1
Message-ID: <20080512080517.E58F510FE12@qs1489.pair.com>

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

Added Files:
	index.html 
Log Message:
Empty index.html, since we have them in all the other directories as well ...


--- NEW FILE: index.html ---



From dhaun at qs1489.pair.com  Mon May 12 04:05:17 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:05:17 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/config
	index.html, NONE, 1.1
Message-ID: <20080512080517.F369310FE14@qs1489.pair.com>

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

Added Files:
	index.html 
Log Message:
Empty index.html, since we have them in all the other directories as well ...


--- NEW FILE: index.html ---



From dhaun at qs1489.pair.com  Mon May 12 04:27:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:27:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/links/templates/admin
	linkeditor.thtml, 1.11, 1.12
Message-ID: <20080512082719.2D56410FE15@qs1489.pair.com>

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

Modified Files:
	linkeditor.thtml 
Log Message:
Hard-coded the text direction for some ID field (sid, tid, etc.) - basically everything that's run through COM_sanitizeID (for bug #0000150)


Index: linkeditor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/links/templates/admin/linkeditor.thtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** linkeditor.thtml	12 Apr 2008 19:51:15 -0000	1.11
--- linkeditor.thtml	12 May 2008 08:27:17 -0000	1.12
***************
*** 15,19 ****
                                              <td align="right">{lang_linkid}:</td>
                                              <td>
!                                                 <input type="text" size="40" maxlength="40" name="lid" value="{link_id}"{xhtml}>
                                              </td>
                                          </tr>
--- 15,19 ----
                                              <td align="right">{lang_linkid}:</td>
                                              <td>
!                                                 <input type="text" dir="ltr" size="40" maxlength="40" name="lid" value="{link_id}"{xhtml}>
                                              </td>
                                          </tr>



From dhaun at qs1489.pair.com  Mon May 12 04:27:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:27:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls/templates/admin
	polleditor.thtml, 1.11, 1.12
Message-ID: <20080512082719.3B13710FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/admin
In directory qs1489.pair.com:/tmp/cvs-serv86860/plugins/polls/templates/admin

Modified Files:
	polleditor.thtml 
Log Message:
Hard-coded the text direction for some ID field (sid, tid, etc.) - basically everything that's run through COM_sanitizeID (for bug #0000150)


Index: polleditor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/admin/polleditor.thtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** polleditor.thtml	10 Feb 2008 15:18:12 -0000	1.11
--- polleditor.thtml	12 May 2008 08:27:17 -0000	1.12
***************
*** 5,9 ****
                                          <tr>
                                              <td align="right">{lang_pollid}:</td>
!                                             <td><input type="text" name="pid" value="{poll_id}" size="20"{xhtml}> {lang_donotusespaces}</td>
                                          </tr>
                                          <tr>
--- 5,9 ----
                                          <tr>
                                              <td align="right">{lang_pollid}:</td>
!                                             <td><input type="text" dir="ltr" name="pid" value="{poll_id}" size="20"{xhtml}> {lang_donotusespaces}</td>
                                          </tr>
                                          <tr>



From dhaun at qs1489.pair.com  Mon May 12 04:27:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:27:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages/templates/admin
	editor.thtml, 1.20, 1.21 editor_advanced.thtml, 1.12, 1.13
Message-ID: <20080512082719.513C010FE17@qs1489.pair.com>

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

Modified Files:
	editor.thtml editor_advanced.thtml 
Log Message:
Hard-coded the text direction for some ID field (sid, tid, etc.) - basically everything that's run through COM_sanitizeID (for bug #0000150)


Index: editor_advanced.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/templates/admin/editor_advanced.thtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** editor_advanced.thtml	3 May 2008 15:09:13 -0000	1.12
--- editor_advanced.thtml	12 May 2008 08:27:17 -0000	1.13
***************
*** 48,52 ****
            <tr>
              <td align="right">{lang_id}:</td>
!             <td><input type="text" name="sp_id" size="40" maxlength="40" value="{sp_id}"{xhtml}></td>
            </tr>
            <tr>
--- 48,52 ----
            <tr>
              <td align="right">{lang_id}:</td>
!             <td><input type="text" dir="ltr" name="sp_id" size="40" maxlength="40" value="{sp_id}"{xhtml}></td>
            </tr>
            <tr>

Index: editor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/templates/admin/editor.thtml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** editor.thtml	3 May 2008 15:09:13 -0000	1.20
--- editor.thtml	12 May 2008 08:27:17 -0000	1.21
***************
*** 34,38 ****
            <tr>
              <td align="right">{lang_id}:</td>
!             <td><input type="text" name="sp_id" size="40" maxlength="40" value="{sp_id}"{xhtml}></td>
            </tr>
            <tr>
--- 34,38 ----
            <tr>
              <td align="right">{lang_id}:</td>
!             <td><input type="text" dir="ltr" name="sp_id" size="40" maxlength="40" value="{sp_id}"{xhtml}></td>
            </tr>
            <tr>



From dhaun at qs1489.pair.com  Mon May 12 04:27:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:27:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages/templates/admin
	editor.thtml, 1.20, 1.21 editor_advanced.thtml, 1.12, 1.13
Message-ID: <20080512082719.513C010FE17@qs1489.pair.com>

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

Modified Files:
	editor.thtml editor_advanced.thtml 
Log Message:
Hard-coded the text direction for some ID field (sid, tid, etc.) - basically everything that's run through COM_sanitizeID (for bug #0000150)


Index: editor_advanced.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/templates/admin/editor_advanced.thtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** editor_advanced.thtml	3 May 2008 15:09:13 -0000	1.12
--- editor_advanced.thtml	12 May 2008 08:27:17 -0000	1.13
***************
*** 48,52 ****
            <tr>
              <td align="right">{lang_id}:</td>
!             <td><input type="text" name="sp_id" size="40" maxlength="40" value="{sp_id}"{xhtml}></td>
            </tr>
            <tr>
--- 48,52 ----
            <tr>
              <td align="right">{lang_id}:</td>
!             <td><input type="text" dir="ltr" name="sp_id" size="40" maxlength="40" value="{sp_id}"{xhtml}></td>
            </tr>
            <tr>

Index: editor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/templates/admin/editor.thtml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** editor.thtml	3 May 2008 15:09:13 -0000	1.20
--- editor.thtml	12 May 2008 08:27:17 -0000	1.21
***************
*** 34,38 ****
            <tr>
              <td align="right">{lang_id}:</td>
!             <td><input type="text" name="sp_id" size="40" maxlength="40" value="{sp_id}"{xhtml}></td>
            </tr>
            <tr>
--- 34,38 ----
            <tr>
              <td align="right">{lang_id}:</td>
!             <td><input type="text" dir="ltr" name="sp_id" size="40" maxlength="40" value="{sp_id}"{xhtml}></td>
            </tr>
            <tr>



From dhaun at qs1489.pair.com  Mon May 12 04:27:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:27:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.627,1.628
Message-ID: <20080512082719.66C2C10FE18@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:
Hard-coded the text direction for some ID field (sid, tid, etc.) - basically everything that's run through COM_sanitizeID (for bug #0000150)


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.627
retrieving revision 1.628
diff -C2 -d -r1.627 -r1.628
*** history	11 May 2008 20:48:02 -0000	1.627
--- history	12 May 2008 08:27:17 -0000	1.628
***************
*** 12,15 ****
--- 12,19 ----
  
  Other changes:
+ - Hard-coded the text direction as "ltr" for some input fields and the date/time
+   selection in the story editor (bug #0000150). Also removed "text-align:left"
+   for the HTML body from the Professional theme's style sheet as it interferes
+   with the ability to switch the text direction [Dirk]
  - Removed references to config.php from the documentation, some READMEs, and
    some source files (bug #0000627) [Dirk]
***************
*** 22,26 ****
    it (bug #0000622) [Dirk]
  - Fixed invalid <brXHTML> tag in some language files (bug #0000621) [Dirk]
! - The URL sent in a user registration notification contained a &amp; where it
    should have been a simple & [Dirk]
  
--- 26,30 ----
    it (bug #0000622) [Dirk]
  - Fixed invalid <brXHTML> tag in some language files (bug #0000621) [Dirk]
! - The URL sent in a user registration notification contained an &amp; where it
    should have been a simple & [Dirk]
  



From dhaun at qs1489.pair.com  Mon May 12 04:27:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:27:19 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/story
	storyeditor.thtml, 1.22, 1.23 storyeditor_advanced.thtml, 1.33, 1.34
Message-ID: <20080512082719.7244910FE19@qs1489.pair.com>

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

Modified Files:
	storyeditor.thtml storyeditor_advanced.thtml 
Log Message:
Hard-coded the text direction for some ID field (sid, tid, etc.) - basically everything that's run through COM_sanitizeID (for bug #0000150)


Index: storyeditor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/story/storyeditor.thtml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** storyeditor.thtml	12 May 2008 07:53:05 -0000	1.22
--- storyeditor.thtml	12 May 2008 08:27:17 -0000	1.23
***************
*** 140,144 ****
                                      <tr>
                                          <td class="alignright" style="vertical-align:top;">{lang_sid}:</td>
!                                         <td><input type="text" size="40" maxlength="40" name="sid" value="{story_id}"{xhtml}></td>
                                      </tr>
                                      <tr>
--- 140,144 ----
                                      <tr>
                                          <td class="alignright" style="vertical-align:top;">{lang_sid}:</td>
!                                         <td><input type="text" dir="ltr" size="40" maxlength="40" name="sid" value="{story_id}"{xhtml}></td>
                                      </tr>
                                      <tr>

Index: storyeditor_advanced.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/story/storyeditor_advanced.thtml,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** storyeditor_advanced.thtml	12 May 2008 07:53:05 -0000	1.33
--- storyeditor_advanced.thtml	12 May 2008 08:27:17 -0000	1.34
***************
*** 30,34 ****
              <tr>
                  <td class="alignright" style="vertical-align:top;">{lang_sid}:</td>
!                 <td><input type="text" size="48" maxlength="40" name="sid" value="{story_id}"{xhtml}></td>
              </tr>
              <tr>
--- 30,34 ----
              <tr>
                  <td class="alignright" style="vertical-align:top;">{lang_sid}:</td>
!                 <td><input type="text" dir="ltr" size="48" maxlength="40" name="sid" value="{story_id}"{xhtml}></td>
              </tr>
              <tr>



From dhaun at qs1489.pair.com  Mon May 12 04:27:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:27:19 +0000
Subject: [geeklog-cvs]
	Geeklog-1.x/public_html/layout/professional/admin/topic
	topiceditor.thtml, 1.11, 1.12
Message-ID: <20080512082719.7E5D510FE1A@qs1489.pair.com>

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

Modified Files:
	topiceditor.thtml 
Log Message:
Hard-coded the text direction for some ID field (sid, tid, etc.) - basically everything that's run through COM_sanitizeID (for bug #0000150)


Index: topiceditor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/topic/topiceditor.thtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** topiceditor.thtml	11 May 2008 22:03:25 -0000	1.11
--- topiceditor.thtml	12 May 2008 08:27:17 -0000	1.12
***************
*** 3,7 ****
                                      <tr>
                                          <td class="alignright">{lang_topicid}:</td>
!                                         <td><input type="text" size="20" maxlength="20" name="tid" value="{topic_id}"{xhtml}> {lang_donotusespaces}</td>
                                      </tr>
                                      <tr>
--- 3,7 ----
                                      <tr>
                                          <td class="alignright">{lang_topicid}:</td>
!                                         <td><input type="text" dir="ltr" size="20" maxlength="20" name="tid" value="{topic_id}"{xhtml}> {lang_donotusespaces}</td>
                                      </tr>
                                      <tr>



From dhaun at qs1489.pair.com  Mon May 12 04:27:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 08:27:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls/templates/admin
	polleditor.thtml, 1.11, 1.12
Message-ID: <20080512082719.3B13710FE16@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/admin
In directory qs1489.pair.com:/tmp/cvs-serv86860/plugins/polls/templates/admin

Modified Files:
	polleditor.thtml 
Log Message:
Hard-coded the text direction for some ID field (sid, tid, etc.) - basically everything that's run through COM_sanitizeID (for bug #0000150)


Index: polleditor.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/admin/polleditor.thtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** polleditor.thtml	10 Feb 2008 15:18:12 -0000	1.11
--- polleditor.thtml	12 May 2008 08:27:17 -0000	1.12
***************
*** 5,9 ****
                                          <tr>
                                              <td align="right">{lang_pollid}:</td>
!                                             <td><input type="text" name="pid" value="{poll_id}" size="20"{xhtml}> {lang_donotusespaces}</td>
                                          </tr>
                                          <tr>
--- 5,9 ----
                                          <tr>
                                              <td align="right">{lang_pollid}:</td>
!                                             <td><input type="text" dir="ltr" name="pid" value="{poll_id}" size="20"{xhtml}> {lang_donotusespaces}</td>
                                          </tr>
                                          <tr>



From dhaun at qs1489.pair.com  Mon May 12 05:21:38 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 09:21:38 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages/templates
	staticpage.thtml, 1.5, 1.6
Message-ID: <20080512092138.19C3910FE12@qs1489.pair.com>

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

Modified Files:
	staticpage.thtml 
Log Message:
Moved print and edit icons to the bottom of the page - there's no good way to position them consistently in the header (for bug #0000628)


Index: staticpage.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/templates/staticpage.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** staticpage.thtml	10 May 2008 08:42:59 -0000	1.5
--- staticpage.thtml	12 May 2008 09:21:36 -0000	1.6
***************
*** 1,4 ****
- <span class="story-icons">{print_icon}{edit_icon}</span>
  {content}
! <p class="aligncenter">{lastupdate}<span style="padding-left:5px;padding-right:5px;visibility:{info_separator}">|</span>{hits}</p>
  {commentbar}
--- 1,3 ----
  {content}
! <p class="aligncenter">{lastupdate}<span style="padding-left:5px;padding-right:5px;visibility:{info_separator}">|</span>{hits} {print_icon}{edit_icon}</p>
  {commentbar}



From dhaun at qs1489.pair.com  Mon May 12 06:29:57 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 10:29:57 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.120,
	1.121
Message-ID: <20080512102957.5498910FE12@qs1489.pair.com>

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

Modified Files:
	functions.inc 
Log Message:
Removed unused {icons} variable (for bug #0000628)


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** functions.inc	19 Apr 2008 19:23:58 -0000	1.120
--- functions.inc	12 May 2008 10:29:55 -0000	1.121
***************
*** 304,308 ****
  
      if ($A['sp_format'] <> 'blankpage') {
-         $icons = '';
          if ($_CONF['hideprintericon'] == 0) {
              $icon_url = $_CONF['layout_url'] . '/images/print.' . $_IMAGE_TYPE;
--- 304,307 ----
***************
*** 883,887 ****
              $spage->set_var('site_admin_url', $_CONF['site_admin_url']);
  
-             $icons = '';
              if ($_CONF['hideprintericon'] == 0) {
                  $icon_url = $_CONF['layout_url'] . '/images/print.' . $_IMAGE_TYPE;
--- 882,885 ----
***************
*** 910,914 ****
                  $spage->set_var('edit_icon', $icon);
              }
-             $spage->set_var('icons', $icons);
  
              $content = SP_render_content (stripslashes ($S['sp_content']), $S['sp_php']);
--- 908,911 ----



From dhaun at qs1489.pair.com  Mon May 12 06:49:16 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 10:49:16 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.121,
	1.122
Message-ID: <20080512104916.3A9C710FE12@qs1489.pair.com>

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

Modified Files:
	functions.inc 
Log Message:
Define {lastupdate} and {hits} in centerblocks but stripped them from the default centerblock template file


Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** functions.inc	12 May 2008 10:29:55 -0000	1.121
--- functions.inc	12 May 2008 10:49:14 -0000	1.122
***************
*** 843,847 ****
          $perms = ' AND ' . $perms;
      }
!     $spsql = "SELECT sp_id,sp_title,sp_content,sp_format,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,sp_php,sp_inblock,sp_help FROM {$_TABLES['staticpage']} WHERE (sp_centerblock = 1)" . COM_getLangSql ('sp_id', 'AND') . ' AND ' . $moresql . $perms . " ORDER BY " . $sort;
      $result = DB_query ($spsql);
  
--- 843,847 ----
          $perms = ' AND ' . $perms;
      }
!     $spsql = "SELECT sp_id,sp_title,sp_content,sp_format,sp_date,sp_hits,owner_id,group_id,perm_owner,perm_group,perm_members,perm_anon,sp_php,sp_inblock,sp_help FROM {$_TABLES['staticpage']} WHERE (sp_centerblock = 1)" . COM_getLangSql ('sp_id', 'AND') . ' AND ' . $moresql . $perms . " ORDER BY " . $sort;
      $result = DB_query ($spsql);
  
***************
*** 907,910 ****
--- 907,926 ----
                  );
                  $spage->set_var('edit_icon', $icon);
+             }
+ 
+             $spage->set_var('info_separator', 'hidden');
+             if ($_SP_CONF['show_date'] == 1) {
+                 $curtime = COM_getUserDateTimeFormat($S['sp_date']);
+                 $lastupdate = $LANG_STATIC['lastupdated']. ' ' . $curtime[0];
+                 $spage->set_var('lastupdate', $lastupdate);
+             }
+ 
+             if ($_SP_CONF['show_hits'] == 1) {
+                 if ($_SP_CONF['show_date'] == 1) {
+                     $spage->set_var('info_separator', 'visible');
+                 }
+                 $hits = COM_numberFormat($S['sp_hits']) . ' '
+                                          . $LANG_STATIC['hits'];
+                 $spage->set_var('hits', $hits);
              }
  



From dhaun at qs1489.pair.com  Mon May 12 06:49:16 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 10:49:16 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/staticpages/templates
	centerblock.thtml, 1.2, 1.3
Message-ID: <20080512104916.4705910FE14@qs1489.pair.com>

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

Modified Files:
	centerblock.thtml 
Log Message:
Define {lastupdate} and {hits} in centerblocks but stripped them from the default centerblock template file


Index: centerblock.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/templates/centerblock.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** centerblock.thtml	12 Feb 2007 11:29:36 -0000	1.2
--- centerblock.thtml	12 May 2008 10:49:14 -0000	1.3
***************
*** 1,3 ****
- <span class="story-icons">{print_icon}{edit_icon}</span>
  {content}
- <p class="aligncenter">{lastupdate} {hits}</p>
--- 1 ----



From dhaun at qs1489.pair.com  Mon May 12 07:04:53 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 11:04:53 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.628,1.629
Message-ID: <20080512110453.DCC2B10FE12@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:
Updated list of changes in the static pages plugin


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.628
retrieving revision 1.629
diff -C2 -d -r1.628 -r1.629
*** history	12 May 2008 08:27:17 -0000	1.628
--- history	12 May 2008 11:04:51 -0000	1.629
***************
*** 20,25 ****
  - Don't include the (internal) 'subgroup' and 'fieldset' entries in the $_CONF
    arrays [Dirk]
- - Removed an extra } from the Static Pages staticpage.thtml template file
-   (reported by Markus Wollschl?ger) [Dirk]
  - COM_numberFormat wouldn't handle decimals correctly (bug #0000624) [Dirk]
  - Make sure the XHTML constant is defined if the theme doesn't already define
--- 20,23 ----
***************
*** 28,31 ****
--- 26,39 ----
  - The URL sent in a user registration notification contained an &amp; where it
    should have been a simple & [Dirk]
+ 
+ Static Pages plugin
+ -------------------
+ - Moved the print and edit icons to the bottom of a static page in the default
+   staticpage.thtml template file. Also removed the icons from the default
+   centerblock.thtml template file and defined the {lastupdate} and {hits}
+   variables there (bug #0000628) [Dirk]
+ - Removed an extra } from the Static Pages staticpage.thtml template file
+   (reported by Markus Wollschl?ger) [Dirk]
+ 
  
  



From dhaun at qs1489.pair.com  Mon May 12 09:06:46 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 13:06:46 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/polls style.css,1.4,1.5
Message-ID: <20080512130646.BAACA10FE12@qs1489.pair.com>

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

Modified Files:
	style.css 
Log Message:
Make the poll topic bold, not larger (for bug #0000625)


Index: style.css
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/polls/style.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** style.css	9 Oct 2007 10:01:19 -0000	1.4
--- style.css	12 May 2008 13:06:44 -0000	1.5
***************
*** 13,17 ****
  
  .poll-topic {
!   font-size:larger;
  }
  .poll-questions ul {
--- 13,17 ----
  
  .poll-topic {
!   font-weight:bold;
  }
  .poll-questions ul {
***************
*** 58,60 ****
  .block-box-left .poll_answer_percent{
    text-align:right;
! }
\ No newline at end of file
--- 58,60 ----
  .block-box-left .poll_answer_percent{
    text-align:right;
! }



From dhaun at qs1489.pair.com  Mon May 12 09:09:19 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 13:09:19 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls/templates
	pollquestion.thtml, 1.3, 1.4 pollvotes_bar.thtml, 1.6, 1.7
Message-ID: <20080512130919.F0C8910FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates
In directory qs1489.pair.com:/tmp/cvs-serv99057

Modified Files:
	pollquestion.thtml pollvotes_bar.thtml 
Log Message:
Need some width attributes to keep the column widths in sync on multi-question polls (for bug #0000625)


Index: pollquestion.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/pollquestion.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pollquestion.thtml	9 Oct 2007 10:01:03 -0000	1.3
--- pollquestion.thtml	12 May 2008 13:09:17 -0000	1.4
***************
*** 1,6 ****
  <div class="poll-questions">
      <p class="poll-question">{lang_question}{lang_question_number}{poll_question}</p>
!     <table>
          {poll_votes}
      </table>
! </div>
\ No newline at end of file
--- 1,6 ----
  <div class="poll-questions">
      <p class="poll-question">{lang_question}{lang_question_number}{poll_question}</p>
!     <table width="100%">
          {poll_votes}
      </table>
! </div>

Index: pollvotes_bar.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/pollvotes_bar.thtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pollvotes_bar.thtml	30 Dec 2007 13:38:14 -0000	1.6
--- pollvotes_bar.thtml	12 May 2008 13:09:17 -0000	1.7
***************
*** 1,11 ****
!         <tr class="pluginRow{cssidb}">
!             <td class="poll_answer_text">{answer_text}</td>
!             <td class="poll_answer_bar">
!                 <img src="{layout_url}/images/bar.gif" width="{bar_width}" height="10" style="align:bottom;" alt=""{xhtml}> {answer_num} ({answer_percent}%)
!             </td>
!         </tr>
!         <tr class="pluginRow{cssida}">
!             <td align="left" colspan="2">
!                 {remark_text}
!             </td>
!         </tr>
--- 1,11 ----
!         <tr class="pluginRow{cssidb}">
!             <td width="20%" class="poll_answer_text">{answer_text}</td>
!             <td class="poll_answer_bar">
!                 <img src="{layout_url}/images/bar.gif" width="{bar_width}" height="10" style="align:bottom;" alt=""{xhtml}> {answer_num} ({answer_percent}%)
!             </td>
!         </tr>
!         <tr class="pluginRow{cssida}">
!             <td align="left" colspan="2">
!                 {remark_text}
!             </td>
!         </tr>



From dhaun at qs1489.pair.com  Mon May 12 09:11:43 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 13:11:43 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls/templates pollanswer.thtml,
	1.4, 1.5 pollblock.thtml, 1.11, 1.12 polllist.thtml, 1.2, 1.3
Message-ID: <20080512131143.24D3110FE12@qs1489.pair.com>

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates
In directory qs1489.pair.com:/tmp/cvs-serv99159

Modified Files:
	pollanswer.thtml pollblock.thtml polllist.thtml 
Log Message:
CR+LF -> LF


Index: pollblock.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/pollblock.thtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pollblock.thtml	25 Nov 2007 06:57:00 -0000	1.11
--- pollblock.thtml	12 May 2008 13:11:41 -0000	1.12
***************
*** 1,14 ****
! <span class="floatright">{edit_icon}</span><div class="poll-topic">{poll_topic}</div>
! <form action="{poll_vote_url}" name="Vote" method="post">
!     <div>
!     <input type="hidden" name="pid" value="{poll_id}"{xhtml}>
!             {poll_questions}
!         <span class="pluginTinyText">{poll_notification}</span><br{xhtml}>
!         <input type="submit" value="{lang_vote}"{xhtml}>
!         {poll_results}
!     </div>
! </form>
! 
! <span class="pluginTinyText">
!     <a href="{site_url}/polls/index.php">{lang_polltopics}</a> | {num_votes} {lang_votes} {poll_comments}
  </span>
--- 1,14 ----
! <span class="floatright">{edit_icon}</span><div class="poll-topic">{poll_topic}</div>
! <form action="{poll_vote_url}" name="Vote" method="post">
!     <div>
!     <input type="hidden" name="pid" value="{poll_id}"{xhtml}>
!             {poll_questions}
!         <span class="pluginTinyText">{poll_notification}</span><br{xhtml}>
!         <input type="submit" value="{lang_vote}"{xhtml}>
!         {poll_results}
!     </div>
! </form>
! 
! <span class="pluginTinyText">
!     <a href="{site_url}/polls/index.php">{lang_polltopics}</a> | {num_votes} {lang_votes} {poll_comments}
  </span>

Index: pollanswer.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/pollanswer.thtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pollanswer.thtml	25 Nov 2007 06:57:00 -0000	1.4
--- pollanswer.thtml	12 May 2008 13:11:41 -0000	1.5
***************
*** 1 ****
!   <li><input type="radio" name="aid[{question_id}]" value="{answer_id}"{selected}{xhtml}>&nbsp;{answer_text}</li>
--- 1 ----
!   <li><input type="radio" name="aid[{question_id}]" value="{answer_id}"{selected}{xhtml}>&nbsp;{answer_text}</li>

Index: polllist.thtml
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/templates/polllist.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** polllist.thtml	25 Nov 2007 06:57:00 -0000	1.2
--- polllist.thtml	12 May 2008 13:11:41 -0000	1.3
***************
*** 1 ****
!                             <br{xhtml}>{item_num}. <a href="{poll_url}">{poll_question}</a> ({poll_votes} {lang_votes}){ending_br} 
--- 1 ----
!                             <br{xhtml}>{item_num}. <a href="{poll_url}">{poll_question}</a> ({poll_votes} {lang_votes}){ending_br} 



From dhaun at qs1489.pair.com  Mon May 12 10:25:46 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 14:25:46 +0000
Subject: [geeklog-cvs] Geeklog-1.x/plugins/polls install_defaults.php, 1.3,
	1.4
Message-ID: <20080512142546.4B41C10FE12@qs1489.pair.com>

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

Modified Files:
	install_defaults.php 
Log Message:
Fixed duplicate sort_order entry in the Polls config


Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/polls/install_defaults.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install_defaults.php	4 May 2008 09:16:33 -0000	1.3
--- install_defaults.php	12 May 2008 14:25:44 -0000	1.4
***************
*** 120,134 ****
                  0, 0, 0, 30, true, 'polls');
          $c->add('maxanswers', $_PO_DEFAULT['maxanswers'], 'text',
!                 0, 0, 0, 30, true, 'polls');
          $c->add('answerorder', $_PO_DEFAULT['answerorder'], 'select',
!                 0, 0, 2, 40, true, 'polls');
          $c->add('pollcookietime', $_PO_DEFAULT['pollcookietime'], 'text',
-                 0, 0, 0, 50, true, 'polls');
-         $c->add('polladdresstime', $_PO_DEFAULT['polladdresstime'], 'text',
                  0, 0, 0, 60, true, 'polls');
!         $c->add('delete_polls', $_PO_DEFAULT['delete_polls'], 'select',
                  0, 0, 0, 70, true, 'polls');
          $c->add('aftersave', $_PO_DEFAULT['aftersave'], 'select',
!                 0, 0, 9, 80, true, 'polls');
  
          $c->add('fs_permissions', NULL, 'fieldset', 0, 1, NULL, 0, true, 'polls');
--- 120,134 ----
                  0, 0, 0, 30, true, 'polls');
          $c->add('maxanswers', $_PO_DEFAULT['maxanswers'], 'text',
!                 0, 0, 0, 40, true, 'polls');
          $c->add('answerorder', $_PO_DEFAULT['answerorder'], 'select',
!                 0, 0, 2, 50, true, 'polls');
          $c->add('pollcookietime', $_PO_DEFAULT['pollcookietime'], 'text',
                  0, 0, 0, 60, true, 'polls');
!         $c->add('polladdresstime', $_PO_DEFAULT['polladdresstime'], 'text',
                  0, 0, 0, 70, true, 'polls');
+         $c->add('delete_polls', $_PO_DEFAULT['delete_polls'], 'select',
+                 0, 0, 0, 80, true, 'polls');
          $c->add('aftersave', $_PO_DEFAULT['aftersave'], 'select',
!                 0, 0, 9, 90, true, 'polls');
  
          $c->add('fs_permissions', NULL, 'fieldset', 0, 1, NULL, 0, true, 'polls');



From dhaun at qs1489.pair.com  Mon May 12 10:25:46 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 14:25:46 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.629,1.630
Message-ID: <20080512142546.60C4910FE14@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:
Fixed duplicate sort_order entry in the Polls config


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.629
retrieving revision 1.630
diff -C2 -d -r1.629 -r1.630
*** history	12 May 2008 11:04:51 -0000	1.629
--- history	12 May 2008 14:25:44 -0000	1.630
***************
*** 27,30 ****
--- 27,35 ----
    should have been a simple & [Dirk]
  
+ Polls plugin
+ ------------
+ - Fixed duplicate sort_order value in the Polls config [Dirk]
+ - Cosmetic changes in the Polls topic and results (bug #0000625) [Dirk]
+ 
  Static Pages plugin
  -------------------



From dhaun at qs1489.pair.com  Mon May 12 10:25:46 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 14:25:46 +0000
Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.629,1.630
Message-ID: <20080512142546.60C4910FE14@qs1489.pair.com>

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

Modified Files:
	history 
Log Message:
Fixed duplicate sort_order entry in the Polls config


Index: history
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v
retrieving revision 1.629
retrieving revision 1.630
diff -C2 -d -r1.629 -r1.630
*** history	12 May 2008 11:04:51 -0000	1.629
--- history	12 May 2008 14:25:44 -0000	1.630
***************
*** 27,30 ****
--- 27,35 ----
    should have been a simple & [Dirk]
  
+ Polls plugin
+ ------------
+ - Fixed duplicate sort_order value in the Polls config [Dirk]
+ - Cosmetic changes in the Polls topic and results (bug #0000625) [Dirk]
+ 
  Static Pages plugin
  -------------------



From dhaun at qs1489.pair.com  Mon May 12 11:08:45 2008
From: dhaun at qs1489.pair.com (Dirk Haun)
Date: Mon, 12 May 2008 15:08:45 +0000
Subject: [geeklog-cvs] Geeklog-1.x/sql/updates mssql_1.4.1_to_1.5.0.php, 1.15,
	1.16
Message-ID: <20080512150845.E961F10FE12@qs1489.pair.com>

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

Modified Files:
	mssql_1.4.1_to_1.5.0.php 
Log Message:
This certainly isn't correct, but at least now it's in sync with the MySQL upgrade


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.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mssql_1.4.1_to_1.5.0.php	2 May 2008 11:32:09 -0000	1.15
--- mssql_1.4.1_to_1.5.0.php	12 May 2008 15:08:43 -0000	1.16
***************
*** 1,25 ****
  <?php
  
! /* These queries were copied from the mysql 1.4.2 upgrade and
   * probably need to be rewritten for MS SQL
! 
  
  // remove time zone table since its included into PEAR now
  $_SQL[] = "DROP TABLE " . $_DB_table_prefix . 'tzcodes';
! $_SQL[] = "ALTER TABLE {$_TABLES['userprefs']} CHANGE `tzid` `tzid` VARCHAR(125) NOT NULL DEFAULT ''";
  // change former default values to '' so users dont all have edt for no reason
! $_SQL[] = "UPDATE `{$_TABLES['userprefs']}` set tzid = ''";
  // User submissions may have body text.
! $_SQL[] = "ALTER TABLE `{$_TABLES['storysubmission']}` ADD bodytext TEXT AFTER introtext";
  
  // new comment code: close comments
  $_SQL[] = "INSERT INTO {$_TABLES['commentcodes']} (code, name) VALUES (1,'Comments Closed')";
  
- // add owner-field to links-submission
- $_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} ADD owner_id mediumint(8) unsigned NOT NULL default '1';";
- 
- // update plugin version numbers
- $_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.1', pi_gl_version = '1.4.1' WHERE pi_name = 'links'";
- 
  // Increase block function size to accept arguments:
  $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} CHANGE phpblockfn phpblockfn VARCHAR(128)";
--- 1,21 ----
  <?php
  
! /* These queries were copied from the mysql 1.5.0 upgrade and
   * probably need to be rewritten for MS SQL
!  */
  
  // remove time zone table since its included into PEAR now
  $_SQL[] = "DROP TABLE " . $_DB_table_prefix . 'tzcodes';
! $_SQL[] = "ALTER TABLE {$_TABLES['userprefs']} CHANGE tzid tzid VARCHAR(125) NOT NULL DEFAULT ''";
  // change former default values to '' so users dont all have edt for no reason
! $_SQL[] = "UPDATE {$_TABLES['userprefs']} set tzid = ''";
! // Add new field to track the number of reminders to login and use the site or account may be deleted
! $_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD num_reminders TINYINT(1) NOT NULL default 0 AFTER status";
  // User submissions may have body text.
! $_SQL[] = "ALTER TABLE {$_TABLES['storysubmission']} ADD bodytext TEXT AFTER introtext";
  
  // new comment code: close comments
  $_SQL[] = "INSERT INTO {$_TABLES['commentcodes']} (code, name) VALUES (1,'Comments Closed')";
  
  // Increase block function size to accept arguments:
  $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} CHANGE phpblockfn phpblockfn VARCHAR(128)";
***************
*** 29,35 ****
  $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD rdf_etag VARCHAR(40) DEFAULT NULL AFTER rdf_last_modified";
  
!  */
   
!  $_SQL[] = "
  CREATE TABLE {$_TABLES['tokens']} (
      [token] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
--- 25,36 ----
  $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD rdf_etag VARCHAR(40) DEFAULT NULL AFTER rdf_last_modified";
  
! // new 'webservices.atompub' feature
! $_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('webservices.atompub', 'May use Atompub Webservices (if restricted)', 1)";
! 
! // add the 'Webservices Users' group
! $_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) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
***************
*** 364,383 ****
  }
  
  function upgrade_StaticpagesPlugin()
  {
      global $_TABLES;
  
! /*
!  * This needs to be updated for MS SQL
!     // Polls plugin updates
!     $check_sql = "SELECT pi_name FROM {$_TABLES['plugins']} WHERE pi_name = 'staticpages';";
!     $check_rst = DB_query ($check_sql);
!     if (DB_numRows($check_rst) == 1) {
!         $P_SQL = array();
!         $P_SQL[] = "ALTER TABLE `{$_TABLES['staticpage']}` ADD commentcode tinyint(4) NOT NULL default '0' AFTER sp_label";
  
!         INST_updateDB($P_SQL);
      }
- */
  }
  ?>
--- 365,706 ----
  }
  
+ // Polls plugin updates
+ function upgrade_PollsPlugin()
+ {
+     global $_CONF, $_TABLES;
+ 
+     require_once $_CONF['path_system'] . 'classes/config.class.php';
+ 
+     $plugin_path = $_CONF['path'] . 'plugins/polls/';
+     require_once $plugin_path . 'install_defaults.php';
+ 
+     if (file_exists($plugin_path . 'config.php')) {
+         global $_DB_table_prefix, $_PO_CONF;
+ 
+         require_once $plugin_path . 'config.php';
+     }
+ 
+     if (!plugin_initconfig_polls()) {
+         echo 'There was an error upgrading the Polls plugin';
+         return false;
+     }
+ 
+     $P_SQL = array();
+     $P_SQL[] = "RENAME TABLE {$_TABLES['pollquestions']} TO {$_TABLES['polltopics']};";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} CHANGE question topic VARCHAR( 255 )  NULL DEFAULT NULL";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} CHANGE qid pid VARCHAR( 20 ) NOT NULL";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD questions int(11) default '0' NOT NULL AFTER voters";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD open tinyint(1) NOT NULL default '1' AFTER display";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ADD hideresults tinyint(1) NOT NULL default '0' AFTER open";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} CHANGE qid pid VARCHAR( 20 ) NOT NULL";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ADD qid VARCHAR( 20 ) NOT NULL DEFAULT '0' AFTER pid;";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} DROP PRIMARY KEY;";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ADD INDEX (pid, qid, aid);";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['pollvoters']} CHANGE qid pid VARCHAR( 20 ) NOT NULL";
+     $P_SQL[] = "CREATE TABLE [dbo].[{$_TABLES['pollquestions']}] (
+         [qid] [int] NOT NULL ,
+         [pid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+         [question] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+     ) ON [PRIMARY]";
+     $P_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['pollquestions']}] ADD
+         CONSTRAINT [PK_gl_pollquestions] PRIMARY KEY  CLUSTERED
+         (
+             [qid]
+         )  ON [PRIMARY]";
+     // in 1.4.1, "don't display poll" was equivalent to "closed"
+     $P_SQL[] = "UPDATE {$_TABLES['polltopics']} SET open = 0 WHERE display = 0";
+     $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.1', pi_gl_version = '1.5.0' WHERE pi_name = 'polls'";
+ 
+     foreach ($P_SQL as $sql) {
+         $rst = DB_query($sql);
+         if (DB_error()) {
+             echo "There was an error upgrading the polls, SQL: $sql<br>";
+             return false;
+         }
+     }
+     $P_SQL = array();
+ 
+     $move_sql = "SELECT pid, topic FROM {$_TABLES['polltopics']}";
+     $move_rst = DB_query ($move_sql);
+     $count_move = DB_numRows($move_rst);
+     for ($i = 0; $i < $count_move; $i++) {
+         $A = DB_fetchArray($move_rst);
+         $A[1] = mysql_real_escape_string($A[1]);
+         $P_SQL[] = "INSERT INTO {$_TABLES['pollquestions']} (pid, question) VALUES ('{$A[0]}','{$A[1]}');";
+     }
+ 
+     foreach ($P_SQL as $sql) {
+         $rst = DB_query($sql);
+         if (DB_error()) {
+             echo "There was an error upgrading the polls, SQL: $sql<br>";
+             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');
+     }
+ 
+     return true;
+ }
+ 
+ // Staticpages plugin updates
  function upgrade_StaticpagesPlugin()
  {
+     global $_CONF, $_TABLES;
+ 
+     require_once $_CONF['path_system'] . 'classes/config.class.php';
+ 
+     $plugin_path = $_CONF['path'] . 'plugins/staticpages/';
+     require_once $plugin_path . 'install_defaults.php';
+ 
+     if (file_exists($plugin_path . 'config.php')) {
+         global $_DB_table_prefix, $_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();
+     $P_SQL[] = "ALTER TABLE {$_TABLES['staticpage']} ADD commentcode tinyint(4) NOT NULL default '0' AFTER sp_label";
+     // disable comments on all existing static pages
+     $P_SQL[] = "UPDATE {$_TABLES['staticpage']} SET commentcode = -1";
+     $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.5.0', pi_gl_version = '1.5.0' WHERE pi_name = 'staticpages'";
+ 
+     foreach ($P_SQL as $sql) {
+         $rst = DB_query($sql);
+         if (DB_error()) {
+             echo "There was an error upgrading the Static Pages plugin, SQL: $sql<br>";
+             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');
+     }
+ 
+     return true;
+ }
+ 
+ // Calendar plugin updates
+ function upgrade_CalendarPlugin()
+ {
+     global $_CONF, $_TABLES, $_STATES;
+ 
+     require_once $_CONF['path_system'] . 'classes/config.class.php';
+ 
+     $plugin_path = $_CONF['path'] . 'plugins/calendar/';
+     require_once $plugin_path . 'install_defaults.php';
+ 
+     if (file_exists($plugin_path . 'config.php')) {
+         global $_DB_table_prefix, $_CA_CONF;
+ 
+         require_once $plugin_path . 'config.php';
+     }
+ 
+     if (!plugin_initconfig_calendar()) {
+         echo 'There was an error upgrading the Polls plugin';
+         return false;
+     }
+ 
+     $P_SQL[] = "ALTER TABLE {$_TABLES['events']} CHANGE state state varchar(40) default NULL";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['eventsubmission']} CHANGE state state varchar(40) default NULL";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['personal_events']} CHANGE state state varchar(40) default NULL";
+     $P_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.0.2', pi_gl_version = '1.5.0' WHERE pi_name = 'calendar'";
+ 
+     foreach ($P_SQL as $sql) {
+         $rst = DB_query($sql);
+         if (DB_error()) {
+             echo "There was an error upgrading the calendar";
+             return false;
+         }
+     }
+ 
+     if (isset($_STATES) && is_array($_STATES)) {
+         $tables = array($_TABLES['events'], $_TABLES['eventsubmission'],
+                         $_TABLES['personal_events']);
+ 
+         foreach ($_STATES as $key => $state) {
+             foreach ($tables as $table) {
+                 DB_change($table, 'state', addslashes($state),
+                                   'state', addslashes($key));
+             }
+         }
+     }
+ 
+     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;
+ }
+ 
+ // Spam-X plugin updates
+ function upgrade_SpamXPlugin()
+ {
+     global $_CONF, $_TABLES;
+ 
+     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 $_DB_table_prefix, $_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'";
+     $rst = DB_query($sql);
+     if (DB_error()) {
+         echo "There was an error upgrading the Spam-X plugin";
+         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');
+     }
+ 
+     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 (file_exists($plugin_path . 'config.php')) {
+         global $_DB_table_prefix, $_LI_CONF;
+ 
+         require_once $plugin_path . 'config.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();
+     $P_SQL[] = "CREATE TABLE [dbo].[{$_TABLES['linkcategories']}] (
+         [cid] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+         [pid] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+         [category] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+         [description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+         [tid] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+         [created] [datetime] NULL ,
+         [modified] [datetime] NULL ,
+         [owner_id] [numeric](8, 0) NOT NULL ,
+         [group_id] [numeric](8, 0) NOT NULL ,
+         [perm_owner] [tinyint] NOT NULL ,
+         [perm_group] [tinyint] NOT NULL ,
+         [perm_members] [tinyint] NOT NULL ,
+         [perm_anon] [tinyint] NOT NULL
+     ) ON [PRIMARY]";
+     $P_SQL[] = "ALTER TABLE [dbo].[{$_TABLES['linkcategories']}] ADD
+         CONSTRAINT [PK_gl_linkcategories] PRIMARY KEY  CLUSTERED
+         (
+             [pid]
+         )  ON [PRIMARY]";
+ 
+     $blockadmin_id = DB_getItem($_TABLES['groups'], 'grp_id',
+                                 "grp_name='Block Admin'");
+ 
+     $P_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} ADD owner_id mediumint(8) unsigned NOT NULL default '1' AFTER date";
+     $P_SQL[] = "ALTER TABLE {$_TABLES['linksubmission']} CHANGE category cid v