php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/include plugin_internal.inc.php,1.14,1.15

[Sebastian N. <no...@us...>]

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

Modified Files:
	plugin_internal.inc.php 
Log Message:
fixing SQL error

Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- plugin_internal.inc.php	3 Dec 2004 12:02:27 -0000	1.14
+++ plugin_internal.inc.php	4 Dec 2004 13:59:02 -0000	1.15
@@ -930,6 +930,7 @@
 
     function introspect_config_item($name, &$propbag)
     {
+        global $serendipity;
         switch($name) {
             case 'authorid':
                 $row_authors = serendipity_db_query("SELECT username, authorid FROM {$serendipity['dbPrefix']}authors");

[php-blog-cvs] serendipity/include/admin/importers wordpress.inc.php,1.6,1.7

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

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

Modified Files:
	wordpress.inc.php 
Log Message:
Remove space after comment_status. Garvin caught it, not me.

Index: wordpress.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/wordpress.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- wordpress.inc.php	3 Dec 2004 04:41:32 -0000	1.6
+++ wordpress.inc.php	3 Dec 2004 18:47:18 -0000	1.7
@@ -172,7 +172,7 @@
 
             $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',
+                           'allow_comments' => ($entries[$x]['comment_status'] == 'open' ) ? 'true' : 'false',
                            'timestamp' => strtotime($entries[$x]['post_date']),
                            'body' => strtr($entries[$x]['post_content'], $trans_table));
 

[php-blog-cvs] serendipity/include/admin configuration.inc.php,NONE,1.1 installer.inc.php,1.7,NONE

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

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

Added Files:
	configuration.inc.php 
Removed Files:
	installer.inc.php 
Log Message:
- Rename installer.inc.php to configuration.inc.php

installer.inc.php will be replaced with something else... soon :)


--- installer.inc.php DELETED ---

--- NEW FILE: configuration.inc.php ---
<?php # $Id: configuration.inc.php,v 1.1 2004/12/03 16:16:44 tomsommer Exp $

umask(0000);
$umask = 0775;
@define('IN_installer', true);

if (!isset($_POST['installAction'])) {
    $_POST['installAction'] = '';
}

/* Check where to deploy .htaccess files. For shared installation, first guess is submitted directory name.
   If that is not existant we autodetect using current directory. */
if (IS_installed !== true) {
    if (!empty($_POST['serendipityPath'])) {
        $serendipity_core = $_POST['serendipityPath'];
    } else {
        $serendipity_core = serendipity_httpCoreDir();
    }
} else {
    $serendipity_core = $serendipity['serendipityPath'];
}

switch ($_POST['installAction']) {
    case 'check':
        /* If we already have serendipity installed, all we need to do is write the configuration again */
        if (!defined('IN_serendipity') || IN_serendipity !== true) {
            $res = serendipity_checkInstallation();

            if (is_array($res)) {
                echo DIAGNOSTIC_ERROR . '<br /><br />';
                echo '<span class="serendipityAdminMsgError">- ' . implode('<br />', $res) . '</span><br /><br />';
                serendipity_printConfigTemplate(serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE), $_POST, false, true);
                die();
            }

            echo '<br />';

            /* We are good to go, lets install databases etc. */
            echo ATTEMPT_SETUP_DATABASE . "<br />";
            $res = serendipity_installDatabase();

            if ($res !== false) {
                echo ' ' . DATABASE_DONE . '<br />';
            } else {
                echo '<span class="serendipityAdminMsgError">- ' . DATABASE_ALREADY_INSTALLED . '</span><br />';
            }

            /* Next are the files, .htaccess */
            printf(ATTEMPT_WRITE_FILE, $serendipity_core . '.htaccess');
            $res = serendipity_installFiles($serendipity_core);
            if (is_array($res)) {
                echo '<span class="serendipityAdminMsgError">- ' . implode('<br />', $res) . '</span><br /><br />';
                die();
            } else {
                echo DONE . '<br />';
            }

            /* We are now installed */
            define('IN_serendipity', true);

            /* register default plugins */
            $GLOBALS['serendipity']['dbPrefix'] = $_POST['dbPrefix'];
            $GLOBALS['serendipity']['dbName']   = $_POST['dbName'];
            $GLOBALS['serendipity']['serendipityHTTPPath'] = $_POST['serendipityHTTPPath'];
            if (!isset($serendipity['lang'])) {
                $serendipity['lang'] = 'en';
            }

            include_once S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php';
            serendipity_plugin_api::register_default_plugins();

            printf(
              SERENDIPITY_INSTALLED . '<br />',

              '<p><strong>',
              '</strong></p>',

              $_POST['pass'],
              $_POST['user'],

              '<br /><br />',

              $_POST['serendipityHTTPPath']
            );

            @session_destroy();

        }

        $oldRewrite = $serendipity['rewrite']; // We save the rewrite method, because we run a check after $serendipity has been updated
        $res = serendipity_updateConfiguration();
        if (is_array($res)) {
            echo DIAGNOSTIC_ERROR;
            echo '<span class="serendipityAdminMsgError">- ' . implode('<br />', $res) . '</span><br /><br />';
        } else {
            /* If we have new rewrite rules, then install them */
            if (isset($_POST['rewrite']) && $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN && $oldRewrite != $_POST['rewrite']) {
                printf(ATTEMPT_WRITE_FILE, $serendipity_core . '.htaccess');
                $res = serendipity_installFiles($serendipity_core);
                if (is_array($res)) {
                    echo implode('<br />', $res);
                } else {
                    echo DONE . '<br />';
                }
            }
            echo '<br /><div class="serendipityAdminMsgSuccess">'. WRITTEN_N_SAVED .'</div>';
        }

        break;

    default:
        /*  Is serendipity already installed=  */
        if (file_exists('./serendipity_config_local.inc.php')) {
            $from = &$serendipity;
        } else {
            define('VERSION_REQUIRED', '4.2.1');

            /* Do check for required PHP version */
            if (version_compare(PHP_VERSION, VERSION_REQUIRED) == -1) {
                echo '<br /><span class="serendipityAdminMsgError">WARNING!<br />You are using PHP version ' . PHP_VERSION . '! Serendipity requires version ' . VERSION_REQUIRED . '</span>';
            }
            $from = false;
        }

        $t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);

        serendipity_printConfigTemplate($t, $from, false, true);
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity serendipity_admin.php,1.51,1.52

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

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

Modified Files:
	serendipity_admin.php 
Log Message:
- Rename installer.inc.php to configuration.inc.php

