php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/include functions.inc.php,1.5,1.6 functions_comments.inc.php,1.6,1.7 functions_entries.inc.php,1.14,1.15

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/include

Modified Files:
	functions.inc.php functions_comments.inc.php 
	functions_entries.inc.php 
Log Message:
use   instead of   for unknown entity XML compliance


Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- functions_comments.inc.php	24 Nov 2004 15:52:02 -0000	1.6
+++ functions_comments.inc.php	30 Nov 2004 11:27:55 -0000	1.7
@@ -134,7 +134,7 @@
     foreach ($comments as $comment) {
         if ($comment['parent_id'] == $parent) {
             $i++;
-            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&nbsp;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . ucfirst(serendipity_strftime(DATE_FORMAT_SHORT, $comment['timestamp'])) . "</option>\n";
+            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&#160;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . ucfirst(serendipity_strftime(DATE_FORMAT_SHORT, $comment['timestamp'])) . "</option>\n";
             $retval .= serendipity_generateCommentList($id, $comments, $selected, $comment['id'], $level + 1, $indent . $i . '.');
         }
     }

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- functions_entries.inc.php	29 Nov 2004 10:53:55 -0000	1.14
+++ functions_entries.inc.php	30 Nov 2004 11:27:56 -0000	1.15
@@ -1038,21 +1038,20 @@
                     if (!empty($xmlImg)) {
                         $ret .= sprintf(
                           '<div style="padding-bottom: 2px;">' .
-                          '<a href="%s" title="%s"><img alt="xml" %s src="%s" style="vertical-align: bottom" /></a>&nbsp;%s' .
+                          '<a href="%s" title="%s"><img alt="xml" src="%s" style="vertical-align: bottom; display: inline; border: 0px" /></a>&#160;%s' .
                           '<a href="%s" title="%s">%s</a>' .
                           '</div>',
                           $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '_' . $category_id,
                           htmlspecialchars($cat['category_description']),
-                          ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
                           $xmlImg,
-                          str_repeat('&nbsp;', $level * 3),
+                          str_repeat('&#160;', $level * 3),
                           serendipity_rewriteURL(PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . $category_id, 'serendipityHTTPPath'),
                           htmlspecialchars($cat['category_description']),
                           htmlspecialchars($cat['category_name']));
                     } else {
                         $ret .= sprintf(
                           '%s<a href="%s" title="%s">%s</a><br />',
-                          str_repeat('&nbsp;', $level * 3),
+                          str_repeat('&#160;', $level * 3),
                           serendipity_rewriteURL(PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . $category_id, 'serendipityHTTPPath'),
                           htmlspecialchars($cat['category_description']),
                           htmlspecialchars($cat['category_name']));

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- functions.inc.php	29 Nov 2004 07:39:15 -0000	1.5
+++ functions.inc.php	30 Nov 2004 11:27:55 -0000	1.6
@@ -326,12 +326,14 @@
         '/\&([\s\<])/',       // ampersand followed by whitespace or tag
         '/\&$/',              // ampersand at end of body
         '/<(br|hr|img)([^\/>]*)>/i',    // unclosed br tag - attributes included
+        '/\&nbsp;/'
     );
 
     static $r = array(
         '&amp;\1',
         '&amp;',
-        '<\1\2 />'
+        '<\1\2 />',
+        '&#160;'
     );
 
     return preg_replace($p, $r, $html);

[php-blog-cvs] serendipity/templates/default commentform.tpl,1.2,1.3 entries.tpl,1.4,1.5 plugin_calendar.tpl,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/templates/default

Modified Files:
	commentform.tpl entries.tpl plugin_calendar.tpl 
Log Message:
use   instead of   for unknown entity XML compliance


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/entries.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- entries.tpl	27 Nov 2004 22:14:19 -0000	1.4
+++ entries.tpl	30 Nov 2004 11:27:57 -0000	1.5
@@ -180,7 +180,7 @@
 
     <div class='serendipity_entryFooter' style="text-align: center">
     {if $footer_prev_page}
-        <a href="{$footer_prev_page}">&laquo; {$CONST.PREVIOUS_PAGE}</a>&nbsp;&nbsp;
+        <a href="{$footer_prev_page}">&laquo; {$CONST.PREVIOUS_PAGE}</a>&#160;&#160;
     {/if}
 
     {if $footer_info}

Index: commentform.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/commentform.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- commentform.tpl	19 Nov 2004 11:06:07 -0000	1.2
+++ commentform.tpl	30 Nov 2004 11:27:57 -0000	1.3
@@ -33,7 +33,7 @@
 
 {if $is_commentform_showToolbar}
         <tr>
-            <td>&nbsp;</td>
+            <td>&#160;</td>
             <td class="serendipity_commentsLabel">
                 <input id="checkbox_remember" type="checkbox" name="serendipity[remember]" {$commentform_remember} /><label for="checkbox_remember">{$CONST.REMEMBER_INFO}</label>
     {if $is_allowSubscriptions}
@@ -51,7 +51,7 @@
 {/if}
 
        <tr>
-            <td>&nbsp;</td>
+            <td>&#160;</td>
             <td><input type="submit" name="serendipity[submit]" value="{$CONST.SUBMIT_COMMENT}" /> <input type="submit" name="serendipity[preview]" value="{$CONST.PREVIEW}" /></td>
         </tr>
     </table>

Index: plugin_calendar.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/plugin_calendar.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- plugin_calendar.tpl	19 Nov 2004 11:06:07 -0000	1.2
+++ plugin_calendar.tpl	30 Nov 2004 11:27:57 -0000	1.3
@@ -26,7 +26,7 @@
     {foreach from=$plugin_calendar_weeks item="week"}
         <tr class="serendipity_calendar">
         {foreach from=$week.days item="day"}
-            <td class="serendipity_calendarDay {$day.classes}">{if isset($day.properties.Active) and $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|@default:"&nbsp;"}{if isset($day.properties.Active) and $day.properties.Active}</a>{/if}</td>
+            <td class="serendipity_calendarDay {$day.classes}">{if isset($day.properties.Active) and $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|@default:"&#160;"}{if isset($day.properties.Active) and $day.properties.Active}</a>{/if}</td>
         {/foreach}
         </tr>
     {/foreach}

[php-blog-cvs] serendipity/plugins/serendipity_event_bbcode serendipity_event_bbcode.php,1.11,1.12

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/plugins/serendipity_event_bbcode

Modified Files:
	serendipity_event_bbcode.php 
Log Message:
use   instead of   for unknown entity XML compliance


Index: serendipity_event_bbcode.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode/serendipity_event_bbcode.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_event_bbcode.php	20 Nov 2004 15:18:12 -0000	1.11
+++ serendipity_event_bbcode.php	30 Nov 2004 11:27:56 -0000	1.12
@@ -111,7 +111,7 @@
             case 'code':
                 $search_replace = array(
                     '&'         => '&',
-                    ' '         => ' ',
+                    ' '         => ' ',
                     '<'      => '<',
                     '<'         => '&#60;',
                     '&gt;'      => '&#62;',
@@ -123,7 +123,7 @@
                     ')'         => '&#41;',
                     '('         => '&#40;',
                     '*'         => '&#42;',
-                    '\t'        => '&nbsp;&nbsp;&nbsp;&nbsp;',
+                    '\t'        => '&#160;&#160;&#160;&#160;',
                     '\\"'       => '"',
                     "\\'"       => "'"
                 );

[php-blog-cvs] serendipity/plugins/serendipity_event_textile serendipity_event_textile.php,1.9,1.10

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/plugins/serendipity_event_textile

Modified Files:
	serendipity_event_textile.php 
Log Message:
use   instead of   for unknown entity XML compliance


Index: serendipity_event_textile.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textile/serendipity_event_textile.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_textile.php	19 Nov 2004 11:24:59 -0000	1.9
+++ serendipity_event_textile.php	30 Nov 2004 11:27:56 -0000	1.10
@@ -203,8 +203,8 @@
                 "<br />\n",
                 '<span class="',
                 '</span>',
-                "\n&nbsp;",
-                '&nbsp; '
+                "\n&#160;",
+                '&#160; '
             ),
             $highlighted
         ) . '</div></p>';

[php-blog-cvs] serendipity/include/admin/importers wordpress.inc.php,1.3,1.4

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11749

Modified Files:
	wordpress.inc.php 
Log Message:
* I suppose we don't want parse errors? :)
* Fix passing $trans_table as key, it's not needed and looks like a relict from some debugging?
* We only want to set autodiscover off, if the users chose to do so