installer.inc.php will be replaced with something else... soon :)


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- serendipity_admin.php	2 Dec 2004 14:11:25 -0000	1.51
+++ serendipity_admin.php	3 Dec 2004 16:16:44 -0000	1.52
@@ -69,7 +69,7 @@
 <?php
 if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2date === false ) {
     if (IS_installed === false) {
-        $file = 'include/admin/installer.inc.php';
+        $file = 'include/admin/configuration.inc.php';
     } elseif ( IS_up2date === false ) {
         $file = 'include/admin/upgrader.inc.php';
     } else {
@@ -202,7 +202,7 @@
     switch($serendipity['GET']['adminModule']) {
         case 'installer':
         case 'configuration':
-            include S9Y_INCLUDE_PATH . 'include/admin/installer.inc.php';
+            include S9Y_INCLUDE_PATH . 'include/admin/configuration.inc.php';
             break;
 
         case 'media':

[php-blog-cvs] serendipity/include/admin personal.inc.php,1.9,1.10 users.inc.php,1.5,1.6

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

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

Modified Files:
	personal.inc.php users.inc.php 
Log Message:
- Use a function to check for $item flags


Index: users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/users.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- users.inc.php	3 Dec 2004 10:55:23 -0000	1.5
+++ users.inc.php	3 Dec 2004 16:13:36 -0000	1.6
@@ -56,8 +56,10 @@
         $config = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE);
         foreach($config as $category) {
             foreach ($category['items'] as $item) {
-                serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['POST']['user'], ($serendipity['authorid'] == $serendipity['POST']['authorid'] ? true : false));
-                if (in_array('config', $item['flags'])) {
+                if ( serendipity_checkConfigItemFlags($item, 'local') ) {
+                    serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['POST']['user'], ($serendipity['authorid'] == $serendipity['POST']['authorid'] ? true : false));
+                }
+                if ( serendipity_checkConfigItemFlags($item, 'configuration') ) {
                     serendipity_set_config_var($item['var'], $_POST[$item['var']], $serendipity['POST']['user']);
                 }
             }

Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- personal.inc.php	3 Dec 2004 10:55:23 -0000	1.9
+++ personal.inc.php	3 Dec 2004 16:13:36 -0000	1.10
@@ -13,8 +13,11 @@
     } else {
         foreach($config as $category) {
             foreach ($category['items'] as $item) {
-                serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['authorid'], true);
-                if (in_array('config', $item['flags'])) {
+                if ( serendipity_checkConfigItemFlags($item, 'local') ) {
+                    serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['authorid'], true);
+                }
+
+                if ( serendipity_checkConfigItemFlags($item, 'configuration') ) {
                     serendipity_set_config_var($item['var'], $_POST[$item['var']], $serendipity['authorid']);
                 }
             }

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.11,1.12

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
- Use a function to check for $item flags


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- functions_installer.inc.php	3 Dec 2004 12:29:38 -0000	1.11
+++ functions_installer.inc.php	3 Dec 2004 16:13:35 -0000	1.12
@@ -647,6 +647,24 @@
 
 }
 
+/* Takes the item data from a config var, and checks the flags against the current area */
+function serendipity_checkConfigItemFlags(&$item, $area) {
+
+    if ( in_array('nosave', $item['flags']) ) {
+        return false;
+    }
+
+    if ( in_array('local', $item['flags']) && $area == 'configuration' ) {
+        return false;
+    }
+
+    if ( in_array('config', $item['flags']) && $area == 'local' ) {
+        return false;
+    }
+
+    return true;
+}
+
 function serendipity_updateConfiguration() {
     global $serendipity, $umask;
 
@@ -666,7 +684,7 @@
         foreach ( $category['items'] as $item ) {
 
             /* Don't save trash */
-            if ( in_array('local', $item['flags']) || in_array('nosave', $item['flags']) ) {
+            if ( !serendipity_checkConfigItemFlags($item, 'configuration') ) {
                 continue;
             }
 

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

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

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

Modified Files:
	plugins.inc.php 
Log Message:
b0rked, sorry.


Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plugins.inc.php	3 Dec 2004 14:38:45 -0000	1.4
+++ plugins.inc.php	3 Dec 2004 14:46:50 -0000	1.5
@@ -136,8 +136,6 @@
 ?>
         </table>
         <br />
-<?php
-    if (count($errors
         <div>
             <input type="submit" name="REMOVE" title="<?php echo REMOVE_TICKED_PLUGINS; ?>"  value="<?php echo DELETE; ?>" />
             <input type="submit" name="SAVE"   title="<?php echo SAVE_CHANGES_TO_LAYOUT; ?>" value="<?php echo SAVE; ?>"   />

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

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

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

Modified Files:
	plugins.inc.php 
Log Message:
when a plugin fails to load, try to offer removing it


Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- plugins.inc.php	27 Nov 2004 22:14:15 -0000	1.3
+++ plugins.inc.php	3 Dec 2004 14:38:45 -0000	1.4
@@ -37,6 +37,7 @@
             </tr>
 <?php
     $sort_order = 0;
+    $errors     = array();
 
     /* Block display the plugins per placement location. */
     if ($event_only) {
@@ -57,26 +58,33 @@
             $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid']);
             $key    = urlencode($plugin_data['name']);
 
-            /* query for its name, description and configuration data */
-            $bag = new serendipity_property_bag;
-            $plugin->introspect($bag);
+            if (!is_object($plugin)) {
+                $name = ERROR . ': ' . $plugin_data['name'];
+                $desc = ERROR . '!';
+            } else {
+                /* query for its name, description and configuration data */
+
+                $bag = new serendipity_property_bag;
+                $plugin->introspect($bag);
+
+                $name  = htmlspecialchars($bag->get('name'));
+                $desc  = htmlspecialchars($bag->get('description'));
+
+                $title = serendipity_plugin_api::get_plugin_title($plugin, '[' . $name . ']');
+
+                if ($bag->is_set('configuration') && ($plugin->protected === FALSE || $plugin_data['authorid'] == '0' || $plugin_data['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN)) {
+                    $url   = '?serendipity[adminModule]=plugins&amp;serendipity[plugin_to_conf]=' . $key;
+                    $name  = '<a href="' . $url . '">' . $name  . '</a>';
+                    $title = '<a href="' . $url . '">' . $title . '</a>';
+                }
+            }
 
-            $name  = htmlspecialchars($bag->get('name'));
-            $desc  = htmlspecialchars($bag->get('description'));
             if ($event_only) {
                 $place = '<input type="hidden" name="serendipity[placement][' . $plugin_data['name'] . ']" value="event" />';
             } else {
                 $place = placement_box('serendipity[placement][' . $plugin_data['name'] . ']', $plugin_data['placement']);
             }
 
-            $title = serendipity_plugin_api::get_plugin_title($plugin, '[' . $name . ']');
-
-            if ($bag->is_set('configuration') && ($plugin->protected === FALSE || $plugin_data['authorid'] == '0' || $plugin_data['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN)) {
-                $url   = '?serendipity[adminModule]=plugins&amp;serendipity[plugin_to_conf]=' . $key;
-                $name  = '<a href="' . $url . '">' . $name  . '</a>';
-                $title = '<a href="' . $url . '">' . $title . '</a>';
-            }
-
             /* Only display UP/DOWN links if there's somewhere for the plugin to go */
             if ($sort_idx == 0) {
                 $moveup   = '&nbsp;';
@@ -128,6 +136,8 @@
 ?>
         </table>
         <br />
+<?php
+    if (count($errors
         <div>
             <input type="submit" name="REMOVE" title="<?php echo REMOVE_TICKED_PLUGINS; ?>"  value="<?php echo DELETE; ?>" />
             <input type="submit" name="SAVE"   title="<?php echo SAVE_CHANGES_TO_LAYOUT; ?>" value="<?php echo SAVE; ?>"   />

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.10,1.11

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
fix bug reported by sebastian


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- functions_installer.inc.php	3 Dec 2004 10:55:22 -0000	1.10
+++ functions_installer.inc.php	3 Dec 2004 12:29:38 -0000	1.11
@@ -657,6 +657,11 @@
         $_POST['dbName'] = $_POST['sqlitedbName'];
     }
 
+    // Password can be hidden in re-configuring, but we need to store old password
+    if (empty($_POST['dbPass']) && !empty($serendipity['dbPass'])) {
+        $_POST['dbPass'] = $serendipity['dbPass'];
+    }
+
     foreach($config as $category) {
         foreach ( $category['items'] as $item ) {
 

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

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

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

Modified Files:
	entries.inc.php 
Log Message:
fix server time zone offset things, thanks to Kaustubh for reporting!
We actually store the server time in the entries, so we don't need to add offsets when fetching them later from the DB for all those 'future Entries' checks.



Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- entries.inc.php	27 Nov 2004 22:14:15 -0000	1.6
+++ entries.inc.php	3 Dec 2004 12:02:27 -0000	1.7
@@ -277,8 +277,9 @@
             }
         }
 
+        // Save server timezone in database always, so substract the offset we added for display; otherwise it would be added time and again
         if (!empty($entry['timestamp'])) {
-            $entry['timestamp'] = serendipity_serverOffsetHour($entry['timestamp'], true); // Save server timezone in database always, so substract the offset we added for display; otherwise it would be added time and again
+            $entry['timestamp'] = serendipity_serverOffsetHour($entry['timestamp'], true);
         }
 
         if ($serendipity['POST']['quicksave'] == 'true') {

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.17,1.18 plugin_internal.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-serv26749/include

Modified Files:
	functions_entries.inc.php plugin_internal.inc.php 
Log Message:
fix server time zone offset things, thanks to Kaustubh for reporting!
We actually store the server time in the entries, so we don't need to add offsets when fetching them later from the DB for all those 'future Entries' checks.



Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- plugin_internal.inc.php	2 Dec 2004 10:54:56 -0000	1.13
+++ plugin_internal.inc.php	3 Dec 2004 12:02:27 -0000	1.14
@@ -131,7 +131,7 @@
                                        {$serendipity['dbPrefix']}entrycat ec
                                  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  <= " . time() : '') . "
                                    AND e.isdraft     = 'false'
                                    AND e.id          = ec.entryid
                                    AND c.categoryid  = ec.categoryid
@@ -144,7 +144,7 @@
                               FROM {$serendipity['dbPrefix']}entries e
                              WHERE e.timestamp >= " . serendipity_serverOffsetHour($ts, true) . "
                                AND e.timestamp <= " . serendipity_serverOffsetHour($endts, true) . "
-                               " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= $now " : '') . "
+                               " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= " . time() : '') . "
                                AND e.isdraft = 'false'";
         }
 

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- functions_entries.inc.php	1 Dec 2004 11:00:55 -0000	1.17
+++ functions_entries.inc.php	3 Dec 2004 12:02:25 -0000	1.18
@@ -177,9 +177,9 @@
 
     if (!isset($serendipity['GET']['adminModule']) && !serendipity_db_bool($serendipity['showFutureEntries'])) {
         if (!empty($cond['and'])) {
-            $cond['and'] .= " AND e.timestamp <= '" . serendipity_serverOffsetHour(time(), true) . "'";
+            $cond['and'] .= " AND e.timestamp <= '" . time() . "'";
         } else {
-            $cond['and'] = "WHERE e.timestamp <= '" . serendipity_serverOffsetHour(time(), true) . "'";
+            $cond['and'] = "WHERE e.timestamp <= '" . time() . "'";
         }
     }
 
@@ -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' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= " . serendipity_serverOffsetHour(time(), true) : '');
+        $cond['and'] = " AND e.isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND e.timestamp <= " . time() : '');
     }
 
     if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'entries' && $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
@@ -418,7 +418,7 @@
     }
 
     $cond = array();
-    $cond['and'] = " AND isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . serendipity_serverOffsetHour(time(), true) : '');
+    $cond['and'] = " AND isdraft = 'false' " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . time() : '');
     serendipity_plugin_api::hook_event('frontend_fetchentries', $cond);
     $querystring = "SELECT $distinct
                             e.id,
@@ -1144,7 +1144,7 @@
         $hidden .= '        <input type="hidden" name="' . $key . '" value="' . $value . '" />' . $n;
     }
     $hidden .= '        <input type="hidden" id="entryid" name="serendipity[id]" value="' . (isset($entry['id']) ? $entry['id'] : '') . '" />' . $n;
-    $hidden .= '        <input type="hidden" name="serendipity[timestamp]" value="' . (isset($entry['timestamp']) ? serendipity_serverOffsetHour($entry['timestamp']) : '') . '" />' . $n;
+    $hidden .= '        <input type="hidden" name="serendipity[timestamp]" value="' . (isset($entry['timestamp']) ? serendipity_serverOffsetHour($entry['timestamp']) : serendipity_serverOffsetHour(time())) . '" />' . $n;
     $hidden .= '        <input type="hidden" name="serendipity[preview]" value="false" />';
     $hidden .= '        <input type="hidden" name="serendipity[quicksave]" value="false" />';
 
@@ -1559,7 +1559,7 @@
                                                        WHERE isdraft = 'false'
                                                            AND timestamp >= $s
                                                            AND timestamp <= $e
-                                                           " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . serendipity_serverOffsetHour(time(), true) : ''));
+                                                           " . (!serendipity_db_bool($serendipity['showFutureEntries']) ? " AND timestamp <= " . time() : ''));
             $entry_count = $entries[0][0];
 
             /* A silly hack to get the maximum amount of entries per month */

[php-blog-cvs] serendipity/plugins/serendipity_plugin_recententries serendipity_plugin_recententries.php,1.12,1.13

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

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

Modified Files:
	serendipity_plugin_recententries.php 
Log Message:
fix server time zone offset things, thanks to Kaustubh for reporting!
We actually store the server time in the entries, so we don't need to add offsets when fetching them later from the DB for all those 'future Entries' checks.



Index: serendipity_plugin_recententries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_plugin_recententries.php	2 Dec 2004 10:55:08 -0000	1.12
+++ serendipity_plugin_recententries.php	3 Dec 2004 12:02:28 -0000	1.13
@@ -149,7 +149,7 @@
                                                 timestamp
                                            FROM {$serendipity['dbPrefix']}entries
                                                 $sql_join
-                                          WHERE isdraft = 'false' AND timestamp <= " . serendipity_serverOffsetHour(time(), true) . "
+                                          WHERE isdraft = 'false' AND timestamp <= " . time() . "
                                                 $sql_where
                                        ORDER BY timestamp DESC
                                           LIMIT $sql_number";

[php-blog-cvs] serendipity/include/tpl config_local.inc.php,1.1,1.2 config_personal.inc.php,1.1,1.2

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

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

Modified Files:
	config_local.inc.php config_personal.inc.php 
Log Message:
* Re-Introduce wysiwyg and language settings per-user - flag 'config' (sigh ;)
* Added flag 'parseDescription' to replace [USERLEVEL_ADMIN] etc. in language strings
* When managing users, fetch their personal 'config'-flag settings from the DB and not from the session of another user



Index: config_local.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config_local.inc.php	2 Dec 2004 20:57:46 -0000	1.1
+++ config_local.inc.php	3 Dec 2004 10:55:23 -0000	1.2
@@ -1,5 +1,6 @@
 <?php # $Id$
 
+// Here be dragons and NO application logic!
 
     $res = array();
     $res[] = array('title'       => INSTALL_CAT_DB,

Index: config_personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_personal.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config_personal.inc.php	2 Dec 2004 20:57:46 -0000	1.1
+++ config_personal.inc.php	3 Dec 2004 10:55:23 -0000	1.2
@@ -1,5 +1,7 @@
 <?php # $Id$
 
+// Here be dragons and NO application logic!
+
     $res = array();
     $res[] = array('title' => USERCONF_CAT_PERSONAL,
                    'description' => USERCONF_CAT_PERSONAL_DESC,
@@ -22,7 +24,8 @@
                                           'description' => USERCONF_USERLEVEL_DESC,
                                           'type'        => 'int',
                                           'default'     => USERLEVEL_EDITOR,
-                                          'userlevel'   => USERLEVEL_CHIEF),
+                                          'userlevel'   => USERLEVEL_CHIEF,
+                                          'flags'       => array('parseDescription')),
 
                                     array('var'         => 'email',
                                           'title'       => USERCONF_EMAIL,
@@ -31,6 +34,20 @@
                                           'default'     => 'jo...@ex...',
                                           'userlevel'   => USERLEVEL_EDITOR),
 
+                                    array('var'         => 'lang',
+                                          'title'       => INSTALL_LANG,
+                                          'description' => INSTALL_LANG_DESC,
+                                          'type'        => 'list',
+                                          'default'     => $serendipity['languages'],
+                                          'flags'       => array('config')),
+
+                                    array('var'         => 'wysiwyg',
+                                          'title'       => INSTALL_WYSIWYG,
+                                          'description' => INSTALL_WYSIWYG_DESC,
+                                          'type'        => 'bool',
+                                          'default'     => false,
+                                          'flags'       => array('config')),
+
                                     array('var'         => 'mail_comments',
                                           'title'       => USERCONF_SENDCOMMENTS,
                                           'description' => USERCONF_SENDCOMMENTS_DESC,

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.9,1.10 functions_config.inc.php,1.4,1.5

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

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

Modified Files:
	functions_installer.inc.php functions_config.inc.php 
Log Message:
* Re-Introduce wysiwyg and language settings per-user - flag 'config' (sigh ;)
* Added flag 'parseDescription' to replace [USERLEVEL_ADMIN] etc. in language strings
* When managing users, fetch their personal 'config'-flag settings from the DB and not from the session of another user



Index: functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- functions_config.inc.php	2 Dec 2004 10:54:55 -0000	1.4
+++ functions_config.inc.php	3 Dec 2004 10:55:22 -0000	1.5
@@ -24,6 +24,18 @@
     }
 }
 
+function serendipity_get_user_config_var($name, $authorid, $default = '') {
+    global $serendipity;
+
+    $r = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE authorid = " . (int)$authorid . " AND name = '" . $name . "' LIMIT 1", true);
+
+    if (is_array($r)) {
+        return $r[0];
+    } else {
+        return $default;
+    }
+}
+
 function serendipity_get_user_var($name, $authorid, $default) {
     global $serendipity;
 

Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- functions_installer.inc.php	2 Dec 2004 20:57:44 -0000	1.9
+++ functions_installer.inc.php	3 Dec 2004 10:55:22 -0000	1.10
@@ -169,6 +169,21 @@
     return $config;
 }
 
+function serendipity_replaceEmbeddedConfigVars ($s) {
+    return str_replace(
+                  array(
+                    '[USERLEVEL_ADMIN]',
+                    '[USERLEVEL_CHIEF]',
+                    '[USERLEVEL_EDITOR]'
+                  ),
+
+                  array(
+                    USERLEVEL_ADMIN,
+                    USERLEVEL_CHIEF,
+                    USERLEVEL_EDITOR
+                  ), $s);
+}
+
 function serendipity_guessInput($type, $name, $value='', $default='') {
     global $serendipity;
 
@@ -303,6 +318,14 @@
             if ( in_array('hideValue', $item['flags']) ) {
                 $value = '';
             }
+
+            if (in_array('config', $item['flags']) && isset($from['authorid'])) {
+                $value = serendipity_get_user_config_var($item['var'], $from['authorid'], $item['default']);
+            }
+
+            if (in_array('parseDescription', $item['flags'])) {
+                $item['description'] = serendipity_replaceEmbeddedConfigVars($item['description']);
+            }
 ?>
                         <tr>
                             <td style="border-bottom: 1px #000000 solid" align="left" valign="top" width="75%">

[php-blog-cvs] serendipity/include/admin personal.inc.php,1.8,1.9 users.inc.php,1.4,1.5

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

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

Modified Files:
	personal.inc.php users.inc.php 
Log Message:
* Re-Introduce wysiwyg and language settings per-user - flag 'config' (sigh ;)
* Added flag 'parseDescription' to replace [USERLEVEL_ADMIN] etc. in language strings
* When managing users, fetch their personal 'config'-flag settings from the DB and not from the session of another user



Index: users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/users.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- users.inc.php	2 Dec 2004 20:57:45 -0000	1.4
+++ users.inc.php	3 Dec 2004 10:55:23 -0000	1.5
@@ -57,6 +57,9 @@
         foreach($config as $category) {
             foreach ($category['items'] as $item) {
                 serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['POST']['user'], ($serendipity['authorid'] == $serendipity['POST']['authorid'] ? true : false));
+                if (in_array('config', $item['flags'])) {
+                    serendipity_set_config_var($item['var'], $_POST[$item['var']], $serendipity['POST']['user']);
+                }
             }
         }
         printf('<strong>' . MODIFIED_USER . '</strong>', $_POST['username']);

Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- personal.inc.php	2 Dec 2004 20:57:45 -0000	1.8
+++ personal.inc.php	3 Dec 2004 10:55:23 -0000	1.9
@@ -14,6 +14,9 @@
         foreach($config as $category) {
             foreach ($category['items'] as $item) {
                 serendipity_set_user_var($item['var'], $_POST[$item['var']], $serendipity['authorid'], true);
+                if (in_array('config', $item['flags'])) {
+                    serendipity_set_config_var($item['var'], $_POST[$item['var']], $serendipity['authorid']);
+                }
             }
         }
         $from = $_POST;

[php-blog-cvs] serendipity serendipity_admin_entries.inc.php,1.39,1.39.2.1

[Sebastian N. <no...@us...>]

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

Modified Files:
      Tag: branch-0-7
	serendipity_admin_entries.inc.php 
Log Message:
I don't know if we ever release a 0.7.2, but it should'nt rely on JavaScript


Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/Attic/serendipity_admin_entries.inc.php,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -d -r1.39 -r1.39.2.1
--- serendipity_admin_entries.inc.php	20 Oct 2004 16:27:23 -0000	1.39
+++ serendipity_admin_entries.inc.php	3 Dec 2004 10:08:40 -0000	1.39.2.1
@@ -160,10 +160,18 @@
 ?>
         <tr>
             <td>
-                <input type="button" name="serendipity[prevpage]" value="&lt;&lt;&lt;" onclick="location.href='<?php echo $linkPrevious ?>'" <?php if ($offSet <= 0) echo ' disabled="disabled"' ?> />
+     	        <?php if ($offSet <= 0) { ?>
+  	            <a name="dummy_linkPrevious" class="button_disabled">&lt;&lt;&lt;</a>
+                <?php } else { ?>
+  	            <a href="<?php echo $linkPrevious ?>" class="button">&lt;&lt;&lt;</a>
+                <?php } ?>
             </td>
             <td align="right">
-                <input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" onclick="location.href='<?php echo $linkNext ?>'" <?php if ($count != $perPage) echo ' disabled="disabled"'; ?> />
+	        <?php if ($count != $perPage) { ?> 
+                    <a name="dummy_linkNext" class="button_disabled">&gt;&gt;&gt;</a> 
+                <?php } else { ?> 
+                    <a href="<?php echo $linkNext ?>" class="button">&gt;&gt;&gt;</a> 
+                <?php } ?>
             </td>
         </tr>
     </table>
@@ -340,9 +348,9 @@
 ?>
 <br />
 <div>
-    <input type="button" value="<?php echo NOT_REALLY; ?>" onclick="history.go(-1);" />
-    <span style="width: 50px;"></span>
-    <input type="button" value="<?php echo DUMP_IT; ?>" onclick="location.href='<?php echo $newLoc; ?>'" />
+   <a href="<?php echo $_SERVER["HTTP_REFERER"]; ?>" class="button"><?php echo NOT_REALLY; ?></a>
+   <span style="width: 50px;"></span>
+   <a href="<?php echo $newLoc; ?>" class="button"><?php echo DUMP_IT; ?></a>
 </div>
 <?php
         break;

[php-blog-cvs] serendipity/docs NEWS,1.21,1.22

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

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

Modified Files:
	NEWS 
Log Message:
Save HTTP referrer for a user when entering a comment.
Discussed in http://thread.gmane.org/gmane.comp.serendipity.devel/3215
(I think user-agent logging is not neccessary, can be drawn out of usual access logs...)



Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/NEWS,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- NEWS	2 Dec 2004 14:11:27 -0000	1.21
+++ NEWS	3 Dec 2004 10:07:41 -0000	1.22
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * When entering a comment, the referring URL to the blog is saved
+      (garvinhicking)
+
     * Use mbstring extension where available to correctly utilize PHPs
       string functions for multibyte chars. This is needed for UTF-8
       only languages like Chinese (garvinhicking)

[php-blog-cvs] serendipity/include functions_comments.inc.php,1.8,1.9

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

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

Modified Files:
	functions_comments.inc.php 
Log Message:
Save HTTP referrer for a user when entering a comment.
Discussed in http://thread.gmane.org/gmane.comp.serendipity.devel/3215
(I think user-agent logging is not neccessary, can be drawn out of usual access logs...)



Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- functions_comments.inc.php	2 Dec 2004 14:11:27 -0000	1.8
+++ functions_comments.inc.php	3 Dec 2004 10:07:39 -0000	1.9
@@ -317,6 +317,7 @@
         $parentid      = (isset($commentInfo['parent_id']) && is_numeric($commentInfo['parent_id'])) ? $commentInfo['parent_id'] : 0;
         $status        = isset($commentInfo['status']) ? $commentInfo['status'] : (serendipity_db_bool($ca['moderate_comments']) ? 'pending' : 'approved');
         $t             = isset($commentInfo['time']) ? $commentInfo['time'] : time();
+        $referer       = (isset($_SESSION['HTTP_REFERER']) ? serendipity_db_escape_string($_SESSION['HTTP_REFERER']) : '');
 
         if (isset($commentInfo['subscribe'])) {
             $subscribe = 'true';
@@ -324,8 +325,8 @@
             $subscribe = 'false';
         }
 
-        $query  = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, parent_id, ip, author, email, url, body, type, timestamp, title, subscribed, status)";
-        $query .= " VALUES ('$id', '$parentid', '$ip', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe', '$status')";
+        $query  = "INSERT INTO {$serendipity['dbPrefix']}comments (entry_id, parent_id, ip, author, email, url, body, type, timestamp, title, subscribed, status, referer)";
+        $query .= " VALUES ('$id', '$parentid', '$ip', '$name', '$email', '$url', '$commentsFixed', '$type', '$t', '$title', '$subscribe', '$status', '$referer')";
 
         serendipity_db_query($query);
         $cid = serendipity_db_insert_id('comments', 'id');

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.8,1.9

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

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

Modified Files:
	comments.inc.php 
Log Message:
Save HTTP referrer for a user when entering a comment.
Discussed in http://thread.gmane.org/gmane.comp.serendipity.devel/3215
(I think user-agent logging is not neccessary, can be drawn out of usual access logs...)



Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- comments.inc.php	2 Dec 2004 14:11:28 -0000	1.8
+++ comments.inc.php	3 Dec 2004 10:07:40 -0000	1.9
@@ -109,7 +109,7 @@
 }
 
 /* Searchable fields */
-$filters = array('author', 'email', 'ip', 'url', 'body');
+$filters = array('author', 'email', 'ip', 'url', 'body', 'referer');
 
 /* Compress the filters into an "AND" SQL query, and a querystring */
 foreach ( $filters as $filter ) {
@@ -216,15 +216,17 @@
         <td><input type="text" name="serendipity[filter][ip]" size="15" value="<?php echo $serendipity['GET']['filter']['ip'] ?>" /></td>
         <td><?php echo CONTENT ?>:</td>
         <td><input type="text" name="serendipity[filter][body]" size="15" value="<?php echo $serendipity['GET']['filter']['body'] ?>" /></td>
+        <td><?php echo REFERER ?>:</td>
+        <td><input type="text" name="serendipity[filter][referer]" size="15" value="<?php echo $serendipity['GET']['filter']['referer'] ?>" /></td>
+    </tr>
+    <tr>
+        <td colspan="2">&nbsp;</td>
         <td><?php echo COMMENTS_FILTER_SHOW ?>:</td>
         <td><select name="serendipity[filter][show]">
                 <option value="all"<?php if ( $serendipity['GET']['filter']['show'] == 'all' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_ALL ?></option>
                 <option value="approved"<?php if ( $serendipity['GET']['filter']['show'] == 'approved' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_APPROVED_ONLY ?></option>
                 <option value="pending"<?php if ( $serendipity['GET']['filter']['show'] == 'pending' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_NEED_APPROVAL ?></option>
             </select></td>
-    </tr>
-    <tr>
-        <td colspan="4">&nbsp;</td>
         <td><?php echo TYPE; ?></td>
         <td><select name="serendipity[filter][type]">
                 <option value="NORMAL"<?php if ($c_type == 'NORMAL') echo ' selected="selected"' ?>><?php echo COMMENTS; ?></option>
@@ -272,6 +274,9 @@
     if (empty($rs['url'])) {
         $rs['url'] = 'N/A';
     }
+    if (empty($rs['referer'])) {
+        $rs['referer'] = 'N/A';
+    }
 
     $fullBody = nl2br(strip_tags($rs['body']));
     $summary = serendipity_mb('substr', $fullBody, 0, $summaryLength);
@@ -297,9 +302,12 @@
             </tr>
             <tr>
                 <td><strong>IP</strong>: <?php echo htmlspecialchars($rs['ip']) ?></td>
-                <td><strong>URL</strong>: <?php echo htmlspecialchars($rs['url']) ?></td>
+                <td><strong><?php echo URL; ?></strong>: <?php echo htmlspecialchars($rs['url']) ?></td>
             </tr>
             <tr>
+                <td colspan="2"></td>
+                <td><strong><?php echo REFERER; ?></strong>: <?php echo htmlspecialchars($rs['referer']) ?></td>
+            <tr>
                 <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="3">
                     <div id="<?php echo $rs['id'] ?>_summary"><?php echo $summary ?></div>
                     <div id="<?php echo $rs['id'] ?>_full" style="display: none"><?php echo $fullBody ?></div>

[php-blog-cvs] serendipity index.php,1.61,1.62 serendipity_config.inc.php,1.107,1.108

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

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

Modified Files:
	index.php serendipity_config.inc.php 
Log Message:
Save HTTP referrer for a user when entering a comment.
Discussed in http://thread.gmane.org/gmane.comp.serendipity.devel/3215
(I think user-agent logging is not neccessary, can be drawn out of usual access logs...)



Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- serendipity_config.inc.php	2 Dec 2004 20:57:44 -0000	1.107
+++ serendipity_config.inc.php	3 Dec 2004 10:07:37 -0000	1.108
@@ -15,7 +15,7 @@
 
 include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
-$serendipity['version']         = '0.8-alpha4';
+$serendipity['version']         = '0.8-alpha5';
 $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
 $serendipity['production']      = true; // Setting this to 'false' will enable debugging output
 $serendipity['rewrite']         = 'none';

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- index.php	28 Nov 2004 21:07:08 -0000	1.61
+++ index.php	3 Dec 2004 10:07:37 -0000	1.62
@@ -28,6 +28,10 @@
 $track_referer = true;
 $uri = $_SERVER['REQUEST_URI'];
 
+if (isset($_SERVER['HTTP_REFERER']) && empty($_SESSION['HTTP_REFERER'])) {
+    $_SESSION['HTTP_REFERER'] = $_SERVER['HTTP_REFERER'];
+}
+
 if (preg_match(PAT_UNSUBSCRIBE, $uri, $res)) {
     if (serendipity_cancelSubscription(urldecode($res[1]), $res[2])) {
         define('DATA_UNSUBSCRIBED', urldecode($res[1]));

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.30,1.31 serendipity_lang_cs.inc.php,1.76,1.77 serendipity_lang_cz.inc.php,1.76,1.77 serendipity_lang_da.inc.php,1.96,1.97 serendipity_lang_de.inc.php,1.117,1.118 serendipity_lang_en.inc.php,1.97,1.98 serendipity_lang_es.inc.php,1.93,1.94 serendipity_lang_fr.inc.php,1.75,1.76 serendipity_lang_it.inc.php,1.16,1.17 serendipity_lang_nl.inc.php,1.52,1.53 serendipity_lang_no.inc.php,1.17,1.18 serendipity_lang_pt.inc.php,1.52,1.53 serendipity_lang_tw.inc.php,1.12,1.13

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1635/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:
Save HTTP referrer for a user when entering a comment.
Discussed in http://thread.gmane.org/gmane.comp.serendipity.devel/3215
(I think user-agent logging is not neccessary, can be drawn out of usual access logs...)



Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- serendipity_lang_cs.inc.php	2 Dec 2004 10:54:56 -0000	1.76
+++ serendipity_lang_cs.inc.php	3 Dec 2004 10:07:42 -0000	1.77
@@ -620,6 +620,7 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_lang_no.inc.php	2 Dec 2004 10:54:58 -0000	1.17
+++ serendipity_lang_no.inc.php	3 Dec 2004 10:07:43 -0000	1.18
@@ -615,5 +615,6 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 ?>

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serendipity_lang_nl.inc.php	2 Dec 2004 10:54:58 -0000	1.52
+++ serendipity_lang_nl.inc.php	3 Dec 2004 10:07:43 -0000	1.53
@@ -625,6 +625,7 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- serendipity_lang_en.inc.php	2 Dec 2004 10:54:57 -0000	1.97
+++ serendipity_lang_en.inc.php	3 Dec 2004 10:07:42 -0000	1.98
@@ -616,7 +616,8 @@
 @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');
 @define('NO_IMAGES_FOUND', 'No images found');
-@define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('PERSONAL_SETTINGS', 'Personal Settings');
+@define('REFERER', 'Referer');
 
 /* 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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_lang_tw.inc.php	2 Dec 2004 10:54:59 -0000	1.12
+++ serendipity_lang_tw.inc.php	3 Dec 2004 10:07:43 -0000	1.13
@@ -618,6 +618,7 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_lang_bg.inc.php	2 Dec 2004 10:54:56 -0000	1.30
+++ serendipity_lang_bg.inc.php	3 Dec 2004 10:07:42 -0000	1.31
@@ -602,6 +602,7 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- serendipity_lang_pt.inc.php	2 Dec 2004 10:54:58 -0000	1.52
+++ serendipity_lang_pt.inc.php	3 Dec 2004 10:07:43 -0000	1.53
@@ -621,6 +621,7 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_lang_it.inc.php	2 Dec 2004 10:54:58 -0000	1.16
+++ serendipity_lang_it.inc.php	3 Dec 2004 10:07:42 -0000	1.17
@@ -620,6 +620,7 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- serendipity_lang_da.inc.php	2 Dec 2004 10:54:56 -0000	1.96
+++ serendipity_lang_da.inc.php	3 Dec 2004 10:07:42 -0000	1.97
@@ -615,6 +615,7 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- serendipity_lang_fr.inc.php	2 Dec 2004 10:54:57 -0000	1.75
+++ serendipity_lang_fr.inc.php	3 Dec 2004 10:07:42 -0000	1.76
@@ -623,6 +623,7 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- serendipity_lang_cz.inc.php	2 Dec 2004 10:54:56 -0000	1.76
+++ serendipity_lang_cz.inc.php	3 Dec 2004 10:07:42 -0000	1.77
@@ -618,6 +618,7 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- serendipity_lang_es.inc.php	2 Dec 2004 10:54:57 -0000	1.93
+++ serendipity_lang_es.inc.php	3 Dec 2004 10:07:42 -0000	1.94
@@ -626,6 +626,7 @@
 @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
 @define('NO_IMAGES_FOUND', 'No images found'); // Translate
 @define('PERSONAL_SETTINGS', 'Personal Settings'); // Translate
+@define('REFERER', 'Referer'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- serendipity_lang_de.inc.php	2 Dec 2004 11:46:37 -0000	1.117
+++ serendipity_lang_de.inc.php	3 Dec 2004 10:07:42 -0000	1.118
@@ -10,7 +10,7 @@
 ##########################################################################
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'german, de_DE, de, de_DE.ISO8859-1, de_DE@euro');
+@define('DATE_LOCALES', 'german, de_DE, de, de_DE.ISO-8859-1, de_DE@euro');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'de');
@@ -617,6 +617,7 @@
 @define('INSTALL_DBPERSISTENT_DESC', 'Aktiviert die nutzung einer persistenten Datenbankverbindung. Mehr dazu in der <a href="http://php.net/manual/features.persistent-connections.php" target="_blank">PHP-Dokumentation</a>. Üblicherweise wird diese Einstellung nicht empfohlen.');
 @define('NO_IMAGES_FOUND', 'Keine Bilder gefunden');
 @define('PERSONAL_SETTINGS', 'Eigene Einstellungen');
+@define('REFERER', 'Referer');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/sql db_update_0.8-alpha4_0.8-alpha5_mysql.sql,NONE,1.1 db_update_0.8-alpha4_0.8-alpha5_postgres.sql,NONE,1.1 db_update_0.8-alpha4_0.8-alpha5_sqlite.sql,NONE,1.1 db.sql,1.23,1.24

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

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

Modified Files:
	db.sql 
Added Files:
	db_update_0.8-alpha4_0.8-alpha5_mysql.sql 
	db_update_0.8-alpha4_0.8-alpha5_postgres.sql 
	db_update_0.8-alpha4_0.8-alpha5_sqlite.sql 
Log Message:
Save HTTP referrer for a user when entering a comment.
Discussed in http://thread.gmane.org/gmane.comp.serendipity.devel/3215
(I think user-agent logging is not neccessary, can be drawn out of usual access logs...)



--- NEW FILE: db_update_0.8-alpha4_0.8-alpha5_sqlite.sql ---
create table {PREFIX}tempcomments (
  id {AUTOINCREMENT} {PRIMARY},
  entry_id int(10) {UNSIGNED} not null default '0',
  parent_id int(10) {UNSIGNED} not null default '0',
  timestamp int(10) {UNSIGNED} default null,
  title varchar(150) default null,
  author varchar(80) default null,
  email varchar(200) default null,
  url varchar(200) default null,
  ip varchar(15) default null,
  body text,
  type varchar(100) default 'regular',
  subscribed {BOOLEAN},
  status varchar(50) not null
);

INSERT INTO {PREFIX}tempcomments (id, entry_id, parent_id, timestamp, title, author, email, url, ip, body, type, subscribed, status) SELECT id, entry_id, parent_id, timestamp, title, author, email, url, ip, body, type, subscribed, status FROM {PREFIX}comments;
DROP TABLE comments;

create table {PREFIX}comments (
  id {AUTOINCREMENT} {PRIMARY},
  entry_id int(10) {UNSIGNED} not null default '0',
  parent_id int(10) {UNSIGNED} not null default '0',
  timestamp int(10) {UNSIGNED} default null,
  title varchar(150) default null,
  author varchar(80) default null,
  email varchar(200) default null,
  url varchar(200) default null,
  ip varchar(15) default null,
  body text,
  type varchar(100) default 'regular',
  subscribed {BOOLEAN},
  status varchar(50) not null,
  referer varchar(200) default null
);

INSERT INTO {PREFIX}comments (id, entry_id, parent_id, timestamp, title, author, email, url, ip, body, type, subscribed, status) SELECT id, entry_id, parent_id, timestamp, title, author, email, url, ip, body, type, subscribed, status FROM {PREFIX}comments;
DROP TABLE tempcomments;

--- NEW FILE: db_update_0.8-alpha4_0.8-alpha5_mysql.sql ---
ALTER TABLE {PREFIX}comments ADD referer varchar(200) default null;

--- NEW FILE: db_update_0.8-alpha4_0.8-alpha5_postgres.sql ---
ALTER TABLE {PREFIX}comments ADD COLUMN referer varchar(200);
Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- db.sql	19 Nov 2004 11:06:06 -0000	1.23
+++ db.sql	3 Dec 2004 10:07:43 -0000	1.24
@@ -39,7 +39,8 @@
   body text,
   type varchar(100) default 'regular',
   subscribed {BOOLEAN},
-  status varchar(50) not null
+  status varchar(50) not null,
+  referer varchar(200) default null
 );
 
 CREATE {FULLTEXT} INDEX body_idx on {PREFIX}comments (body);

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

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

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

Modified Files:
	functions_trackbacks.inc.php 
Log Message:
commit tobias' suggestions


Index: functions_trackbacks.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_trackbacks.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- functions_trackbacks.inc.php	2 Dec 2004 10:54:55 -0000	1.5
+++ functions_trackbacks.inc.php	3 Dec 2004 09:34:51 -0000	1.6
@@ -119,14 +119,14 @@
 }
 
 function serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text) {
-    if (!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(https?:[^"]+)"@i', $res, $matches)) {
+    if (!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*["\'](https?:[^"\']+)["\']@i', $res, $matches)) {
         echo '<div>&#8226; ' . sprintf(TRACKBACK_FAILED, TRACKBACK_NOT_FOUND) . '</div>';
         return false;
     }
 
     $trackURI = trim($matches[2]);
 
-    if (preg_match('@dc:identifier\s*=\s*"(https?:[^"]+)"@i', $res, $test)) {
+    if (preg_match('@dc:identifier\s*=\s*["\'](https?:[^\'"]+)["\']@i', $res, $test)) {
         if ($loc != $test[1]) {
             echo '<div>&#8226; ' . sprintf(TRACKBACK_FAILED, TRACKBACK_URI_MISMATCH) . '</div>';
             return false;

[php-blog-cvs] serendipity/include/admin/importers wordpress.inc.php,1.5,1.6

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

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

Modified Files:
	wordpress.inc.php 
Log Message:
s/COULDNT_COULDNT/COULDNT/, should now properly honour the WP preference for allowing comments.

Index: wordpress.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/wordpress.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wordpress.inc.php	2 Dec 2004 10:54:56 -0000	1.5
+++ wordpress.inc.php	3 Dec 2004 04:41:32 -0000	1.6
@@ -97,7 +97,7 @@
         /* Users */
         $res = @mysql_query("SELECT ID, user_login, user_pass, user_email, user_level FROM {$this->data['prefix']}users;", $wpdb);
         if ( !$res ) {
-            return sprintf(COULDNT_COULDNT_SELECT_USER_INFO, mysql_error($wpdb));
+            return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($wpdb));
         }
 
         for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
@@ -172,7 +172,7 @@
 
             $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',
+                           'allow_comments' => ($entries[$x]['comment_status '] == 'open' ) ? 'true' : 'false',
                            'timestamp' => strtotime($entries[$x]['post_date']),
                            'body' => strtr($entries[$x]['post_content'], $trans_table));
 

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.8,1.9 lang.inc.php,1.4,1.5

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

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

Modified Files:
	functions_installer.inc.php lang.inc.php 
Log Message:
- Convert old .tpl files into plain and valid .php files
- Use native PHP array to store configuration templates
- Add flag called "nosave" which will cause the data not to be saved in the database (useful for db vars, leaves a very clean db table)
- Add flag called "hideValue" which will not print the value of the var to the user (for passwords)
- Add flag called "local" which will not save the variable in the database, but only when the var is being saved in the configuration

- Fix bug with autolang (someone misspelled $serendipity, bad bad)
- Convert list of languages to a real array, which is sexy - move it to serendipity_config.inc.php

Tested with installer and config saving.

Please test - any breakage will be fixed ASAP - but please don't commit anything without pinging me.

TODO: Make a function to parse/obey the configuration flags, so we don't have to maintain it 3 places. Will do tomorrow.

NOTE: Do not add any logic to config files, or I will personally hunt you down.


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- functions_installer.inc.php	30 Nov 2004 20:30:06 -0000	1.8
+++ functions_installer.inc.php	2 Dec 2004 20:57:44 -0000	1.9
@@ -140,106 +140,33 @@
     }
 }
 
-function serendipity_replaceEmbeddedConfigVars ($s) {
-    return str_replace(
-                  array(
-                    '[USERLEVEL_ADMIN]',
-                    '[USERLEVEL_CHIEF]',
-                    '[USERLEVEL_EDITOR]',
-                    '[LANGUAGE_LIST]'
-                  ),
-
-                  array(
-                    USERLEVEL_ADMIN,
-                    USERLEVEL_CHIEF,
-                    USERLEVEL_EDITOR,
-                    LANGUAGE_LIST
-                  ), $s);
-}
-
-function serendipity_parseTemplate($n, $raw = false, $prepend_var = null, $get_defaults = true) {
+function serendipity_parseTemplate($filename, $userlevel=null) {
     global $serendipity;
 
-    if (is_array($prepend_var)) {
-        $config = $configRaw = &$prepend_var;
-        $usertemplate = true;
-    } else {
-        $config = $configRaw = array();
-        $usertemplate = false;
+    if ( is_null($userlevel) ) {
+        $userlevel = $serendipity['serendipityUserlevel'];
     }
 
-    $t = file($n, 1);
-
-    $maxt = count($t);
-
-    for ($x=0; $x<$maxt; $x++) {
-        $l = $t[$x];
-        $l = trim($l);
-
-        if ($l != '') {
-            switch ($l[0]) {
-
-                // New Configure section
-                case '/':
-                    if ($l[1] == '/') {
-                        $current = @constant(trim(substr($l, 2)));
-                        $config['categories'][$current] = array();
-                    }
-                    break;
-
-                case '#':
-                    $config['descriptions'][$current] = @constant(trim(substr($l, 1)));
-                    break;
-
-                // A configure option
-                case '$':
-                    // Grep out the name, type and default
-                    preg_match('#\{([^|]+\|[^|]+\|([^}]+)?)\}[^/]+/{2}(.+)#msi', $l, $match);
-
-                    // Make vars containing the elements in the | list
-                    list($constant, $name, $type, $distdefault, $permission, $flags) = explode('|', $match[1]);
+    $config = include($filename);
 
-                    // Only show directives which are destined for this user. On installation, show everyting.
-                    if (IS_installed === false || $serendipity['serendipityUserlevel'] >= $permission) {
-                        $cdef        = ($get_defaults ? serendipity_query_default($name, $distdefault, $usertemplate, $type) : '');
-                        $distDefault = serendipity_replaceEmbeddedConfigvars($distdefault);
+    foreach ( $config as $n => $category ) {
+        foreach ( $category['items'] as $i => $item ) {
+            $items = &$config[$n]['items'][$i];
+            if ( !isset($items['userlevel']) || !is_numeric($items['userlevel']) ) {
+                $items['userlevel'] = USERLEVEL_ADMIN;
+            }
 
-                        /* Expand 'list' type, to a normal assocaitive array */
-                        if ($type == 'list' && preg_match_all("/([^\=]+)\=\>([^\,]+)\,?/i", $distDefault, $res)) {
-                            $distDefault = array();
-                            foreach ( $res[1] as $k => $v ) {
-                                $distDefault[$res[1][$k]] = $res[2][$k];
-                            }
-                        }
-                        $config['categories'][$current][] = $configRaw[] = array(
-                                                'longname'    => @constant($constant),
-                                                'name'        => $name,
-                                                'type'        => $type,
-                                                'default'     => $cdef,
-                                                'distdefault' => $distDefault,
-                                                'desc'        => serendipity_replaceEmbeddedConfigVars(@constant(trim($match[3]))),
-                                                'valid_for'   => $permission,
-                                                'flags'       => explode(',', $flags)
-                                                );
-                    }
-                    break;
+            if ( !isset($items['flags']) || !is_array($items['flags']) ) {
+                $items['flags'] = array();
             }
-        }
-    }
 
-    if ($raw) {
-        return $configRaw;
-    } else {
-        // Cleanup phase. Remove categories for which no variables can be defined
-        if (isset($config['categories']) && is_array($config['categories'])) {
-            foreach($config['categories'] AS $item => $itemarray) {
-                if (count($itemarray) < 1) {
-                    unset($config['categories'][$item]);
-                }
+            if ( $items['userlevel'] < $userlevel ) {
+                unset($items);
             }
         }
-        return $config;
     }
+
+    return $config;
 }
 
 function serendipity_guessInput($type, $name, $value='', $default='') {
@@ -277,9 +204,8 @@
     }
 }
 
-function serendipity_printConfigTemplate($t, $from = false, $minimum = false, $folding = true) {
+function serendipity_printConfigTemplate($config, $from = false, $noForm = false, $folding = true) {
     global $serendipity;
-
     if (!isset($serendipity['XHTML11'])) {
         $serendipity['XHTML11'] = FALSE;
     }
@@ -323,7 +249,7 @@
 </script>
 
 <?php
-    if (!$minimum) {
+    if (!$noForm) {
 ?>
 <form action="?" method="POST">
     <div>
@@ -331,23 +257,23 @@
         <input type="hidden" name="installAction" value="check" />
         <br />
 <?php   }
-    if (sizeof($t['categories']) > 1) { ?>
+    if (sizeof($config) > 1) { ?>
         <div align="right">
-            <a style="border:0; text-decoration: none" href="#" onClick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
+            <a style="border:0; text-decoration: none" href="#" onClick="showConfigAll(<?php echo sizeof($config); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
         </div>
 <?php
     }
     $el_count = 0;
-    foreach ($t['categories'] as $key => $value) {
+    foreach ($config as $category) {
         $el_count++;
 ?>
         <table width="100%" cellspacing="2">
 <?php
-        if (sizeof($t['categories']) > 1) {
+        if (sizeof($config) > 1) {
 ?>
             <tr>
                 <th align="left" colspan="2" style="padding-left: 15px;">
-                    <a style="border:0; text-decoration: none" href="#" onClick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<?php echo $key; ?></a></th>
+                    <a style="border:0; text-decoration: none" href="#" onClick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<?php echo $category['title']; ?></a></th>
             </tr>
 <?php   } ?>
             <tr>
@@ -355,37 +281,37 @@
                     <table width="100%" cellspacing="0" cellpadding="3" style="<?php echo ($folding === true ? 'display: none;' : ''); ?>" id="el<?php echo $el_count; ?>">
                         <tr>
                             <td style="padding-left: 20px;" colspan="2">
-                                <?php echo $t['descriptions'][$key] ?>
+                                <?php echo $category['description'] ?>
                             </td>
                         </tr>
 
 <?php
-        for ($x=0; $x<count($value); $x++) {
+        foreach ( $category['items'] as $item ) {
 
-            /* Check for installOnly flag */
-            if ( in_array('installOnly', $value[$x]['flags']) && IS_installed === true ) {
-                continue;
-            }
+            $value = $from[$item['var']];
 
+            /* Calculate value if we are not installed, how clever :) */
+            if ( IS_installed === false ) {
+                $value = serendipity_query_default($item['var'], $item['default']);
+            }
 
-            /* If we have a valuelist, then use the value from there */
-            if (@is_array($from)) {
-                $value[$x]['value'] = $from[$value[$x]['name']];
+            /* Check for installOnly flag */
+            if ( in_array('installOnly', $item['flags']) && IS_installed === true ) {
+                continue;
             }
 
-            /* If the value is never assigned in the valuelist, then use our default value */
-            if (!isset($from[$value[$x]['name']])) {
-                $value[$x]['value'] = $value[$x]['default'];
+            if ( in_array('hideValue', $item['flags']) ) {
+                $value = '';
             }
 ?>
                         <tr>
                             <td style="border-bottom: 1px #000000 solid" align="left" valign="top" width="75%">
-                                <strong><?php echo $value[$x]['longname']; ?></strong>
+                                <strong><?php echo $item['title']; ?></strong>
                                 <br />
-                                <span style="color: #5E7A94; font-size: 8pt;"><?php echo '(' . $value[$x]['type'] . ') ' . $value[$x]['desc']; ?></span>
+                                <span style="color: #5E7A94; font-size: 8pt;"><?php echo $item['description']; ?></span>
                             </td>
                             <td style="border-bottom: 1px #000000 solid; font-size: 8pt" align="left" valign="middle" width="25%">
-                                <?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><?php echo serendipity_guessInput($value[$x]['type'], $value[$x]['name'], $value[$x]['value'], $value[$x]['distdefault']); ?><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?>
+                                <?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><?php echo serendipity_guessInput($item['type'], $item['var'], $value, $item['default']); ?><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?>
                             </td>
                         </tr>
 <?php
@@ -398,7 +324,7 @@
 <?php
     }
 
-    if (!$minimum) {
+    if (!$noForm) {
 ?>
         <input type="submit" value="<?php echo CHECK_N_SAVE; ?>" />
     </div>
@@ -702,18 +628,28 @@
     global $serendipity, $umask;
 
     // Save all basic config variables to the database
-    $p = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE, true);
+    $config = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
 
     if (isset($_POST['sqlitedbName']) && !empty($_POST['sqlitedbName'])) {
         $_POST['dbName'] = $_POST['sqlitedbName'];
     }
 
-    foreach($p as $key => $entry) {
-        serendipity_set_config_var(
-          $entry['name'],
-          $_POST[$entry['name']],
-          (($entry['range'] == 'global' || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN || IS_installed === false) ? 0 : $serendipity['authorid'])
-        );
+    foreach($config as $category) {
+        foreach ( $category['items'] as $item ) {
+
+            /* Don't save trash */
+            if ( in_array('local', $item['flags']) || in_array('nosave', $item['flags']) ) {
+                continue;
+            }
+
+            if ( $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN || IS_installed === false ) {
+                $authorid = 0;
+            } else {
+                $authorid = $serendipity['authorid'];
+            }
+
+            serendipity_set_config_var($item['var'], $_POST[$item['var']], $authorid);
+        }
     }
 
     if (IS_installed === false || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) {

Index: lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/lang.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lang.inc.php	2 Dec 2004 14:11:28 -0000	1.4
+++ lang.inc.php	2 Dec 2004 20:57:44 -0000	1.5
@@ -1,7 +1,5 @@
 <?php # $Id$
 
-if (!defined('LANGUAGE_LIST')) define('LANGUAGE_LIST', 'en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech (Win-1250),cz=>Czech (ISO-8859-2),nl=>Dutch,pt=>Portuguese Brazilian,bg=>Bulgarian,no=>Norwegian,it=>Italian,tw=>Traditional Chinese');
-
 if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
     // Try and include preferred language from the configurated setting
     if (@include(S9Y_INCLUDE_PATH . 'lang/serendipity_lang_'. $serendipity['lang'] .'.inc.php') ) {
@@ -10,8 +8,7 @@
     } elseif (IS_installed === false || (defined('IS_up2date') && IS_up2date === false)) {   /* -- Auto-Guess -- */
         // If no config file is loaded, language includes are not available.
         // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
-        $serendipty['autolang'] = 'en';
-        $supported_languages = array('en', 'da', 'de', 'es', 'cs', 'cz', 'fr', 'nl', 'pt', 'bg', 'no', 'it', 'tw');
+        $supported_languages = array_keys($serendipity['languages']);
         $possible_languages = explode(',', (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''));
         if (is_array($possible_languages)) {
             foreach($possible_languages as $index => $lang) {
@@ -72,4 +69,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>