Index: wordpress.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/wordpress.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- wordpress.inc.php	30 Nov 2004 00:26:15 -0000	1.3
+++ wordpress.inc.php	30 Nov 2004 10:59:07 -0000	1.4
@@ -48,8 +48,8 @@
     }
 
     function strtrRecursive($data, $trans_table) {
-        foreach ( $data as $key => $val ) {
-            if ( is_array([$val]) ) {
+        foreach ($data as $key => $val) {
+            if (is_array($val)) {
                 $data[$key] = $this->strtrRecursive($val);
             }
             else {
@@ -65,7 +65,10 @@
 
         // Save this so we can return it to its original value at the end of this method.
         $noautodiscovery = isset($serendipity['noautodiscovery']) ? $serendipity['noautodiscovery'] : false;
-        $serendipity['noautodiscovery'] = true;
+
+        if ($this->data['autodiscovery'] == 'false') {
+            $serendipity['noautodiscovery'] = 1;
+        }
 
         // We need to convert interesting characters to HTML entities, except for those with special relevance to HTML.
         $trans_table = get_html_translation_table(HTML_ENTITIES);
@@ -167,7 +170,7 @@
         for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
             $entries[$x] = mysql_fetch_assoc($res);
 
-            $entry = array('title' => $entries[$x]['post_title'], $trans_table, // htmlentities() is called later, so we can leave this.
+            $entry = array('title' => $entries[$x]['post_title'], // htmlentities() is called later, so we can leave this.
                            'isdraft' => ($entries[$x]['post_status'] == 'publish') ? 'false' : 'true',
                            'allow_comments' => ($entries[$x]['comment_status '] == 'open ') ? 'true' : 'false',
                            'timestamp' => strtotime($entries[$x]['post_date']),

[php-blog-cvs] serendipity/templates/default sidebar.tpl,1.4,1.5

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6818

Modified Files:
	sidebar.tpl 
Log Message:
maintain compatibility with layout.php templates


Index: sidebar.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/sidebar.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sidebar.tpl	24 Nov 2004 18:20:55 -0000	1.4
+++ sidebar.tpl	30 Nov 2004 10:36:29 -0000	1.5
@@ -1,6 +1,12 @@
+{if $is_raw_mode}
+<div id="serendipity{$pluginside}SideBar">
+{/if}
 {foreach from=$plugindata item=item}
     <div class="serendipitySideBarItem">
         <h3 class="serendipitySideBarTitle {$item.class}">{$item.title}</h3>
         <div class="serendipitySideBarContent">{$item.content}</div>
     </div>
 {/foreach}
+{if $is_raw_mode}
+</div>
+{/if}
\ No newline at end of file

[php-blog-cvs] serendipity/plugins/serendipity_event_textwiki serendipity_event_textwiki.php,1.9,1.10

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_textwiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6569/serendipity_event_textwiki

Modified Files:
	serendipity_event_textwiki.php 
Log Message:
only use textwiki include when actually using this plugin


Index: serendipity_event_textwiki.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textwiki/serendipity_event_textwiki.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_textwiki.php	19 Nov 2004 11:24:59 -0000	1.9
+++ serendipity_event_textwiki.php	30 Nov 2004 10:35:27 -0000	1.10
@@ -1,7 +1,5 @@
 <?php # $Id$
 
-include_once 'Text/Wiki.php';
-
 switch ($serendipity['lang']) {
     case 'de':
         @define('PLUGIN_EVENT_TEXTWIKI_NAME',     'Textformatierung: Wiki');
@@ -610,6 +608,8 @@
     }
 
     function _init_wiki(&$bag) {
+        @include_once 'Text/Wiki.php';
+
         if (class_exists('Text_Wiki')) {
             $this->wiki =& new Text_Wiki;
         } else {

[php-blog-cvs] serendipity/include/admin upgrader.inc.php,1.4,1.5

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/include/admin

Modified Files:
	upgrader.inc.php 
Log Message:
Persistant => Persistent, thanks Sebastian


Index: upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/upgrader.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- upgrader.inc.php	29 Nov 2004 23:21:45 -0000	1.4
+++ upgrader.inc.php	30 Nov 2004 07:50:42 -0000	1.5
@@ -186,7 +186,7 @@
            $serendipity['dbUser'],
            $serendipity['dbPass'],
            $serendipity['dbType'],
-           $serendipity['dbPersistant'],
+           $serendipity['dbPersistent'],
            $privateVariables
     );
 

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.6,1.7

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/include

Modified Files:
	functions_installer.inc.php 
Log Message:
Persistant => Persistent, thanks Sebastian


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- functions_installer.inc.php	29 Nov 2004 23:21:44 -0000	1.6
+++ functions_installer.inc.php	30 Nov 2004 07:50:42 -0000	1.7
@@ -1,5 +1,5 @@
 <?php # $Id$
-function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $dbPersistant, $privateVariables = null) {
+function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $dbPersistent, $privateVariables = null) {
     global $serendipity;
     umask(0000);
 
@@ -47,7 +47,7 @@
     fwrite($configfp, "\t\$serendipity['dbUser']            = '{$dbUser}';\n");
     fwrite($configfp, "\t\$serendipity['dbPass']            = '{$dbPass}';\n");
     fwrite($configfp, "\t\$serendipity['dbType']            = '{$dbType}';\n");
-    fwrite($configfp, "\t\$serendipity['dbPersistant']      = ". (serendipity_db_bool($dbPersistant) ? 'true' : 'false') .";\n");
+    fwrite($configfp, "\t\$serendipity['dbPersistent']      = ". (serendipity_db_bool($dbPersistent) ? 'true' : 'false') .";\n");
 
     if (is_array($privateVariables) && count($privateVariables) > 0) {
         foreach($privateVariables AS $p_idx => $p_val) {
@@ -736,7 +736,7 @@
                                              $_POST['dbUser'],
                                              $_POST['dbPass'],
                                              $_POST['dbType'],
-                                             $_POST['dbPersistant']);
+                                             $_POST['dbPersistent']);
     } else {
         return true;
     }

[php-blog-cvs] serendipity/docs NEWS,1.14,1.15

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/docs

Modified Files:
	NEWS 
Log Message:
Persistant => Persistent, thanks Sebastian


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- NEWS	29 Nov 2004 23:21:42 -0000	1.14
+++ NEWS	30 Nov 2004 07:50:41 -0000	1.15
@@ -3,7 +3,7 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
-    * Allow the usage of persistant database connections (tomsommer)
+    * Allow the usage of persistent database connections (tomsommer)
 
     * New configuration directive to let user choose if entries in the
       future are hidden (default) or displayed. (garvinhicking)

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.26,1.27 serendipity_lang_cs.inc.php,1.72,1.73 serendipity_lang_cz.inc.php,1.72,1.73 serendipity_lang_da.inc.php,1.92,1.93 serendipity_lang_de.inc.php,1.112,1.113 serendipity_lang_en.inc.php,1.93,1.94 serendipity_lang_es.inc.php,1.89,1.90 serendipity_lang_fr.inc.php,1.71,1.72 serendipity_lang_it.inc.php,1.12,1.13 serendipity_lang_nl.inc.php,1.48,1.49 serendipity_lang_no.inc.php,1.13,1.14 serendipity_lang_pt.inc.php,1.48,1.49 serendipity_lang_tw.inc.php,1.8,1.9

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/lang

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_tw.inc.php 
Log Message:
Persistant => Persistent, thanks Sebastian


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- serendipity_lang_cs.inc.php	29 Nov 2004 23:21:49 -0000	1.72
+++ serendipity_lang_cs.inc.php	30 Nov 2004 07:50:43 -0000	1.73
@@ -616,8 +616,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_lang_no.inc.php	29 Nov 2004 23:22:03 -0000	1.13
+++ serendipity_lang_no.inc.php	30 Nov 2004 07:50:44 -0000	1.14
@@ -611,7 +611,7 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- serendipity_lang_nl.inc.php	29 Nov 2004 23:22:02 -0000	1.48
+++ serendipity_lang_nl.inc.php	30 Nov 2004 07:50:44 -0000	1.49
@@ -621,8 +621,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- serendipity_lang_en.inc.php	29 Nov 2004 23:22:00 -0000	1.93
+++ serendipity_lang_en.inc.php	30 Nov 2004 07:50:44 -0000	1.94
@@ -613,8 +613,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended');
 @define('INSTALL_SHOWFUTURE', 'Show future entries');
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.');
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections');
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended');
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections');
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_lang_tw.inc.php	29 Nov 2004 23:22:04 -0000	1.8
+++ serendipity_lang_tw.inc.php	30 Nov 2004 07:50:44 -0000	1.9
@@ -614,8 +614,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_bg.inc.php	29 Nov 2004 23:21:48 -0000	1.26
+++ serendipity_lang_bg.inc.php	30 Nov 2004 07:50:43 -0000	1.27
@@ -598,8 +598,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- serendipity_lang_pt.inc.php	29 Nov 2004 23:22:04 -0000	1.48
+++ serendipity_lang_pt.inc.php	30 Nov 2004 07:50:44 -0000	1.49
@@ -617,8 +617,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_lang_it.inc.php	29 Nov 2004 23:22:01 -0000	1.12
+++ serendipity_lang_it.inc.php	30 Nov 2004 07:50:44 -0000	1.13
@@ -616,8 +616,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- serendipity_lang_da.inc.php	29 Nov 2004 23:21:58 -0000	1.92
+++ serendipity_lang_da.inc.php	30 Nov 2004 07:50:44 -0000	1.93
@@ -611,8 +611,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- serendipity_lang_fr.inc.php	29 Nov 2004 23:22:01 -0000	1.71
+++ serendipity_lang_fr.inc.php	30 Nov 2004 07:50:44 -0000	1.72
@@ -619,8 +619,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- serendipity_lang_cz.inc.php	29 Nov 2004 23:21:50 -0000	1.72
+++ serendipity_lang_cz.inc.php	30 Nov 2004 07:50:44 -0000	1.73
@@ -614,8 +614,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- serendipity_lang_es.inc.php	29 Nov 2004 23:22:00 -0000	1.89
+++ serendipity_lang_es.inc.php	30 Nov 2004 07:50:44 -0000	1.90
@@ -622,8 +622,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommeded'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- serendipity_lang_de.inc.php	29 Nov 2004 23:21:59 -0000	1.112
+++ serendipity_lang_de.inc.php	30 Nov 2004 07:50:44 -0000	1.113
@@ -613,8 +613,8 @@
 @define('INSTALL_USEGZIP_DESC', 'Um die Auslieferung von Seiten zu beschleunigen, können diese vorher GZIP komprimiert werden, sofern der Browser des Betrachters dies unterstützt. Diese Einstellung ist empfohlen.');
 @define('INSTALL_SHOWFUTURE', 'Zukünftige Einträge zeigen');
 @define('INSTALL_SHOWFUTURE_DESC', 'Falls aktiviert, werden Einträge deren Datum in der Zukunft liegt angezeigt. Standardmäßig werden solche Einträge versteckt und erst angezeigt, wenn das eingetragene Datum erreicht wird.');
-@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
-@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
+@define('INSTALL_DBPERSISTENT', 'Use persistent connections'); // Translate
+@define('INSTALL_DBPERSISTENT_DESC', 'Enable the usage of persistent database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/include/db mysql.inc.php,1.4,1.5 mysqli.inc.php,1.4,1.5 postgres.inc.php,1.4,1.5 sqlite.inc.php,1.4,1.5

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/include/db

Modified Files:
	mysql.inc.php mysqli.inc.php postgres.inc.php sqlite.inc.php 
Log Message:
Persistant => Persistent, thanks Sebastian


Index: mysqli.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/mysqli.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mysqli.inc.php	29 Nov 2004 23:21:47 -0000	1.4
+++ mysqli.inc.php	30 Nov 2004 07:50:42 -0000	1.5
@@ -92,7 +92,7 @@
         return $serendipity['dbConn'];
     }
 
-    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+    if (isset($serendipity['dbPersistent']) && $serendipity['dbPersistent']) {
         $function = 'mysqli_pconnect';
     } else {
         $function = 'mysqli_connect';

Index: mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/mysql.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mysql.inc.php	29 Nov 2004 23:21:46 -0000	1.4
+++ mysql.inc.php	30 Nov 2004 07:50:42 -0000	1.5
@@ -97,7 +97,7 @@
         return $serendipity['dbConn'];
     }
 
-    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+    if (isset($serendipity['dbPersistent']) && $serendipity['dbPersistent']) {
         $function = 'mysql_pconnect';
     } else {
         $function = 'mysql_connect';

Index: postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/postgres.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- postgres.inc.php	29 Nov 2004 23:21:47 -0000	1.4
+++ postgres.inc.php	30 Nov 2004 07:50:42 -0000	1.5
@@ -3,7 +3,7 @@
 function serendipity_db_connect() {
     global $serendipity;
 
-    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+    if (isset($serendipity['dbPersistent']) && $serendipity['dbPersistent']) {
         $function = 'pg_pconnect';
     } else {
         $function = 'pg_connect';

Index: sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/sqlite.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sqlite.inc.php	29 Nov 2004 23:21:47 -0000	1.4
+++ sqlite.inc.php	30 Nov 2004 07:50:42 -0000	1.5
@@ -13,7 +13,7 @@
         return $serendipity['dbConn'];
     }
 
-    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+    if (isset($serendipity['dbPersistent']) && $serendipity['dbPersistent']) {
         $function = 'sqlite_popen';
     } else {
         $function = 'sqlite_open';

[php-blog-cvs] serendipity/include/tpl config_local.tpl,1.5,1.6

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/tpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/include/tpl

Modified Files:
	config_local.tpl 
Log Message:
Persistant => Persistent, thanks Sebastian


Index: config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config_local.tpl	29 Nov 2004 23:21:47 -0000	1.5
+++ config_local.tpl	30 Nov 2004 07:50:43 -0000	1.6
@@ -8,7 +8,7 @@
 $serendipity['dbPass']               = '{INSTALL_DBPASS|dbPass|protected||255}';                                            // INSTALL_DBPASS_DESC
 $serendipity['dbName']               = '{INSTALL_DBNAME|dbName|string|serendipity|255}';                                    // INSTALL_DBNAME_DESC
 $serendipity['dbPrefix']             = '{INSTALL_DBPREFIX|dbPrefix|string|serendipity_|255}';                               // INSTALL_DBPREFIX_DESC
-$serendipity['dbPersistant']         = '{INSTALL_DBPERSISTANT|dbPersistant|bool|0|255}';                                    // INSTALL_DBPERSISTANT_DESC
+$serendipity['dbPersistent']         = '{INSTALL_DBPERSISTENT|dbPersistent|bool|0|255}';                                    // INSTALL_DBPERSISTENT_DESC
 
 // INSTALL_CAT_PATHS
 # INSTALL_CAT_PATHS_DESC

[php-blog-cvs] serendipity/include/admin/importers wordpress.inc.php,1.2,1.3

[Evan N. <tad...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11598

Modified Files:
	wordpress.inc.php 
Log Message:
Encode UTF-8 characters, set noautodiscovery back to whatever it was after import is finished. Please test the former.

Index: wordpress.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/wordpress.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wordpress.inc.php	19 Nov 2004 11:05:33 -0000	1.2
+++ wordpress.inc.php	30 Nov 2004 00:26:15 -0000	1.3
@@ -47,12 +47,31 @@
         return $this->inputFields;
     }
 
+    function strtrRecursive($data, $trans_table) {
+        foreach ( $data as $key => $val ) {
+            if ( is_array([$val]) ) {
+                $data[$key] = $this->strtrRecursive($val);
+            }
+            else {
+                $data[$key] = strtr($val, $trans_table);
+            }
+        }
+
+        return $data;
+    }
+
     function import() {
         global $serendipity;
 
-        if ($this->data['autodiscovery'] == 'false') {
-            $serendipity['noautodiscovery'] = 1;
-        }
+        // Save this so we can return it to its original value at the end of this method.
+        $noautodiscovery = isset($serendipity['noautodiscovery']) ? $serendipity['noautodiscovery'] : false;
+        $serendipity['noautodiscovery'] = true;
+
+        // We need to convert interesting characters to HTML entities, except for those with special relevance to HTML.
+        $trans_table = get_html_translation_table(HTML_ENTITIES);
+        foreach ( get_html_translation_table(HTML_SPECIALCHARS) as $char => $encoded )
+            if ( isset($trans_table[$char]) )
+                unset($trans_table[$char]);
 
         $this->data['prefix'] = serendipity_db_escape_string($this->data['prefix']);
         $users = array();
@@ -93,7 +112,7 @@
                 $data['userlevel'] = USERLEVEL_ADMIN;
             }
 
-            serendipity_db_insert('authors', $data);
+            serendipity_db_insert('authors', $this->strtrRecursive($data, $trans_table));
             $users[$x]['authorid'] = serendipity_db_insert_id('authors', 'authorid');
         }
 
@@ -115,7 +134,7 @@
                          'category_left'        => 0,
                          'category_right'       => 0);
 
-            serendipity_db_insert('category', $cat);
+            serendipity_db_insert('category', $this->strtrRecursive($cat, $trans_table));
             $categories[$x]['categoryid'] = serendipity_db_insert_id('category', 'categoryid');
         }
 
@@ -148,11 +167,11 @@
         for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
             $entries[$x] = mysql_fetch_assoc($res);
 
-            $entry = array('title' => $entries[$x]['post_title'],
+            $entry = array('title' => $entries[$x]['post_title'], $trans_table, // htmlentities() is called later, so we can leave this.
                            'isdraft' => ($entries[$x]['post_status'] == 'publish') ? 'false' : 'true',
                            'allow_comments' => ($entries[$x]['comment_status '] == 'open ') ? 'true' : 'false',
                            'timestamp' => strtotime($entries[$x]['post_date']),
-                           'body' => $entries[$x]['post_content']);
+                           'body' => strtr($entries[$x]['post_content'], $trans_table));
 
             foreach ( $users as $user ) {
                 if ( $user['ID'] == $entries[$x]['post_author'] ) {
@@ -179,7 +198,7 @@
                         if ( $a['post_id'] == $entry['ID'] ) {
                             $data = array('entryid' => $entry['entryid'],
                                           'categoryid' => $category['categoryid']);
-                            serendipity_db_insert('entrycat', $data);
+                            serendipity_db_insert('entrycat', $this->strtrRecursive($data, $trans_table));
                             break;
                         }
                     }
@@ -208,12 +227,14 @@
                                      'body'      => $a['comment_content'],
                                      'type'      => 'NORMAL');
 
-                    serendipity_db_insert('comments', $comment);
+                    serendipity_db_insert('comments', $this->strtrRecursive($comment, $trans_table));
                     serendipity_approveComment($cid, $id, true);
                 }
             }
         }
 
+        $serendipity['noautodiscovery'] = $noautodiscovery;
+
         // That was fun.
         return true;
     }

[php-blog-cvs] serendipity/docs NEWS,1.13,1.14

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25969/docs

Modified Files:
	NEWS 
Log Message:
- Allow the usage of persistant database connections


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- NEWS	29 Nov 2004 10:39:26 -0000	1.13
+++ NEWS	29 Nov 2004 23:21:42 -0000	1.14
@@ -3,6 +3,8 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Allow the usage of persistant database connections (tomsommer)
+
     * New configuration directive to let user choose if entries in the
       future are hidden (default) or displayed. (garvinhicking)
 

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.25,1.26 serendipity_lang_cs.inc.php,1.71,1.72 serendipity_lang_cz.inc.php,1.71,1.72 serendipity_lang_da.inc.php,1.91,1.92 serendipity_lang_de.inc.php,1.111,1.112 serendipity_lang_en.inc.php,1.92,1.93 serendipity_lang_es.inc.php,1.88,1.89 serendipity_lang_fr.inc.php,1.70,1.71 serendipity_lang_it.inc.php,1.11,1.12 serendipity_lang_nl.inc.php,1.47,1.48 serendipity_lang_no.inc.php,1.12,1.13 serendipity_lang_pt.inc.php,1.47,1.48 serendipity_lang_tw.inc.php,1.7,1.8

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25969/lang

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_tw.inc.php 
Log Message:
- Allow the usage of persistant database connections


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- serendipity_lang_cs.inc.php	29 Nov 2004 10:39:34 -0000	1.71
+++ serendipity_lang_cs.inc.php	29 Nov 2004 23:21:49 -0000	1.72
@@ -616,6 +616,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_lang_no.inc.php	29 Nov 2004 10:39:37 -0000	1.12
+++ serendipity_lang_no.inc.php	29 Nov 2004 23:22:03 -0000	1.13
@@ -611,5 +611,7 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- serendipity_lang_nl.inc.php	29 Nov 2004 10:39:37 -0000	1.47
+++ serendipity_lang_nl.inc.php	29 Nov 2004 23:22:02 -0000	1.48
@@ -621,6 +621,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- serendipity_lang_en.inc.php	29 Nov 2004 10:39:35 -0000	1.92
+++ serendipity_lang_en.inc.php	29 Nov 2004 23:22:00 -0000	1.93
@@ -613,6 +613,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended');
 @define('INSTALL_SHOWFUTURE', 'Show future entries');
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.');
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections');
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_lang_tw.inc.php	29 Nov 2004 10:39:37 -0000	1.7
+++ serendipity_lang_tw.inc.php	29 Nov 2004 23:22:04 -0000	1.8
@@ -614,6 +614,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_lang_bg.inc.php	29 Nov 2004 10:39:34 -0000	1.25
+++ serendipity_lang_bg.inc.php	29 Nov 2004 23:21:48 -0000	1.26
@@ -598,6 +598,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- serendipity_lang_pt.inc.php	29 Nov 2004 10:39:37 -0000	1.47
+++ serendipity_lang_pt.inc.php	29 Nov 2004 23:22:04 -0000	1.48
@@ -617,6 +617,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_lang_it.inc.php	29 Nov 2004 10:39:36 -0000	1.11
+++ serendipity_lang_it.inc.php	29 Nov 2004 23:22:01 -0000	1.12
@@ -616,6 +616,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- serendipity_lang_da.inc.php	29 Nov 2004 10:39:34 -0000	1.91
+++ serendipity_lang_da.inc.php	29 Nov 2004 23:21:58 -0000	1.92
@@ -611,6 +611,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- serendipity_lang_fr.inc.php	29 Nov 2004 10:39:36 -0000	1.70
+++ serendipity_lang_fr.inc.php	29 Nov 2004 23:22:01 -0000	1.71
@@ -619,6 +619,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- serendipity_lang_cz.inc.php	29 Nov 2004 10:39:34 -0000	1.71
+++ serendipity_lang_cz.inc.php	29 Nov 2004 23:21:50 -0000	1.72
@@ -614,6 +614,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommended'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- serendipity_lang_es.inc.php	29 Nov 2004 10:39:35 -0000	1.88
+++ serendipity_lang_es.inc.php	29 Nov 2004 23:22:00 -0000	1.89
@@ -622,6 +622,8 @@
 @define('INSTALL_USEGZIP_DESC', 'To speed up delivery of pages, we can compress the pages we send to the visitor, given that his browser supports this. This is recommeded'); // Translate
 @define('INSTALL_SHOWFUTURE', 'Show future entries'); // Translate
 @define('INSTALL_SHOWFUTURE_DESC', 'If enabled, this will show all entries in the future on your blog. Default is to hide those entries and only show them if the publish date has arrived.'); // Translate
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- serendipity_lang_de.inc.php	29 Nov 2004 10:39:35 -0000	1.111
+++ serendipity_lang_de.inc.php	29 Nov 2004 23:21:59 -0000	1.112
@@ -613,6 +613,8 @@
 @define('INSTALL_USEGZIP_DESC', 'Um die Auslieferung von Seiten zu beschleunigen, können diese vorher GZIP komprimiert werden, sofern der Browser des Betrachters dies unterstützt. Diese Einstellung ist empfohlen.');
 @define('INSTALL_SHOWFUTURE', 'Zukünftige Einträge zeigen');
 @define('INSTALL_SHOWFUTURE_DESC', 'Falls aktiviert, werden Einträge deren Datum in der Zukunft liegt angezeigt. Standardmäßig werden solche Einträge versteckt und erst angezeigt, wenn das eingetragene Datum erreicht wird.');
+@define('INSTALL_DBPERSISTANT', 'Use persistant connections'); // Translate
+@define('INSTALL_DBPERSISTANT_DESC', 'Enable the usage of persistant database connections, read more <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">here</a>. This is normally not recommended'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/include/db mysql.inc.php,1.3,1.4 mysqli.inc.php,1.3,1.4 postgres.inc.php,1.3,1.4 sqlite.inc.php,1.3,1.4

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25969/include/db

Modified Files:
	mysql.inc.php mysqli.inc.php postgres.inc.php sqlite.inc.php 
Log Message:
- Allow the usage of persistant database connections


Index: mysqli.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/mysqli.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mysqli.inc.php	26 Nov 2004 14:08:39 -0000	1.3
+++ mysqli.inc.php	29 Nov 2004 23:21:47 -0000	1.4
@@ -92,7 +92,13 @@
         return $serendipity['dbConn'];
     }
 
-    $serendipity['dbConn'] = mysqli_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
+    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+        $function = 'mysqli_pconnect';
+    } else {
+        $function = 'mysqli_connect';
+    }
+
+    $serendipity['dbConn'] = $function($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
     mysqli_select_db($serendipity['dbConn'], $serendipity['dbName']);
 
     return $serendipity['dbConn'];

Index: mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/mysql.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mysql.inc.php	26 Nov 2004 14:08:39 -0000	1.3
+++ mysql.inc.php	29 Nov 2004 23:21:46 -0000	1.4
@@ -97,7 +97,13 @@
         return $serendipity['dbConn'];
     }
 
-    $serendipity['dbConn'] = mysql_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
+    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+        $function = 'mysql_pconnect';
+    } else {
+        $function = 'mysql_connect';
+    }
+
+    $serendipity['dbConn'] = $function($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
     mysql_select_db($serendipity['dbName']);
     return $serendipity['dbConn'];
 }

Index: postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/postgres.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- postgres.inc.php	26 Nov 2004 14:08:39 -0000	1.3
+++ postgres.inc.php	29 Nov 2004 23:21:47 -0000	1.4
@@ -3,10 +3,15 @@
 function serendipity_db_connect() {
     global $serendipity;
 
-    $serendipity['dbConn'] = pg_connect(
+    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+        $function = 'pg_pconnect';
+    } else {
+        $function = 'pg_connect';
+    }
+
+    $serendipity['dbConn'] = $function(
                                sprintf(
                                  '%sdbname=%s user=%s password=%s',
-
                                  strlen($serendipity['dbHost']) ? ('host=' . $serendipity['dbHost'] . ' ') : '',
                                  $serendipity['dbName'],
                                  $serendipity['dbUser'],

Index: sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/sqlite.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sqlite.inc.php	26 Nov 2004 14:08:39 -0000	1.3
+++ sqlite.inc.php	29 Nov 2004 23:21:47 -0000	1.4
@@ -13,7 +13,14 @@
         return $serendipity['dbConn'];
     }
 
-    $serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . $serendipity['dbName'] . '.db');
+    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+        $function = 'sqlite_popen';
+    } else {
+        $function = 'sqlite_open';
+    }
+
+
+    $serendipity['dbConn'] = $function($serendipity['serendipityPath'] . $serendipity['dbName'] . '.db');
 
     return $serendipity['dbConn'];
 }

[php-blog-cvs] serendipity/include/tpl config_local.tpl,1.4,1.5

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/tpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25969/include/tpl

Modified Files:
	config_local.tpl 
Log Message:
- Allow the usage of persistant database connections


Index: config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config_local.tpl	29 Nov 2004 10:39:33 -0000	1.4
+++ config_local.tpl	29 Nov 2004 23:21:47 -0000	1.5
@@ -8,6 +8,7 @@
 $serendipity['dbPass']               = '{INSTALL_DBPASS|dbPass|protected||255}';                                            // INSTALL_DBPASS_DESC
 $serendipity['dbName']               = '{INSTALL_DBNAME|dbName|string|serendipity|255}';                                    // INSTALL_DBNAME_DESC
 $serendipity['dbPrefix']             = '{INSTALL_DBPREFIX|dbPrefix|string|serendipity_|255}';                               // INSTALL_DBPREFIX_DESC
+$serendipity['dbPersistant']         = '{INSTALL_DBPERSISTANT|dbPersistant|bool|0|255}';                                    // INSTALL_DBPERSISTANT_DESC
 
 // INSTALL_CAT_PATHS
 # INSTALL_CAT_PATHS_DESC

[php-blog-cvs] serendipity/include/admin upgrader.inc.php,1.3,1.4

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25969/include/admin

Modified Files:
	upgrader.inc.php 
Log Message:
- Allow the usage of persistant database connections


Index: upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/upgrader.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- upgrader.inc.php	27 Nov 2004 22:14:15 -0000	1.3
+++ upgrader.inc.php	29 Nov 2004 23:21:45 -0000	1.4
@@ -186,8 +186,7 @@
            $serendipity['dbUser'],
            $serendipity['dbPass'],
            $serendipity['dbType'],
-           'serendipity_config_local.inc.php',
-           null,
+           $serendipity['dbPersistant'],
            $privateVariables
     );
 

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.5,1.6

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25969/include

Modified Files:
	functions_installer.inc.php 
Log Message:
- Allow the usage of persistant database connections


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- functions_installer.inc.php	27 Nov 2004 22:14:14 -0000	1.5
+++ functions_installer.inc.php	29 Nov 2004 23:21:44 -0000	1.6
@@ -1,10 +1,10 @@
 <?php # $Id$
-function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $file = 'serendipity_config_local.inc.php', $path = null, $privateVariables = null) {
+function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $dbPersistant, $privateVariables = null) {
     global $serendipity;
     umask(0000);
-    if (is_null($path)) {
-        $path = $serendipity['serendipityPath'];
-    }
+
+    $file = 'serendipity_config_local.inc.php';
+    $path = $serendipity['serendipityPath'];
 
     $oldconfig = @file_get_contents($path . $file);
     $configfp  = fopen($path . $file, 'w');
@@ -47,6 +47,7 @@
     fwrite($configfp, "\t\$serendipity['dbUser']            = '{$dbUser}';\n");
     fwrite($configfp, "\t\$serendipity['dbPass']            = '{$dbPass}';\n");
     fwrite($configfp, "\t\$serendipity['dbType']            = '{$dbType}';\n");
+    fwrite($configfp, "\t\$serendipity['dbPersistant']      = ". (serendipity_db_bool($dbPersistant) ? 'true' : 'false') .";\n");
 
     if (is_array($privateVariables) && count($privateVariables) > 0) {
         foreach($privateVariables AS $p_idx => $p_val) {
@@ -735,8 +736,7 @@
                                              $_POST['dbUser'],
                                              $_POST['dbPass'],
                                              $_POST['dbType'],
-                                             'serendipity_config_local.inc.php',
-                                             $_POST['serendipityPath']);
+                                             $_POST['dbPersistant']);
     } else {
         return true;
     }

[php-blog-cvs] serendipity/templates/default/admin style.css,1.3,1.4

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20433

Modified Files:
	style.css 
Log Message:
Don't break my styles!


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- style.css	29 Nov 2004 11:11:51 -0000	1.3
+++ style.css	29 Nov 2004 20:43:25 -0000	1.4
@@ -94,13 +94,13 @@
     padding-left: 5px;
 }
 
-.serendipity_admin_list_item .serendipity_admin_list_item_uneven {
+.serendipity_admin_list_item.serendipity_admin_list_item_uneven {
     border: 1px solid #294366;
     background-color: #F8F9FA;
     margin-bottom: 5px;
 }
 
-.serendipity_admin_list_item .serendipity_admin_list_item_even {
+.serendipity_admin_list_item.serendipity_admin_list_item_even {
     border: 1px solid #294366;
     background-color: #F2F3F2;
     margin-bottom: 5px;

[php-blog-cvs] serendipity/templates/default/admin style.css,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11805/templates/default/admin

Modified Files:
	style.css 
Log Message:
use min-width for good browsers.


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- style.css	29 Nov 2004 09:55:26 -0000	1.2
+++ style.css	29 Nov 2004 11:11:51 -0000	1.3
@@ -6,6 +6,7 @@
 
 #serendipityAdminFrame {
     width: 80%;
+    min-width: 777px;
     margin: auto;
 }
 

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.13,1.14

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8072/include

Modified Files:
	functions_entries.inc.php 
Log Message:
tweak iframe display some more


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- functions_entries.inc.php	29 Nov 2004 10:39:26 -0000	1.13
+++ functions_entries.inc.php	29 Nov 2004 10:53:55 -0000	1.14
@@ -1603,8 +1603,8 @@
     </head>
 
     <body style="padding: 0px; margin: 0px;">
-        <div id="mainpane" style="padding: 0px; margin: auto; width: 99%;">
-            <div id="content" style="padding: 0px; margin: 0px; height: 100%">
+        <div id="mainpane" style="padding: 0px; margin: 5px auto 5px auto; width: 98%;">
+            <div id="content" style="padding: 5px; margin: 0px;">
 <?php
         // We need to restore GET/POST variables to that depending plugins inside the iframe
         // can still fetch all that variables; and we also tighten security by not allowing
@@ -1633,6 +1633,7 @@
 
     switch ($mode) {
         case 'save':
+            echo '<div style="float: left; height: 75px"></div>';
             $res = serendipity_updertEntry($entry);
             if (is_string($res)) {
                 echo '<div class="serendipity_msg_error">' . ERROR . ': <b>' . $res . '</b></div>';
@@ -1644,16 +1645,19 @@
                 }
                 echo '<div class="serendipityAdminMsgSuccess">' . ENTRY_SAVED . '</div>';
             }
+            echo '<br style="clear: both" />';
 
             return true;
             break;
 
         case 'preview':
+            echo '<div style="float: left; height: 225px"></div>';
             $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend
             serendipity_smarty_init();
             $serendipity['smarty']->assign('is_preview',  true);
 
             serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true);
+            echo '<br style="clear: both" />';
 
             return true;
             break;

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.12,1.13 plugin_internal.inc.php,1.11,1.12

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4345/include

Modified Files:
	functions_entries.inc.php plugin_internal.inc.php 
Log Message:
added config option to NOT hide entries in the future. Some newssites may even have a use for this. :)



Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- plugin_internal.inc.php	29 Nov 2004 09:55:11 -0000	1.11
+++ plugin_internal.inc.php	29 Nov 2004 10:39:33 -0000	1.12
@@ -144,7 +144,7 @@
                               FROM {$serendipity['dbPrefix']}entries e
                              WHERE e.timestamp >= " . serendipity_serverOffsetHour($ts, true) . "
                                AND e.timestamp <= " . serendipity_serverOffsetHour($endts, true) . "
-                               AND e.timestamp <= $now
+                               " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= $now " : '') . "
                                AND e.isdraft = 'false'";
         }
 

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- functions_entries.inc.php	29 Nov 2004 09:55:11 -0000	1.12
+++ functions_entries.inc.php	29 Nov 2004 10:39:26 -0000	1.13
@@ -175,7 +175,7 @@
         }
     }
 
-    if (!isset($serendipity['GET']['adminModule'])) {
+    if (!isset($serendipity['GET']['adminModule']) && !serendipity_db_bool($serendipity['showFutureEntries'])) {
         if (!empty($cond['and'])) {
             $cond['and'] .= " AND e.timestamp <= '" . serendipity_serverOffsetHour(time(), true) . "'";
         } else {
@@ -296,7 +296,7 @@
     $cond['and'] = " "; // intentional dummy string to attach dummy AND parts to the WHERE clauses
 
     if ($fetchDrafts == 'false') {
-        $cond['and'] = " AND e.isdraft = 'false' AND e.timestamp <= " . serendipity_serverOffsetHour(time(), true);
+        $cond['and'] = " AND e.isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= " . serendipity_serverOffsetHour(time(), true) : '');
     }
 
     if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'entries' && $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
@@ -419,7 +419,7 @@
     }
 
     $cond = array();
-    $cond['and'] = " AND isdraft = 'false' AND timestamp <= " . serendipity_serverOffsetHour(time(), true);
+    $cond['and'] = " AND isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . serendipity_serverOffsetHour(time(), true) : '');
     serendipity_plugin_api::hook_event('frontend_fetchentries', $cond);
     $querystring = "SELECT $distinct
                             e.id,
@@ -1561,7 +1561,7 @@
                                                        WHERE isdraft = 'false'
                                                            AND timestamp >= $s
                                                            AND timestamp <= $e
-                                                           AND timestamp <= " . serendipity_serverOffsetHour(time(), true));
+                                                           " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . serendipity_serverOffsetHour(time(), true) : ''));
             $entry_count = $entries[0][0];
 
             /* A silly hack to get the maximum amount of entries per month */

[php-blog-cvs] serendipity/include/tpl config_local.tpl,1.3,1.4

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/tpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4345/include/tpl

Modified Files:
	config_local.tpl 
Log Message:
added config option to NOT hide entries in the future. Some newssites may even have a use for this. :)



Index: config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config_local.tpl	28 Nov 2004 21:07:11 -0000	1.3
+++ config_local.tpl	29 Nov 2004 10:39:33 -0000	1.4
@@ -38,11 +38,12 @@
 $serendipity['wysiwyg']              = '{INSTALL_WYSIWYG|wysiwyg|bool|0|0}';                // INSTALL_WYSIWYG_DESC
 $serendipity['XHTML11']              = '{INSTALL_XHTML11|XHTML11|bool|0|255}';              // INSTALL_XHTML11_DESC
 $serendipity['enablePopup']          = '{INSTALL_POPUP|enablePopup|bool|0|255}';            // INSTALL_POPUP_DESC
-$serendipity['embed']                = '{INSTALL_EMBED|embed|bool||255}';                   // INSTALL_EMBED_DESC
-$serendipity['top_as_links']         = '{INSTALL_SHOW_EXTERNAL_LINKS|top_as_links|bool||1|255}'; // INSTALL_SHOW_EXTERNAL_LINKS_DESC
+$serendipity['embed']                = '{INSTALL_EMBED|embed|bool|0|255}';                   // INSTALL_EMBED_DESC
+$serendipity['top_as_links']         = '{INSTALL_SHOW_EXTERNAL_LINKS|top_as_links|bool|1|255}'; // INSTALL_SHOW_EXTERNAL_LINKS_DESC
 $serendipity['blockReferer']         = '{INSTALL_BLOCKREF|blockReferer|string|;|255}';      // INSTALL_BLOCKREF_DESC
 $serendipity['rewrite']              = '{INSTALL_REWRITE|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite|255}';                  // INSTALL_REWRITE_DESC
 $serendipity['serverOffsetHours']    = '{INSTALL_OFFSET|serverOffsetHours|string|0|255}';   // INSTALL_OFFSET_DESC
+$serendipity['showFutureEntries']    = '{INSTALL_SHOWFUTURE|showFutureEntries|bool|0|255}'; // INSTALL_SHOWFUTURE_DESC
 
 // INSTALL_CAT_IMAGECONV
 # INSTALL_CAT_IMAGECONV_DESC