php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/include functions_images.inc.php,1.35,1.36

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
Patch from foosel: function does not exist for PHP < 4.3.2. Thanks!


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- functions_images.inc.php	25 Feb 2005 14:36:29 -0000	1.35
+++ functions_images.inc.php	28 Feb 2005 14:17:37 -0000	1.36
@@ -755,8 +755,10 @@
     $out = imagecreatetruecolor($newwidth, $newheight);
 
     /* Attempt to copy transparency information, this really only works for PNG */
-    imagealphablending($out, false);
-    imagesavealpha($out, true);
+    if (function_exists('imagesavealpha')) {
+        imagealphablending($out, false);
+        imagesavealpha($out, true);
+    }
 
     imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
     $func['save']($out, $outfilename, 100);

[php-blog-cvs] serendipity/plugins/serendipity_plugin_remoterss serendipity_plugin_remoterss.php,1.18,1.19

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

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

Modified Files:
	serendipity_plugin_remoterss.php 
Log Message:
Use PEAR request on allow_url_fopen disabled hosts


Index: serendipity_plugin_remoterss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_plugin_remoterss.php	15 Feb 2005 11:25:28 -0000	1.18
+++ serendipity_plugin_remoterss.php	28 Feb 2005 14:11:57 -0000	1.19
@@ -94,7 +94,15 @@
     }
 
     function GetXMLTree($file) {
-        $data = file_get_contents($file);
+        require_once S9Y_INCLUDE_PATH . 'bundled-libs/HTTP/Request.php';
+        $req = &new HTTP_Request($file);
+
+        if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') {
+            $data = file_get_contents($file);
+        } else {
+            // Fetch file
+            $data = $req->getResponseBody();
+        }
 
         // Global replacements
         // by: wa...@wh... - trim space around tags not within

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.161,1.162

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

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
one more german locale for openbsd


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- serendipity_lang_de.inc.php	24 Feb 2005 20:14:25 -0000	1.161
+++ serendipity_lang_de.inc.php	28 Feb 2005 13:45:40 -0000	1.162
@@ -4,7 +4,7 @@
 # Translation (c) Jannis Hermanns, Garvin Hicking and others
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'german, de_DE, de, de_DE.ISO-8859-1, de_DE@euro');
+@define('DATE_LOCALES', 'german, de_DE, de, de_DE.ISO-8859-1, de_DE@euro, de_DE.ISO8859-1');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'de');

[php-blog-cvs] serendipity/plugins/serendipity_event_bbcode serendipity_event_bbcode.php,1.17,1.18

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

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

Modified Files:
	serendipity_event_bbcode.php 
Log Message:
my fault, I'm used to typing google.de :-D


Index: serendipity_event_bbcode.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode/serendipity_event_bbcode.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_event_bbcode.php	27 Feb 2005 14:23:25 -0000	1.17
+++ serendipity_event_bbcode.php	27 Feb 2005 16:05:15 -0000	1.18
@@ -82,7 +82,7 @@
           '/(?<!\\\\)\[email(?::\w+)?=(.*?)\](.*?)\[\/email(?::\w+)?\]/si'   => "<a href=\"mailto:\\1\" class=\"bb-email\">\\2</a>",
 
           // [url]
-          '/(?<!\\\\)\[(google|search)\](.*?)\[\/(google|search)\]/si'       => "<a href=\"http://www.google.de/search?q=\\2\" target=\"_blank\" class=\"bb-url\">\\2</a>",
+          '/(?<!\\\\)\[(google|search)\](.*?)\[\/(google|search)\]/si'       => "<a href=\"http://www.google.com/search?q=\\2\" target=\"_blank\" class=\"bb-url\">\\2</a>",
           '/(?<!\\\\)\[url(?::\w+)?\]www\.(.*?)\[\/url(?::\w+)?\]/si'        => "<a href=\"http://www.\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
           '/(?<!\\\\)\[url(?::\w+)?\](.*?)\[\/url(?::\w+)?\]/si'             => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
           '/(?<!\\\\)\[url(?::\w+)?=(.*?)?\](.*?)\[\/url(?::\w+)?\]/si'      => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\2</a>",

[php-blog-cvs] serendipity/include/admin installer.inc.php,1.25,1.26 upgrader.inc.php,1.15,1.16

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

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

Modified Files:
	installer.inc.php upgrader.inc.php 
Log Message:
1. Move serendipity_ini_bool / ini_bytesize to a central function place.
   Upgrader and others may need this, so this does not belong to the
   Admin page.

2. Make upgrader check at least the file permissions. Future unification
   with the diagnosis for the installer is recommended, I am waiting
   for a proposal from Tom as he disliked mine. :)
   
3. Put in template notices. Upgrading users need to know about this
   bc-breaking change of the author realname in -alpha12.
   



Index: upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/upgrader.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- upgrader.inc.php	9 Feb 2005 19:55:21 -0000	1.15
+++ upgrader.inc.php	27 Feb 2005 14:49:59 -0000	1.16
@@ -4,6 +4,27 @@
 
 require_once(S9Y_INCLUDE_PATH . 'include/functions_installer.inc.php');
 
+define('S9Y_U_ERROR', -1);
+define('S9Y_U_WARNING', 0);
+define('S9Y_U_SUCCESS', 1);
+
+function serendipity_upgraderResultDiagnose($result, $s) {
+    global $errorCount;
+
+    if ( $result === S9Y_U_SUCCESS ) {
+        return '<span style="color: green; font-weight: bold">'. $s .'</span>';
+    }
+
+    if ( $result === S9Y_U_WARNING ) {
+        return '<span style="color: orange; font-weight: bold">'. $s .'</span>';
+    }
+
+    if ( $result === S9Y_U_ERROR ) {
+        $errorCount++;
+        return '<span style="color: red; font-weight: bold">'. $s .'</span>';
+    }
+}
+
 // Setting this value to 'FALSE' is recommended only for SHARED BLOG INSTALLATIONS. This enforces all shared blogs with a common
 // codebase to only allow upgrading, no bypassing and thus causing instabilities.
 // This variable can also be set as $serendipity['UpgraderShowAbort'] inside serendipity_config_local.inc.php to prevent
@@ -126,6 +147,16 @@
                      'function'  => 'serendipity_installFiles',
                      'title'     => 'Update of .htaccess file',
                      'desc'      => 'In order to implement URL rewrite improvement, changes were made to the .htaccess file, you need to regenerate it'),
+
+               array('version'   => '0.8-alpha12',
+                     'type'      => 'TEMPLATE_NOTICE',
+                     'function'  => '',
+                     'title'     => '<b>TEMPLATE_NOTICE:</b> The template file "entries.tpl" has changed.',
+                     'desc'      => 'Authors can now have longer real names instead of only their loginnames. Those new fields need to be displayed in your Template, if you manually created one. Following variables were changes:
+                                     <b>{$entry.username}</b> =&gt; <b>{$entry.author}</b>
+                                     <b>{$entry.link_username}</b> =&gt; <b>{$entry.link_author}</b>
+                                     Those variables have been replaced in all bundled templates and those in our additional_themes repository.
+                                     ' . serendipity_upgraderResultDiagnose(S9Y_U_WARNING, 'Manual user interaction is required! This can NOT be done automatically!')),
 );
 
 /* Fetch SQL files which needs to be run */
@@ -175,7 +206,7 @@
 
     /* Call functions */
     foreach ($tasks as $task) {
-        if (version_compare($serendipity['versionInstalled'], $task['version'], '<') ) {
+        if (!empty($task['function']) && version_compare($serendipity['versionInstalled'], $task['version'], '<') ) {
             if (is_callable($task['function'])) {
                 echo sprintf('Calling %s ...<br />', (is_array($task['function']) ? $task['function'][0] . '::'. $task['function'][1] : $task['function']));;
 
@@ -230,48 +261,113 @@
     $_SESSION['serendipityAuthedUser'] = false;
     @session_destroy();
 } else {
-    echo SERENDIPITY_UPGRADER_WELCOME . '<br />';
+    echo '<h2>' . SERENDIPITY_UPGRADER_WELCOME . '</h2>';
     printf(SERENDIPITY_UPGRADER_PURPOSE . '<br />', $serendipity['versionInstalled']);
-    printf(SERENDIPITY_UPGRADER_WHY, $serendipity['version']);
+    printf(SERENDIPITY_UPGRADER_WHY . '.', $serendipity['version']);
+    echo '<br />' . FIRST_WE_TAKE_A_LOOK  . '.';
+?>
+<br /><br />
+<div align="center"><?php printf(ERRORS_ARE_DISPLAYED_IN, serendipity_upgraderResultDiagnose(S9Y_U_ERROR, RED), serendipity_upgraderResultDiagnose(S9Y_U_WARNING, YELLOW), serendipity_upgraderResultDiagnose(S9Y_U_SUCCESS, GREEN)); ?>.<br />
+<?php
+    $errorCount = 0;
+    $showWritableNote = false;
+    $basedir = $serendipity['serendipityPath'];
+?>
+<div align="center">
+<table class="serendipity_admin_list_item serendipity_admin_list_item_even" width="90%" align="center">
+    <tr>
+        <td colspan="2" style="font-weight: bold"><?php echo PERMISSIONS ?></td>
+    </tr>
+    <tr>
+        <td><?php echo $basedir ?></td>
+        <td width="200"><?php
+            if ( is_writable($basedir) ) {
+                echo serendipity_upgraderResultDiagnose(S9Y_U_SUCCESS, WRITABLE);
+            } else {
+                echo serendipity_upgraderResultDiagnose(S9Y_U_ERROR, NOT_WRITABLE);
+                $showWritableNote = true;
+            }
+     ?></td>
+    </tr>
+    <tr>
+        <td><?php echo $basedir . PATH_SMARTY_COMPILE?></td>
+        <td width="200"><?php
+            if ( is_writable($basedir . PATH_SMARTY_COMPILE) ) {
+                echo serendipity_upgraderResultDiagnose(S9Y_U_SUCCESS, WRITABLE);
+            } else {
+                echo serendipity_upgraderResultDiagnose(S9Y_U_ERROR, NOT_WRITABLE);
+                $showWritableNote = true;
+            }
+     ?></td>
+    </tr>
+<?php if (is_dir($basedir . $serendipity['uploadHTTPPath'])) { ?>
+    <tr>
+        <td><?php echo $basedir . $serendipity['uploadHTTPPath']; ?></td>
+        <td width="200"><?php
+            if (is_writable($basedir . $serendipity['uploadHTTPPath'])) {
+                echo serendipity_upgraderResultDiagnose(S9Y_U_SUCCESS, WRITABLE);
+            } else {
+                echo serendipity_upgraderResultDiagnose(S9Y_U_ERROR, NOT_WRITABLE);
+                $showWritableNote = true;
+            }
+     ?></td>
+    </tr>
+<?php } ?>
+</table>
+</div>
+<?php if ($showWritableNote === true) { ?>
+    <div class="serendipityAdminMsgNote"><?php echo sprintf(PROBLEM_PERMISSIONS_HOWTO, 'chmod 0777') ?></div>
+<?php }
 
-    if (sizeof($sqlfiles) > 0) {
+    if ($errorCount > 0) { ?>
+    <div align="center">
+        <div class="serendipityAdminMsgError"><?php echo PROBLEM_DIAGNOSTIC ?></div>
+        <h2><a href="serendipity_admin.php"><?php echo RECHECK_INSTALLATION ?></a></h2>
+    </div>
+<?php }
 ?>
-<br />
-<h3><?php printf(SERENDIPITY_UPGRADER_DATABASE_UPDATES, $serendipity['dbType']) ?>:</h3>
+</div>
+
+<?php
+    if ($errorCount < 1) {
+        if (sizeof($sqlfiles) > 0) { ?>
+    <br />
+    <h3><?php printf(SERENDIPITY_UPGRADER_DATABASE_UPDATES, $serendipity['dbType']) ?>:</h3>
 <?php echo SERENDIPITY_UPGRADER_FOUND_SQL_FILES ?>:<br />
 <?php
-        foreach ($sqlfiles as $sqlfile) {
-            echo '<div style="padding-left: 5px"><strong>'. $sqlfile .'</strong></div>';
+            foreach ($sqlfiles as $sqlfile) {
+                echo '<div style="padding-left: 5px"><strong>'. $sqlfile .'</strong></div>';
+            }
         }
-    }
 ?>
-<br />
+    <br />
 
-<h3><?php echo SERENDIPITY_UPGRADER_VERSION_SPECIFIC ?>:</h3>
+    <h3><?php echo SERENDIPITY_UPGRADER_VERSION_SPECIFIC ?>:</h3>
 <?php
-    $taskCount = 0;
+        $taskCount = 0;
 
-    foreach ( $tasks as $task ) {
-        if (version_compare($serendipity['versionInstalled'], $task['version'], '<'))  {
-            echo '<div><strong>'. $task['version'] .' - '. $task['title'] .'</strong></div>';
-            echo '<div style="padding-left: 5px">'. nl2br($task['desc']) .'</div><br />';
-            $taskCount++;
+        foreach ( $tasks as $task ) {
+            if (version_compare($serendipity['versionInstalled'], $task['version'], '<'))  {
+                echo '<div><strong>'. $task['version'] .' - '. $task['title'] .'</strong></div>';
+                echo '<div style="padding-left: 5px">'. nl2br($task['desc']) .'</div><br />';
+                $taskCount++;
+            }
         }
-    }
 
-    if ($taskCount == 0) {
-        echo SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC;
-    }
+        if ($taskCount == 0) {
+            echo SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC;
+        }
 ?>
 
-<br /><br />
-<hr noshade="noshade">
+    <br /><br />
+    <hr noshade="noshade">
 <?php if ($taskCount > 0 || sizeof($sqlfiles) > 0) { ?>
-    <strong><?php echo SERENDIPITY_UPGRADER_PROCEED_QUESTION ?></strong>
-    <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_DOIT ?>" onclick="location.href='<?php echo $upgradeLoc ?>'" class="serendipityPrettyButton"> <?php if ($showAbort) { ?><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_ABORT ?>" onclick="location.href='<?php echo $abortLoc ?>'" class="serendipityPrettyButton"> <?php } ?>
+        <strong><?php echo SERENDIPITY_UPGRADER_PROCEED_QUESTION ?></strong>
+        <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_DOIT ?>" onclick="location.href='<?php echo $upgradeLoc ?>'" class="serendipityPrettyButton"> <?php if ($showAbort) { ?><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_ABORT ?>" onclick="location.href='<?php echo $abortLoc ?>'" class="serendipityPrettyButton"> <?php } ?>
 <?php } else { ?>
-    <strong><?php echo SERENDIPITY_UPGRADER_NO_UPGRADES ?></strong>
-    <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_CONSIDER_DONE ?>" onclick="location.href='<?php echo $abortLoc ?>'" class="serendipityPrettyButton">
+        <strong><?php echo SERENDIPITY_UPGRADER_NO_UPGRADES ?></strong>
+        <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_CONSIDER_DONE ?>" onclick="location.href='<?php echo $abortLoc ?>'" class="serendipityPrettyButton">
 <?php }
+    }
 }
 ?>

Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- installer.inc.php	24 Feb 2005 20:14:23 -0000	1.25
+++ installer.inc.php	27 Feb 2005 14:49:59 -0000	1.26
@@ -25,28 +25,6 @@
     }
 }
 
-function serendipity_ini_bool($var) {
-    return ($var === 'on' || $var == '1');
-}
-
-function serendipity_ini_bytesize($val) {
-    if ( $val == '' )
-        return 0;
-
-    switch(substr($val, -1)) {
-        case 'k':
-        case 'K':
-            return (int) $val * 1024;
-            break;
-        case 'm':
-        case 'M':
-            return (int) $val * 1048576;
-            break;
-        default:
-            return $val;
-   }
-}
-
 /* From configuration to install */
 if ( sizeof($_POST) > 1 && $serendipity['GET']['step'] == 3 ) {
     /* One problem, if the user chose to do an easy install, not all config vars has been transfered
@@ -86,7 +64,7 @@
 
 
 <?php $errorCount = 0 ?>
-<div>
+<div align="center">
 <table class="serendipity_admin_list_item serendipity_admin_list_item_even" width="90%" align="center">
     <tr>
         <td colspan="2" style="font-weight: bold"><?php echo PHP_INSTALLATION ?></td>

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.39,1.40

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
1. Move serendipity_ini_bool / ini_bytesize to a central function place.
   Upgrader and others may need this, so this does not belong to the
   Admin page.

2. Make upgrader check at least the file permissions. Future unification
   with the diagnosis for the installer is recommended, I am waiting
   for a proposal from Tom as he disliked mine. :)
   
3. Put in template notices. Upgrading users need to know about this
   bc-breaking change of the author realname in -alpha12.
   



Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- functions_installer.inc.php	22 Feb 2005 10:10:03 -0000	1.39
+++ functions_installer.inc.php	27 Feb 2005 14:49:58 -0000	1.40
@@ -2,6 +2,29 @@
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
+
+function serendipity_ini_bool($var) {
+    return ($var === 'on' || $var == '1');
+}
+
+function serendipity_ini_bytesize($val) {
+    if ( $val == '' )
+        return 0;
+
+    switch(substr($val, -1)) {
+        case 'k':
+        case 'K':
+            return (int) $val * 1024;
+            break;
+        case 'm':
+        case 'M':
+            return (int) $val * 1048576;
+            break;
+        default:
+            return $val;
+   }
+}
+
 function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $dbPersistent, $privateVariables = null) {
     global $serendipity;
     umask(0000);
@@ -219,8 +242,8 @@
 
                   array(
                     date('H:i')
-                  ), 
-                  
+                  ),
+
                   $s);
 }
 
@@ -488,7 +511,7 @@
         // and have access to our's. So we randomize the SQLite dbname.
         $_POST['sqlitedbName'] = $_POST['dbName'] . '_' . md5(time());
     }
-    
+
     if (empty($_POST['dbPrefix']) && empty($serendipity['dbPrefix'])) {
         $errs[] = sprintf(EMPTY_SETTING, INSTALL_DBPREFIX);
     }
@@ -689,7 +712,7 @@
             if ( !serendipity_checkConfigItemFlags($item, 'configuration') ) {
                 continue;
             }
-            
+
             if (!isset($item['userlevel'])) {
                 $item['userlevel'] = USERLEVEL_ADMIN;
             }
@@ -699,7 +722,7 @@
             } else {
                 $authorid = $serendipity['authorid'];
             }
-            
+
             serendipity_set_config_var($item['var'], $_POST[$item['var']], $authorid);
         }
     }

[php-blog-cvs] serendipity/plugins/serendipity_event_bbcode serendipity_event_bbcode.php,1.16,1.17

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

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

Modified Files:
	serendipity_event_bbcode.php 
Log Message:
right backref


Index: serendipity_event_bbcode.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode/serendipity_event_bbcode.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_event_bbcode.php	27 Feb 2005 12:07:22 -0000	1.16
+++ serendipity_event_bbcode.php	27 Feb 2005 14:23:25 -0000	1.17
@@ -82,7 +82,7 @@
           '/(?<!\\\\)\[email(?::\w+)?=(.*?)\](.*?)\[\/email(?::\w+)?\]/si'   => "<a href=\"mailto:\\1\" class=\"bb-email\">\\2</a>",
 
           // [url]
-          '/(?<!\\\\)\[(google|search)\](.*?)\[\/(google|search)\]/si'       => "<a href=\"http://www.google.de/search?q=\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
+          '/(?<!\\\\)\[(google|search)\](.*?)\[\/(google|search)\]/si'       => "<a href=\"http://www.google.de/search?q=\\2\" target=\"_blank\" class=\"bb-url\">\\2</a>",
           '/(?<!\\\\)\[url(?::\w+)?\]www\.(.*?)\[\/url(?::\w+)?\]/si'        => "<a href=\"http://www.\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
           '/(?<!\\\\)\[url(?::\w+)?\](.*?)\[\/url(?::\w+)?\]/si'             => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
           '/(?<!\\\\)\[url(?::\w+)?=(.*?)?\](.*?)\[\/url(?::\w+)?\]/si'      => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\2</a>",

[php-blog-cvs] serendipity/plugins/serendipity_event_bbcode serendipity_event_bbcode.php,1.15,1.16

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

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

Modified Files:
	serendipity_event_bbcode.php 
Log Message:
add [google][/google]


Index: serendipity_event_bbcode.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_bbcode/serendipity_event_bbcode.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_event_bbcode.php	9 Feb 2005 16:26:05 -0000	1.15
+++ serendipity_event_bbcode.php	27 Feb 2005 12:07:22 -0000	1.16
@@ -82,6 +82,7 @@
           '/(?<!\\\\)\[email(?::\w+)?=(.*?)\](.*?)\[\/email(?::\w+)?\]/si'   => "<a href=\"mailto:\\1\" class=\"bb-email\">\\2</a>",
 
           // [url]
+          '/(?<!\\\\)\[(google|search)\](.*?)\[\/(google|search)\]/si'       => "<a href=\"http://www.google.de/search?q=\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
           '/(?<!\\\\)\[url(?::\w+)?\]www\.(.*?)\[\/url(?::\w+)?\]/si'        => "<a href=\"http://www.\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
           '/(?<!\\\\)\[url(?::\w+)?\](.*?)\[\/url(?::\w+)?\]/si'             => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\1</a>",
           '/(?<!\\\\)\[url(?::\w+)?=(.*?)?\](.*?)\[\/url(?::\w+)?\]/si'      => "<a href=\"\\1\" target=\"_blank\" class=\"bb-url\">\\2</a>",

[php-blog-cvs] serendipity/include genpage.inc.php,1.10,1.11 functions_entries.inc.php,1.61,1.62

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

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

Modified Files:
	genpage.inc.php functions_entries.inc.php 
Log Message:
magical hook for custom permalinks


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- functions_entries.inc.php	25 Feb 2005 14:36:29 -0000	1.61
+++ functions_entries.inc.php	25 Feb 2005 19:27:41 -0000	1.62
@@ -323,6 +323,7 @@
                             e.$key LIKE '" . serendipity_db_escape_string($val) . "'
                             {$cond['and']}
                      LIMIT  1";
+
     $ret = serendipity_db_query($querystring, true);
     if (is_array($ret)) {
         $ret['categories'] = serendipity_fetchEntryCategories($ret['id']);

Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/genpage.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- genpage.inc.php	26 Jan 2005 14:14:03 -0000	1.10
+++ genpage.inc.php	25 Feb 2005 19:27:41 -0000	1.11
@@ -6,6 +6,7 @@
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php');
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_internal.inc.php');
 
+serendipity_plugin_api::hook_event('genpage', $uri);
 serendipity_smarty_init();
 
 // For advanced usage, we allow template authors to create a file 'config.inc.php' where they can

[php-blog-cvs] serendipity/plugins/serendipity_event_blogpdf serendipity_event_blogpdf.php,1.19,1.20

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

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

Modified Files:
	serendipity_event_blogpdf.php 
Log Message:
thanks tom! :)


Index: serendipity_event_blogpdf.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf/serendipity_event_blogpdf.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_event_blogpdf.php	25 Feb 2005 14:36:30 -0000	1.19
+++ serendipity_event_blogpdf.php	25 Feb 2005 15:36:36 -0000	1.20
@@ -350,7 +350,7 @@
         $entryLink = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath');
         serendipity_plugin_api::hook_event('frontend_display', $entry, array('no_scramble' => true));
 
-        $posted_by = ' ' . POSTED_BY . ' ' . htmlspecialchars($entry['realname']);
+        $posted_by = ' ' . POSTED_BY . ' ' . htmlspecialchars($entry['author']);
         if (is_array($entry['categories']) && sizeof($entry['categories']) > 0) {
             $posted_by .= ' ' . IN . ' ';
             $cats = array();

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.60,1.61 functions_images.inc.php,1.34,1.35

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

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

Modified Files:
	functions_entries.inc.php functions_images.inc.php 
Log Message:
Fix a bit more username stuff. I am seriously afraid there's more borkage left. Please check it out thoroughly, whoever is reading this ;)


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- functions_images.inc.php	17 Feb 2005 17:05:31 -0000	1.34
+++ functions_images.inc.php	25 Feb 2005 14:36:29 -0000	1.35
@@ -25,7 +25,7 @@
         $directorysql = ' WHERE path LIKE \'' . serendipity_db_escape_string($directory) . '%\' ';
     }
 
-    $query = "SELECT i.*, a.username AS authorname FROM {$serendipity['dbPrefix']}images AS i LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a ON i.authorid = a.authorid $directorysql ORDER BY $order $ordermode $limitsql";
+    $query = "SELECT i.*, a.realname AS authorname FROM {$serendipity['dbPrefix']}images AS i LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a ON i.authorid = a.authorid $directorysql ORDER BY $order $ordermode $limitsql";
     $rs = serendipity_db_query($query, false, 'assoc');
     if (!is_array($rs)) {
         return array();

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- functions_entries.inc.php	25 Feb 2005 13:30:26 -0000	1.60
+++ functions_entries.inc.php	25 Feb 2005 14:36:29 -0000	1.61
@@ -241,6 +241,7 @@
                     $group
                     ORDER BY {$cond['orderby']}
                     $limit";
+
     $ret = serendipity_db_query($query);
 
     if (is_string($ret)) {
@@ -382,7 +383,8 @@
 
     $querystring = "SELECT
                            c.*,
-                           a.username
+                           a.username,
+                           a.realname
                       FROM {$serendipity['dbPrefix']}category AS c
            LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a
                         ON c.authorid = a.authorid $where
@@ -598,7 +600,7 @@
             $entry['link_rdf']               = serendipity_rewriteURL(PATH_FEEDS . '/ei_'. $entry['id'] .'.rdf');
             $entry['link_viewmode_threaded'] = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_THREADED;
             $entry['link_viewmode_linear']   = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_LINEAR;
-            $entry['link_author']          = serendipity_rewriteURL(PATH_AUTHORS .'/'. serendipity_makePermalink(PERM_AUTHORS, array('id' => $entry['authorid'], 'title' => $entry['author'])));
+            $entry['link_author']            = serendipity_rewriteURL(PATH_AUTHORS .'/'. serendipity_makePermalink(PERM_AUTHORS, array('id' => $entry['authorid'], 'title' => $entry['author'])));
 
             if (is_array($entry['categories'])) {
                 foreach ($entry['categories'] as $k => $v) {

[php-blog-cvs] serendipity/templates/wp entries.tpl,1.1,1.2

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

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

Modified Files:
	entries.tpl 
Log Message:
Fix a bit more username stuff. I am seriously afraid there's more borkage left. Please check it out thoroughly, whoever is reading this ;)


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/wp/entries.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- entries.tpl	11 Dec 2004 20:47:43 -0000	1.1
+++ entries.tpl	25 Feb 2005 14:36:30 -0000	1.2
@@ -15,7 +15,7 @@
           <ul class="post-categories">{foreach from=$entry.categories item="category"}
             <li><a title="View all posts in {$category.category_name}" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.category_id}-{$category.category_name|@makeFilename}">{$category.category_name}</a></li>
           {/foreach}</ul>
-          &#8212; {$entry.username} @ {$entry.timestamp|@formatTime:'%I:%M %p'}
+          &#8212; {$entry.author} @ {$entry.timestamp|@formatTime:'%I:%M %p'}
         </div>
 	
 	<div class="storycontent">

[php-blog-cvs] serendipity/include/admin entries.inc.php,1.21,1.22

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

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

Modified Files:
	entries.inc.php 
Log Message:
Fix a bit more username stuff. I am seriously afraid there's more borkage left. Please check it out thoroughly, whoever is reading this ;)


Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- entries.inc.php	24 Feb 2005 20:14:23 -0000	1.21
+++ entries.inc.php	25 Feb 2005 14:36:30 -0000	1.22
@@ -8,7 +8,7 @@
 
 $sort_order = array('timestamp'     => DATE,
                     'isdraft'       => PUBLISH . '/' . DRAFT,
-                    'username'      => AUTHOR,
+                    'a.realname'    => AUTHOR,
                     'category_name' => CATEGORY,
                     'last_modified' => LAST_UPDATED,
                     'title'         => TITLE);
@@ -83,7 +83,7 @@
                     $users = serendipity_fetchUsers();
                     if (is_array($users)) {
                         foreach ($users AS $user) {
-                            echo '<option value="' . $user['authorid'] . '" ' . (isset($serendipity['GET']['filter']['author']) && $serendipity['GET']['filter']['author'] == $user['authorid'] ? 'selected="selected"' : '') . '>' . $user['author'] . '</option>' . "\n";
+                            echo '<option value="' . $user['authorid'] . '" ' . (isset($serendipity['GET']['filter']['author']) && $serendipity['GET']['filter']['author'] == $user['authorid'] ? 'selected="selected"' : '') . '>' . $user['realname'] . '</option>' . "\n";
                         }
                     }
 ?>              </select>

[php-blog-cvs] serendipity/plugins/serendipity_event_blogpdf serendipity_event_blogpdf.php,1.18,1.19

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

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

Modified Files:
	serendipity_event_blogpdf.php 
Log Message:
Fix a bit more username stuff. I am seriously afraid there's more borkage left. Please check it out thoroughly, whoever is reading this ;)


Index: serendipity_event_blogpdf.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_blogpdf/serendipity_event_blogpdf.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_event_blogpdf.php	13 Feb 2005 12:49:56 -0000	1.18
+++ serendipity_event_blogpdf.php	25 Feb 2005 14:36:30 -0000	1.19
@@ -350,7 +350,7 @@
         $entryLink = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath');
         serendipity_plugin_api::hook_event('frontend_display', $entry, array('no_scramble' => true));
 
-        $posted_by = ' ' . POSTED_BY . ' ' . htmlspecialchars($entry['username']);
+        $posted_by = ' ' . POSTED_BY . ' ' . htmlspecialchars($entry['realname']);
         if (is_array($entry['categories']) && sizeof($entry['categories']) > 0) {
             $posted_by .= ' ' . IN . ' ';
             $cats = array();

[php-blog-cvs] serendipity/templates/default comments.tpl,1.2,1.3 entries.tpl,1.12,1.13 entries_summary.tpl,1.3,1.4

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

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

Modified Files:
	comments.tpl entries.tpl entries_summary.tpl 
Log Message:
CVS apparently missed this one


Index: comments.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/comments.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- comments.tpl	19 Nov 2004 11:06:07 -0000	1.2
+++ comments.tpl	25 Feb 2005 13:30:27 -0000	1.3
@@ -1,13 +1,13 @@
 {foreach from=$comments item=comment}
     <a id="c{$comment.id}"></a>
-    <div class="serendipity_comment serendipity_comment_author_{$comment.username|@makeFilename} {if $entry.username == $comment.username}serendipity_comment_author_self{/if}" style="padding-left: {$comment.depth*20}px">
+    <div class="serendipity_comment serendipity_comment_author_{$comment.author|@makeFilename} {if $entry.author == $comment.author}serendipity_comment_author_self{/if}" style="padding-left: {$comment.depth*20}px">
         <div class="serendipity_commentBody">{$comment.body}</div>
         <div class="serendipity_comment_source">
             <a href="#c{$comment.id}" title="Link to comment #{$comment.trace}">#{$comment.trace}</a>
             {if $comment.email}
-                <a href="mailto:{$comment.email}">{$comment.username|@default:$CONST.ANONYMOUS}</a>
+                <a href="mailto:{$comment.email}">{$comment.author|@default:$CONST.ANONYMOUS}</a>
             {else}
-                {$comment.username|@default:$CONST.ANONYMOUS}
+                {$comment.author|@default:$CONST.ANONYMOUS}
             {/if}
             {if $comment.url}
                 (<a href="{$comment.url}" title="{$comment.url|@escape}">Link</a>)
@@ -15,7 +15,7 @@
             {$CONST.ON}
             {$comment.timestamp|@formatTime:$CONST.DATE_FORMAT_SHORT}
             {if $entry.is_entry_owner}
-                (<a href="{$comment.link_delete}" onclick="return confirm('{$CONST.COMMENT_DELETE_CONFIRM|@sprintf:$comment.id:$comment.username}');">delete</a>)
+                (<a href="{$comment.link_delete}" onclick="return confirm('{$CONST.COMMENT_DELETE_CONFIRM|@sprintf:$comment.id:$comment.author}');">delete</a>)
             {/if}
             {if $entry.allow_comments}
                 (<a href="#serendipity_CommentForm" onclick="document.getElementById('serendipity_replyTo').value='{$comment.id}';">Reply</a>)

Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/entries.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- entries.tpl	4 Feb 2005 13:10:15 -0000	1.12
+++ entries.tpl	25 Feb 2005 13:30:27 -0000	1.13
@@ -12,7 +12,7 @@
         {foreach from=$dategroup.entries item="entry"}
         <h4 class="serendipity_title"><a href="{$entry.link}">{$entry.title}</a></h4>
 
-        <div class="serendipity_entry serendipity_entry_author_{$entry.username|@makeFilename} {if $entry.is_entry_owner}serendipity_entry_author_self{/if}">
+        <div class="serendipity_entry serendipity_entry_author_{$entry.author|@makeFilename} {if $entry.is_entry_owner}serendipity_entry_author_self{/if}">
             {if $entry.categories}
             <span class="serendipity_entryIcon">
             {foreach from=$entry.categories item="category"}
@@ -36,7 +36,7 @@
             {/if}
 
             <div class='serendipity_entryFooter'>
-                {$CONST.POSTED_BY} <a href="{$entry.link_username}">{$entry.username}</a>
+                {$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a>
                 {if $entry.categories}
                    {$CONST.IN} {foreach from=$entry.categories item="category" name="categories"}<a href="{$category.category_link}">{$category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
                 {/if}

Index: entries_summary.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/entries_summary.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- entries_summary.tpl	28 Nov 2004 01:53:29 -0000	1.3
+++ entries_summary.tpl	25 Feb 2005 13:30:27 -0000	1.4
@@ -5,7 +5,7 @@
     {foreach from=$entries item="entries"}
         {foreach from=$entries.entries item="entry"}
             <li><a href="{$entry.link}">{$entry.title}</a>
-                <br />{$CONST.POSTED_BY} {$entry.username} {$CONST.ON} {$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY}</li>
+                <br />{$CONST.POSTED_BY} {$entry.author} {$CONST.ON} {$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY}</li>
         {/foreach}
     {/foreach}
     </ul>

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.59,1.60

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

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

Modified Files:
	functions_entries.inc.php 
Log Message:
CVS apparently missed this one


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- functions_entries.inc.php	24 Feb 2005 20:14:22 -0000	1.59
+++ functions_entries.inc.php	25 Feb 2005 13:30:26 -0000	1.60
@@ -598,7 +598,7 @@
             $entry['link_rdf']               = serendipity_rewriteURL(PATH_FEEDS . '/ei_'. $entry['id'] .'.rdf');
             $entry['link_viewmode_threaded'] = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_THREADED;
             $entry['link_viewmode_linear']   = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_LINEAR;
-            $entry['link_username']          = serendipity_rewriteURL(PATH_AUTHORS .'/'. serendipity_makePermalink(PERM_AUTHORS, array('id' => $entry['authorid'], 'title' => $entry['author'])));
+            $entry['link_author']          = serendipity_rewriteURL(PATH_AUTHORS .'/'. serendipity_makePermalink(PERM_AUTHORS, array('id' => $entry['authorid'], 'title' => $entry['author'])));
 
             if (is_array($entry['categories'])) {
                 foreach ($entry['categories'] as $k => $v) {

[php-blog-cvs] serendipity/sql db_update_0.8-alpha11_0.8-alpha12_postgres.sql,NONE,1.1 db_update_0.8-alpha11_0.8-alpha12_sqlite.sql,NONE,1.1

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

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

Added Files:
	db_update_0.8-alpha11_0.8-alpha12_postgres.sql 
	db_update_0.8-alpha11_0.8-alpha12_sqlite.sql 
Log Message:
Add the famous SQLite alternative :-)


--- NEW FILE: db_update_0.8-alpha11_0.8-alpha12_postgres.sql ---
ALTER TABLE {PREFIX}authors ADD COLUMN realname varchar(255);

--- NEW FILE: db_update_0.8-alpha11_0.8-alpha12_sqlite.sql ---
create table {PREFIX}tempauthors (
  realname varchar(255) NOT NULL default '',
  username varchar(20) default null,
  password varchar(32) default null,
  authorid {AUTOINCREMENT} {PRIMARY},
  mail_comments int(1) default '1',
  mail_trackbacks int(1) default '1',
  email varchar(128) not null default '',
  userlevel int(4) {UNSIGNED} not null default '0',
  right_publish int(1) default '1'
);

INSERT INTO {PREFIX}tempauthors (username, password, authorid, mail_comments, mail_trackbacks, email, userlevel, right_publish) SELECT username, password, authorid, mail_comments, mail_trackbacks, email, userlevel, right_publish FROM {PREFIX}authors;
DROP TABLE {PREFIX}authors;

create table {PREFIX}authors (
  realname varchar(255) NOT NULL default '',
  username varchar(20) default null,
  password varchar(32) default null,
  authorid {AUTOINCREMENT} {PRIMARY},
  mail_comments int(1) default '1',
  mail_trackbacks int(1) default '1',
  email varchar(128) not null default '',
  userlevel int(4) {UNSIGNED} not null default '0',
  right_publish int(1) default '1'
);

INSERT INTO {PREFIX}authors (username, password, authorid, mail_comments, mail_trackbacks, email, userlevel, right_publish) SELECT username, password, authorid, mail_comments, mail_trackbacks, email, userlevel, right_publish FROM {PREFIX}tempauthors;
DROP TABLE {PREFIX}tempauthors;

[php-blog-cvs] serendipity/sql db_update_0.8-alpha11_0.8-alpha12_mysql.sql,1.1,1.2

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

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

Modified Files:
	db_update_0.8-alpha11_0.8-alpha12_mysql.sql 
Log Message:
- Forgot to add the realname column


Index: db_update_0.8-alpha11_0.8-alpha12_mysql.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db_update_0.8-alpha11_0.8-alpha12_mysql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_update_0.8-alpha11_0.8-alpha12_mysql.sql	24 Feb 2005 20:14:26 -0000	1.1
+++ db_update_0.8-alpha11_0.8-alpha12_mysql.sql	25 Feb 2005 13:15:13 -0000	1.2
@@ -1 +1,2 @@
+ALTER TABLE {PREFIX}authors ADD realname VARCHAR( 255 ) NOT NULL FIRST;
 UPDATE {PREFIX}authors SET realname = username;

[php-blog-cvs] serendipity/lang serendipity_lang_ja.inc.php,1.41,1.42

[Tadashi J. <el...@us...>]

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

Modified Files:
	serendipity_lang_ja.inc.php 
Log Message:
o updated translation.


Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serendipity_lang_ja.inc.php	24 Feb 2005 21:23:42 -0000	1.41
+++ serendipity_lang_ja.inc.php	24 Feb 2005 21:42:24 -0000	1.42
@@ -157,8 +157,8 @@
 @define('ERROR', 'エラー');
 @define('ENTRY_SAVED', 'エントリは保存されました。');
 @define('DELETE_SURE', '#%s の削除を本当に実行しますか?');
-@define('NOT_REALLY', 'Not really...');
-@define('DUMP_IT', 'Dump it!');
+@define('NOT_REALLY', 'とりやめます...');
+@define('DUMP_IT', '実行します!');
 @define('RIP_ENTRY', 'R.I.P. エントリ #%s');
 @define('CATEGORY_DELETED_ARTICLES_MOVED', 'カテゴリ #%s を削除しました。古い記事はカテゴリ #%s に移動しました。');
 @define('CATEGORY_DELETED', 'カテゴリ #%s を削除しました。');
@@ -189,8 +189,8 @@
 @define('FILE_CREATE_YOURSELF', '自分でファイルを作成するか、パーミッションを調べてください');
 @define('COPY_CODE_BELOW', '<br />* Just copy the code below and place it in %s in your %s folder:<b><pre>%s</pre></b>' . "\n");
 @define('WWW_USER', 'Change www to the user apache runs as (i.e. nobody).');
-@define('BROWSER_RELOAD', 'Once you\'ve done this, hit your browser\'s "reload" button.');
-@define('DIAGNOSTIC_ERROR', 'We detected some errors while running some diagnostics on your entered information:');
+@define('BROWSER_RELOAD', '一度これを実行してにはブラウザーの「再読み込み」ボタンをクリックします。');
+@define('DIAGNOSTIC_ERROR', 'あなたの入力した情報の診断を実行する間にいくつかのエラーを検知しました:');
 @define('SERENDIPITY_NOT_INSTALLED', 'Serendipity はまだインストールされていません。今から<a href="%s">インストール</a> してください。');
 @define('INCLUDE_ERROR', 'serendipity エラー: could not include %s - exiting.');
 @define('DATABASE_ERROR', 'serendipity エラー: データベースに接続できませんでした - 終了します。');
@@ -282,13 +282,13 @@
 @define('SERENDIPITY_UPGRADER_PURPOSE', '私は Serendipity %s をアップグレードインストールするのを助けるためにここに居ます。');
 @define('SERENDIPITY_UPGRADER_WHY', '今 Serendipity %s をインストールしましたが、まだこのバージョンに適したデータベースをアップグレードインストールしていないのでこのメッセージを見ています。');
 @define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'データベースアップデート (%s)');
-@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'I have found the following .sql files which needs to be run before you can continue normal operation of Serendipity');
+@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', '次の.sqlファイルを見つけました。Serendipity の通常動作を継続すること可能にするには、それを実行する必要があります');
 @define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  '特定バージョンのタスク');
 @define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', '特定バージョンのタスクバージョンが見つかりませんでした。');
 @define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', '上記タスクを行うことを望みますか?');
 @define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'いいえ、手動で実行します。');
 @define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'はい、そうしてください');
-@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'It appears you do not need any upgrades run');
+@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'アップグレードの実行を必要としないように見えます。');
 @define('SERENDIPITY_UPGRADER_CONSIDER_DONE', '改良された Serendipity にアップグレードしました。');
 @define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'You have ignored the upgrade stage of Serendipity, please make sure your database is correctly installed, and scheduled functions are run');
 @define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'あなたの Serendipity は今バージョン %s にアップグレードしました。');

[php-blog-cvs] serendipity/lang serendipity_lang_ja.inc.php,1.40,1.41

[Tadashi J. <el...@us...>]

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

Modified Files:
	serendipity_lang_ja.inc.php 
Log Message:
o updated translation.


Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- serendipity_lang_ja.inc.php	24 Feb 2005 20:14:25 -0000	1.40
+++ serendipity_lang_ja.inc.php	24 Feb 2005 21:23:42 -0000	1.41
@@ -652,10 +652,10 @@
 @define('AUTOLANG_DESC', 'もし有効にしたならエントリとインターフェースの言語の決定は来訪者のブラウザーの言語設定を使用します。');
 @define('INSTALL_AUTODETECT_URL', '自動検知に HTTP-Host を使う');
 @define('INSTALL_AUTODETECT_URL_DESC', 'If set to "true", Serendipity will ensure that the HTTP Host which was used by your visitor is used as your BaseURL setting. Enabling this will let you be able to use multiple domain names for your Serendipity Blog, and use the domain for all follow-up links which the user used to access your blog.'); // Translate
-@define('CONVERT_HTMLENTITIES', 'Try to auto-convert HTML entities?');
-@define('EMPTY_SETTING', 'You did not specify a valid value for "%s"!');
-@define('USERCONF_REALNAME', 'Real name'); // Translate
-@define('USERCONF_REALNAME_DESC', 'The full name of the author. This is the name seen by readers'); // Translate
+@define('CONVERT_HTMLENTITIES', 'HTML 実体への自動変換を試みますか?');
+@define('EMPTY_SETTING', '%s の値が正しく指定されていません!');
+@define('USERCONF_REALNAME', '本名'); // Translate
+@define('USERCONF_REALNAME_DESC', '著作者のフルネームです。これは読者に見える名前です。'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/sql db.sql,1.26,1.27

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

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

Modified Files:
	db.sql 
Log Message:
- realname support, forgot to add at installation


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/sql/db.sql,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- db.sql	6 Dec 2004 15:53:08 -0000	1.26
+++ db.sql	24 Feb 2005 20:19:46 -0000	1.27
@@ -12,6 +12,7 @@
 #
 
 create table {PREFIX}authors (
+  realname varchar(255) NOT NULL default '',
   username varchar(20) default null,
   password varchar(32) default null,
   authorid {AUTOINCREMENT} {PRIMARY},

[php-blog-cvs] serendipity/include/admin category.inc.php,1.14,1.15 entries.inc.php,1.20,1.21 installer.inc.php,1.24,1.25 overview.inc.php,1.4,1.5 personal.inc.php,1.11,1.12 plugins.inc.php,1.24,1.25 users.inc.php,1.12,1.13

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

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

Modified Files:
	category.inc.php entries.inc.php installer.inc.php 
	overview.inc.php personal.inc.php plugins.inc.php 
	users.inc.php 
Log Message:
- Added ability to define a real name for each author
- Added serendipity_addAuthor() and serendipity_deleteAuthor functions

Version bump


Index: users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/users.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- users.inc.php	15 Feb 2005 08:29:13 -0000	1.12
+++ users.inc.php	24 Feb 2005 20:14:23 -0000	1.13
@@ -20,8 +20,8 @@
     } elseif ($_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
         echo '<div class="serendipityAdminMsgError">' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</div>';
     } else {
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}authors WHERE authorid=" . (int)$serendipity['POST']['user']);
-        printf('<div class="serendipityAdminMsgSuccess">' . DELETED_USER . '</div>', $serendipity['POST']['user'], $user[0]['username']);
+        serendipity_deleteAuthor($user[0]['authorid']);
+        printf('<div class="serendipityAdminMsgSuccess">' . DELETED_USER . '</div>', $serendipity['POST']['user'], $user[0]['realname']);
     }
 }
 
@@ -31,12 +31,7 @@
     if ($_POST['userlevel'] >= $serendipity['serendipityUserlevel'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
         echo '<div class="serendipityAdminMsgError">' . CREATE_NOT_AUTHORIZED . '</div>';
     } else {
-        $enc_pass = md5($_POST['pass']);
-        $query = "INSERT INTO {$serendipity['dbPrefix']}authors (username, password)
-                      VALUES  ('" . serendipity_db_escape_string($_POST['username']) . "',
-                               '" . serendipity_db_escape_String($enc_pass) . "')";
-        serendipity_db_query($query);
-        $serendipity['POST']['user'] = serendipity_db_insert_id('authors', 'authorid');
+        $serendipity['POST']['user'] = serendipity_addAuthor($_POST['username'], $_POST['pass'], $_POST['realname'], $_POST['email'], $_POST['userlevel']);
 
         /* Save all the properties */
         $config = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE);
@@ -51,7 +46,7 @@
             }
         }
 
-        printf('<div class="serendipityAdminMsgSuccess">' . CREATED_USER . '</div>', '#' . $serendipity['POST']['user'] . ', ' . $_POST['username']);
+        printf('<div class="serendipityAdminMsgSuccess">' . CREATED_USER . '</div>', '#' . $serendipity['POST']['user'] . ', ' . $_POST['realname']);
     }
 }
 
@@ -75,7 +70,7 @@
                 }
             }
         }
-        printf('<div class="serendipityAdminMsgSuccess">' . MODIFIED_USER . '</div>', $_POST['username']);
+        printf('<div class="serendipityAdminMsgSuccess">' . MODIFIED_USER . '</div>', $_POST['realname']);
     }
 }
 
@@ -106,7 +101,8 @@
 <div class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo ($i++ % 2) ? 'even' : 'uneven' ?>">
 <table width="100%">
     <tr>
-        <td><img src="<?php echo $img ?>" alt="" style="border: 0px none ; vertical-align: bottom; display: inline;" /> <?php echo htmlspecialchars($user['username']); ?></td>
+<?php /* TODO: Add username to list once tom figures out how to fix uneven rowstyles */ ?>
+        <td><img src="<?php echo $img ?>" alt="" style="border: 0px none ; vertical-align: bottom; display: inline;" /> <?php echo htmlspecialchars($user['realname']); ?></td>
         <td width="100" align="center"><?php echo $user['userlevel']; ?></td>
         <td width="200" align="right"> [<a href="?serendipity[adminModule]=users&amp;serendipity[adminAction]=edit&amp;serendipity[userid]=<?php echo $user['authorid'] ?>"><?php echo EDIT ?></a>]
                                      - [<a href="?serendipity[adminModule]=users&amp;serendipity[adminAction]=delete&amp;serendipity[userid]=<?php echo $user['authorid'] ?>"><?php echo DELETE ?></a>]</td>
@@ -180,7 +176,7 @@
 ?>
 <form action="?serendipity[adminModule]=users" method="post">
     <div>
-    <?php printf(DELETE_USER, $serendipity['GET']['userid'], $user[0]['username']); ?>
+    <?php printf(DELETE_USER, $serendipity['GET']['userid'], $user[0]['realname']); ?>
         <br /><br />
         <input type="hidden" name="serendipity[user]" value="<?php echo $serendipity['GET']['userid']; ?>" />
         <input type="submit" name="DELETE_YES" value="<?php echo DUMP_IT; ?>" class="serendipityPrettyButton" />

Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- entries.inc.php	3 Feb 2005 18:55:18 -0000	1.20
+++ entries.inc.php	24 Feb 2005 20:14:23 -0000	1.21
@@ -83,7 +83,7 @@
                     $users = serendipity_fetchUsers();
                     if (is_array($users)) {
                         foreach ($users AS $user) {
-                            echo '<option value="' . $user['authorid'] . '" ' . (isset($serendipity['GET']['filter']['author']) && $serendipity['GET']['filter']['author'] == $user['authorid'] ? 'selected="selected"' : '') . '>' . $user['username'] . '</option>' . "\n";
+                            echo '<option value="' . $user['authorid'] . '" ' . (isset($serendipity['GET']['filter']['author']) && $serendipity['GET']['filter']['author'] == $user['authorid'] ? 'selected="selected"' : '') . '>' . $user['author'] . '</option>' . "\n";
                         }
                     }
 ?>              </select>
@@ -201,7 +201,7 @@
                     <tr>
                         <td>
                             <?php
-                echo POSTED_BY . ' ' . $entry['username'];
+                echo POSTED_BY . ' ' . $entry['author'];
                 if (count($entry['categories'])) {
                     echo ' ' . IN . ' ';
                     $cats = array();
@@ -319,8 +319,8 @@
                 $entry['comments']   = 0;
             }
 
-            if (!isset($entry['username']) || !$entry['username']) {
-                $entry['username']   = $serendipity['serendipityUser'];
+            if (!isset($entry['realname']) || !$entry['realname']) {
+                $entry['realname']   = $serendipity['serendipityUser'];
             }
 
             $categories = (array)$entry['categories'];

Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- plugins.inc.php	22 Feb 2005 10:21:05 -0000	1.24
+++ plugins.inc.php	24 Feb 2005 20:14:23 -0000	1.25
@@ -168,10 +168,10 @@
 
     foreach($users AS $user) {
         if (!$is_plugin_owner && $user['authorid'] == $authorid) {
-            $username = htmlspecialchars($user['username']);
+            $realname = htmlspecialchars($user['realname']);
         } elseif ($is_plugin_owner) {
 ?>
-    <option value="<?php echo $user['authorid']; ?>"<?php echo ($user['authorid'] == $authorid ? ' selected="selected"' : ''); ?>><?php echo htmlspecialchars($user['username']); ?></option>
+    <option value="<?php echo $user['authorid']; ?>"<?php echo ($user['authorid'] == $authorid ? ' selected="selected"' : ''); ?>><?php echo htmlspecialchars($user['realname']); ?></option>
 <?php
         }
     }

Index: overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/overview.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- overview.inc.php	26 Jan 2005 14:14:04 -0000	1.4
+++ overview.inc.php	24 Feb 2005 20:14:23 -0000	1.5
@@ -5,9 +5,13 @@
 if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
+
+$user = serendipity_fetchAuthor($serendipity['authorid']);
 ?>
 
-<?php echo WELCOME_BACK . ' ' . $_SESSION['serendipityUser'] . '.'; ?>
+<?php echo WELCOME_BACK ?> <?php echo $user[0]['realname'] ?>.
+
+
 
 <?php
 /* vim: set sts=4 ts=4 expandtab : */

Index: category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/category.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- category.inc.php	3 Feb 2005 18:55:18 -0000	1.14
+++ category.inc.php	24 Feb 2005 20:14:23 -0000	1.15
@@ -226,7 +226,7 @@
                 <td width="16"><?php if ( !empty($category['category_icon']) ) {?><img src="<?php echo serendipity_getTemplateFile('admin/img/thumbnail.png') ?>" alt="" /><?php } else echo '&nbsp;' ?></td>
                 <td width="300" style="padding-left: <?php echo ($category['depth']*15)+20 ?>px"><img src="<?php echo serendipity_getTemplateFile('admin/img/folder.png') ?>" style="vertical-align: bottom;"> <?php echo htmlspecialchars($category['category_name']) ?></td>
                 <td><?php echo htmlspecialchars($category['category_description']) ?></td>
-                <td align="right"><?php echo ($category['authorid'] == '0' ? ALL_AUTHORS : $category['username']); ?></td>
+                <td align="right"><?php echo ($category['authorid'] == '0' ? ALL_AUTHORS : $category['realname']); ?></td>
             </tr>
 <?php           }
             } ?>

Index: personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/personal.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- personal.inc.php	26 Jan 2005 14:14:04 -0000	1.11
+++ personal.inc.php	24 Feb 2005 20:14:23 -0000	1.12
@@ -26,7 +26,7 @@
         }
         $from = $_POST;
 ?>
-    <div class="serendipityAdminMsgSuccess"><?php echo sprintf(MODIFIED_USER, $_POST['username']) ?></div>
+    <div class="serendipityAdminMsgSuccess"><?php echo sprintf(MODIFIED_USER, $_POST['realname']) ?></div>
 <?php }
 } ?>
 

Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- installer.inc.php	5 Feb 2005 23:57:32 -0000	1.24
+++ installer.inc.php	24 Feb 2005 20:14:23 -0000	1.25
@@ -425,10 +425,13 @@
         echo ' <strong>' . DONE . '</strong><br />';
 
         echo sprintf(CREATING_PRIMARY_AUTHOR, $_POST['user']) .'...';
+        $authorid = serendipity_addAuthor($_POST['user'], $_POST['pass'], $_POST['realname'], $_POST['email'], USERLEVEL_ADMIN);
         $mail_comments =  (serendipity_db_bool($_POST['want_mail']) ? 1 : 0);
-        $query = "INSERT INTO {$serendipity['dbPrefix']}authors (username, password, email, mail_comments, mail_trackbacks, userlevel)
-                  VALUES  ('". $_POST['user'] ."', '". md5($_POST['pass']) ."', '". $_POST['email'] ."', ". $mail_comments .", ". $mail_comments .", " . USERLEVEL_ADMIN . ")";
-        serendipity_db_query($query);
+        serendipity_set_user_var('mail_comments', $mail_comments, $authorid);
+        serendipity_set_user_var('mail_trackbacks', $mail_comments, $authorid);
+        serendipity_set_user_var('right_publish', 1, $authorid);
+
+
         echo ' <strong>' . DONE . '</strong><br />';
 
         echo SETTING_DEFAULT_TEMPLATE .'... ';

[php-blog-cvs] serendipity/include/admin/importers b2evolution.inc.php,1.2,1.3 bmachine.inc.php,1.2,1.3 geeklog.inc.php,1.2,1.3 nucleus.inc.php,1.4,1.5 pmachine.inc.php,1.2,1.3 sunlog.inc.php,1.2,1.3 textpattern.inc.php,1.4,1.5 wordpress.inc.php,1.11,1.12

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

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

Modified Files:
	b2evolution.inc.php bmachine.inc.php geeklog.inc.php 
	nucleus.inc.php pmachine.inc.php sunlog.inc.php 
	textpattern.inc.php wordpress.inc.php 
Log Message:
- Added ability to define a real name for each author
- Added serendipity_addAuthor() and serendipity_deleteAuthor functions

Version bump


Index: nucleus.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/nucleus.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nucleus.inc.php	21 Feb 2005 18:53:19 -0000	1.4
+++ nucleus.inc.php	24 Feb 2005 20:14:24 -0000	1.5
@@ -101,6 +101,7 @@
             $users[$x] = mysql_fetch_assoc($res);
 
             $data = array('right_publish' => ($users[$x]['user_level'] >= 1) ? 1 : 0,
+                          'realname'      => $users[$x]['user_login'],
                           'username'      => $users[$x]['user_login'],
                           'email'         => $users[$x]['user_email'],
                           'password'      => $users[$x]['user_pass']); // Nucleus uses md5, too.
@@ -161,7 +162,7 @@
             foreach ($users as $user) {
                 if ($user['ID'] == $entries[$x]['iauthor']) {
                     $entry['authorid'] = $user['authorid'];
-                    $entry['author']   = $user['username'];
+                    $entry['author']   = $user['realname'];
                     break;
                 }
             }
@@ -190,27 +191,27 @@
         while ($a = mysql_fetch_assoc($res)) {
             foreach ($entries as $entry) {
                 if ($entry['inumber'] == $a['citem'] ) {
-                    $username = '';
+                    $author   = '';
                     $mail     = '';
                     if (!empty($a['cmember'])) {
                         foreach($users AS $user) {
                             if ($user['ID'] == $a['cmember']) {
-                                $username = $user['user_login'];
+                                $author = $user['user_login'];
                                 $mail = $user['user_email'];
                                 break;
                             }
                         }
                     }
 
-                    if (empty($username) && empty($mail)) {
-                        $username = $a['cuser'];
+                    if (empty($author) && empty($mail)) {
+                        $author = $a['cuser'];
                         $mail = $a['cmail'];
                     }
 
                     $comment = array('entry_id ' => $entry['entryid'],
                                      'parent_id' => 0,
                                      'timestamp' => strtotime($a['ctime']),
-                                     'author'    => $username,
+                                     'author'    => $author,
                                      'email'     => $mail,
                                      'url'       => $a['chost'],
                                      'ip'        => $a['cip'],

Index: textpattern.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/textpattern.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- textpattern.inc.php	21 Feb 2005 18:53:28 -0000	1.4
+++ textpattern.inc.php	24 Feb 2005 20:14:24 -0000	1.5
@@ -109,6 +109,7 @@
             $users[$x] = mysql_fetch_assoc($res);
 
             $data = array('right_publish' => ($users[$x]['user_level'] <= 4) ? 1 : 0,
+                          'realname'      => $users[$x]['user_login'],
                           'username'      => $users[$x]['user_login'],
                           'email'         => $users[$x]['user_email'],
                           'password'      => md5('txp')); // blame TXP for using PASSWORD().
@@ -182,14 +183,14 @@
         while ($a = mysql_fetch_assoc($res)) {
             foreach ($entries as $entry) {
                 if ($entry['ID'] == $a['parentid'] ) {
-                    $username = $a['name'];
+                    $author   = $a['name'];
                     $mail     = $a['email'];
                     $url      = $a['web'];
 
                     $comment = array('entry_id ' => $entry['entryid'],
                                      'parent_id' => 0,
                                      'timestamp' => strtotime($a['posted']),
-                                     'author'    => $username,
+                                     'author'    => $author,
                                      'email'     => $mail,
                                      'url'       => $url,
                                      'ip'        => $a['ip'],

Index: pmachine.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/pmachine.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pmachine.inc.php	21 Feb 2005 18:53:19 -0000	1.2
+++ pmachine.inc.php	24 Feb 2005 20:14:24 -0000	1.3
@@ -92,10 +92,10 @@
         }
 
         /* Users */
-        $res = @mysql_query("SELECT id         AS ID, 
-                                    username   AS user_login, 
+        $res = @mysql_query("SELECT id         AS ID,
+                                    username   AS user_login,
                                     `password` AS user_pass,
-                                    email      AS user_email, 
+                                    email      AS user_email,
                                     status     AS user_level,
                                     url        AS url
                                FROM {$this->data['prefix']}members", $pmdb);
@@ -107,6 +107,7 @@
             $users[$x] = mysql_fetch_assoc($res);
 
             $data = array('right_publish' => ($users[$x]['user_level'] >= 3) ? 1 : 0,
+                          'realname'      => $users[$x]['user_login'],
                           'username'      => $users[$x]['user_login'],
                           'email'         => $users[$x]['user_email'],
                           'password'      => $users[$x]['user_pass']); // pMachine uses md5, too.
@@ -122,9 +123,9 @@
         }
 
         /* Categories */
-        $res = @mysql_query("SELECT id       AS cat_ID, 
-                                    category AS cat_name, 
-                                    category AS category_description 
+        $res = @mysql_query("SELECT id       AS cat_ID,
+                                    category AS cat_name,
+                                    category AS category_description
                                FROM {$this->data['prefix']}categories ORDER BY id", $pmdb);
         if (!$res) {
             return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($pmdb));
@@ -199,13 +200,13 @@
         while ($a = mysql_fetch_assoc($res)) {
             foreach ($entries as $entry) {
                 if ($entry['post_id'] == $a['post_id'] ) {
-                    $username = '';
+                    $author   = '';
                     $mail     = '';
                     $url      = '';
                     if (!empty($a['member_id'])) {
                         foreach($users AS $user) {
                             if ($user['ID'] == $a['member_id']) {
-                                $username = $user['user_login'];
+                                $author = $user['user_login'];
                                 $mail     = $user['user_email'];
                                 $url      = $user['url'];
                                 break;
@@ -216,7 +217,7 @@
                     $comment = array('entry_id ' => $entry['entryid'],
                                      'parent_id' => 0,
                                      'timestamp' => $a['t_stamp'],
-                                     'author'    => $username,
+                                     'author'    => $author,
                                      'email'     => $mail,
                                      'url'       => $url,
                                      'ip'        => $a['comment_ip'],

Index: geeklog.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/geeklog.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- geeklog.inc.php	21 Feb 2005 18:53:01 -0000	1.2
+++ geeklog.inc.php	24 Feb 2005 20:14:24 -0000	1.3
@@ -95,20 +95,21 @@
         }
 
         /* Users */
-        $res = @mysql_query("SELECT uid        AS ID, 
-                                    username   AS user_login, 
+        $res = @mysql_query("SELECT uid        AS ID,
+                                    username   AS user_login,
                                     passwd     AS user_pass,
-                                    email      AS user_email, 
+                                    email      AS user_email,
                                     homepage   AS user_url
                                FROM {$this->data['prefix']}users", $gdb);
         if (!$res) {
             return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($gdb));
         }
-        
+
         for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
             $users[$x] = mysql_fetch_assoc($res);
 
             $data = array('right_publish' => 1,
+                          'realname'      => $users[$x]['user_login'],
                           'username'      => $users[$x]['user_login'],
                           'email'         => $users[$x]['user_email'],
                           'userlevel'     => USERLEVEL_ADMIN,
@@ -185,7 +186,7 @@
                 }
             }
         }
-        
+
         /* Comments */
         $res = @mysql_query("SELECT * FROM {$this->data['prefix']}comments;", $gdb);
         if (!$res) {
@@ -195,13 +196,13 @@
         while ($a = mysql_fetch_assoc($res)) {
             foreach ($entries as $entry) {
                 if ($entry['sid'] == $a['sid'] ) {
-                    $username = '';
+                    $author   = '';
                     $mail     = '';
                     $url      = '';
 
                     foreach($users AS $user) {
                         if ($user['ID'] == $a['uid']) {
-                            $username = $user['user_login'];
+                            $author = $user['user_login'];
                             $mail = $user['user_email'];
                             $url  = $user['user_url'];
                             break;
@@ -211,7 +212,7 @@
                     $comment = array('entry_id ' => $entry['entryid'],
                                      'parent_id' => 0,
                                      'timestamp' => strtotime($a['date']),
-                                     'author'    => $username,
+                                     'author'    => $author,
                                      'email'     => $mail,
                                      'url'       => $url,
                                      'ip'        => $a['ip'],

Index: b2evolution.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/b2evolution.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- b2evolution.inc.php	21 Feb 2005 18:52:58 -0000	1.2
+++ b2evolution.inc.php	24 Feb 2005 20:14:23 -0000	1.3
@@ -89,21 +89,22 @@
         }
 
         /* Users */
-        $res = @mysql_query("SELECT ID         AS ID, 
-                                    user_login AS user_login, 
+        $res = @mysql_query("SELECT ID         AS ID,
+                                    user_login AS user_login,
                                     user_pass  AS user_pass,
-                                    user_email AS user_email, 
+                                    user_email AS user_email,
                                     user_level AS user_level,
                                     user_url   AS user_url
                                FROM evo_users", $b2db);
         if (!$res) {
             return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($b2db));
         }
-        
+
         for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
             $users[$x] = mysql_fetch_assoc($res);
 
             $data = array('right_publish' => ($users[$x]['user_level'] >= 2) ? 1 : 0,
+                          'realname'      => $users[$x]['user_login'],
                           'username'      => $users[$x]['user_login'],
                           'email'         => $users[$x]['user_email'],
                           'password'      => $users[$x]['user_pass']); // MD5 compatible
@@ -165,16 +166,16 @@
                 }
             }
         }
-        
+
         /* Even more category stuff */
         $res = @mysql_query("SELECT * FROM evo_postcats;", $b2db);
         if (!$res) {
             return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($b2db));
         }
-        
+
         for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++ ) {
             $entrycat = mysql_fetch_assoc($res);
-            
+
             $entryid = 0;
             $categoryid = 0;
             foreach($entries AS $entry) {
@@ -183,7 +184,7 @@
                     break;
                 }
             }
-            
+
             foreach($this->categories AS $category) {
                 if ($category['cat_ID'] == $entrycat['postcat_cat_ID']) {
                     $categoryid = $category['categoryid'];
@@ -195,7 +196,7 @@
                               'categoryid' => $categoryid);
                 serendipity_db_insert('entrycat', $this->strtrRecursive($data));
             }
-        }        
+        }
 
         /* Comments */
         $res = @mysql_query("SELECT * FROM evo_comments;", $b2db);
@@ -206,13 +207,13 @@
         while ($a = mysql_fetch_assoc($res)) {
             foreach ($entries as $entry) {
                 if ($entry['ID'] == $a['comment_post_ID'] ) {
-                    $username = '';
+                    $author = '';
                     $mail     = '';
                     $url      = '';
                     if (!empty($a['comment_author_ID'])) {
                         foreach($users AS $user) {
                             if ($user['ID'] == $a['comment_author_ID']) {
-                                $username = $user['user_login'];
+                                $author = $user['user_login'];
                                 $mail = $user['user_email'];
                                 $url  = $user['user_url'];
                                 break;
@@ -220,8 +221,8 @@
                         }
                     }
 
-                    if (empty($username) && empty($mail)) {
-                        $username = $a['comment_author'];
+                    if (empty($author) && empty($mail)) {
+                        $author = $a['comment_author'];
                         $mail = $a['comment_author_email'];
                         $url = $a['comment_author_url'];
                     }
@@ -229,7 +230,7 @@
                     $comment = array('entry_id ' => $entry['entryid'],
                                      'parent_id' => 0,
                                      'timestamp' => strtotime($a['comment_date']),
-                                     'author'    => $username,
+                                     'author'    => $author,
                                      'email'     => $mail,
                                      'url'       => $url,
                                      'ip'        => $a['comment_author_IP'],
@@ -280,7 +281,7 @@
             $this->categories[] = $row;
             $this->importCategories($row['cat_ID'], $row['categoryid']);
         }
-        
+
         return true;
     }
 }

Index: wordpress.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/wordpress.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- wordpress.inc.php	21 Feb 2005 18:53:29 -0000	1.11
+++ wordpress.inc.php	24 Feb 2005 20:14:24 -0000	1.12
@@ -100,6 +100,7 @@
             $users[$x] = mysql_fetch_assoc($res);
 
             $data = array('right_publish' => ($users[$x]['user_level'] >= 1) ? 1 : 0,
+                          'realname'      => $users[$x]['user_login'],
                           'username'      => $users[$x]['user_login'],
                           'password'      => $users[$x]['user_pass']); // WP uses md5, too.
 
@@ -245,4 +246,4 @@
 return 'Serendipity_Import_WordPress';
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: sunlog.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/sunlog.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sunlog.inc.php	21 Feb 2005 18:53:26 -0000	1.2
+++ sunlog.inc.php	24 Feb 2005 20:14:24 -0000	1.3
@@ -97,19 +97,20 @@
         }
 
         /* Users */
-        $res = @mysql_query("SELECT id         AS ID, 
-                                    name       AS user_login, 
-                                    email      AS user_email, 
+        $res = @mysql_query("SELECT id         AS ID,
+                                    name       AS user_login,
+                                    email      AS user_email,
                                     homepage   AS user_url
                                FROM {$this->data['prefix']}users", $sunlogdb);
         if (!$res) {
             return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($sunlogdb));
         }
-        
+
         for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
             $users[$x] = mysql_fetch_assoc($res);
 
             $data = array('right_publish' => 1,
+                          'realname'      => $users[$x]['user_login'],
                           'username'      => $users[$x]['user_login'],
                           'email'         => $users[$x]['user_email'],
                           'userlevel'     => USERLEVEL_ADMIN,
@@ -157,16 +158,16 @@
                 return $entries[$x]['entryid'];
             }
         }
-        
+
         /* Even more category stuff */
         $res = @mysql_query("SELECT * FROM {$this->data['prefix']}transfer_c;", $sunlogdb);
         if (!$res) {
             return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($sunlogdb));
         }
-        
+
         for ($x=0, $max_x = mysql_num_rows($res) ; $x < $max_x ; $x++ ) {
             $entrycat = mysql_fetch_assoc($res);
-            
+
             $entryid = 0;
             $categoryid = 0;
             foreach($entries AS $entry) {
@@ -175,7 +176,7 @@
                     break;
                 }
             }
-            
+
             foreach($this->categories AS $category) {
                 if ($category['id'] == $entrycat['category']) {
                     $categoryid = $category['categoryid'];
@@ -187,7 +188,7 @@
                               'categoryid' => $categoryid);
                 serendipity_db_insert('entrycat', $this->strtrRecursive($data));
             }
-        }        
+        }
 
         /* Comments */
         $res = @mysql_query("SELECT * FROM {$this->data['prefix']}c_comments;", $sunlogdb);
@@ -198,13 +199,13 @@
         while ($a = mysql_fetch_assoc($res)) {
             foreach ($entries as $entry) {
                 if ($entry['id'] == $a['for_entry'] ) {
-                    $username = '';
+                    $author   = '';
                     $mail     = '';
                     $url      = '';
 
                     foreach($users AS $user) {
                         if ($user['ID'] == $a['user']) {
-                            $username = $user['user_login'];
+                            $author = $user['user_login'];
                             $mail = $user['user_email'];
                             $url  = $user['user_url'];
                             break;
@@ -214,7 +215,7 @@
                     $comment = array('entry_id ' => $entry['entryid'],
                                      'parent_id' => 0,
                                      'timestamp' => strtotime($a['insertdate']),
-                                     'author'    => $username,
+                                     'author'    => $author,
                                      'email'     => $mail,
                                      'url'       => $url,
                                      'ip'        => '',
@@ -259,7 +260,7 @@
             $this->categories[] = $row;
             $this->importCategories($row['id'], $row['categoryid']);
         }
-        
+
         return true;
     }
 }

Index: bmachine.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/bmachine.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bmachine.inc.php	21 Feb 2005 18:52:59 -0000	1.2
+++ bmachine.inc.php	24 Feb 2005 20:14:24 -0000	1.3
@@ -89,21 +89,22 @@
         }
 
         /* Users */
-        $res = @mysql_query("SELECT id         AS ID, 
-                                    user_login AS user_login, 
+        $res = @mysql_query("SELECT id         AS ID,
+                                    user_login AS user_login,
                                     user_pass  AS user_pass,
-                                    user_email AS user_email, 
+                                    user_email AS user_email,
                                     level      AS user_level,
                                     user_url   AS user_url
                                FROM bmc_users", $txpdb);
         if (!$res) {
             return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($txpdb));
         }
-        
+
         for ($x=0, $max_x = mysql_num_rows($res); $x < $max_x ; $x++ ) {
             $users[$x] = mysql_fetch_assoc($res);
 
             $data = array('right_publish' => ($users[$x]['user_level'] >= 2) ? 1 : 0,
+                          'realname'      => $users[$x]['user_login'],
                           'username'      => $users[$x]['user_login'],
                           'email'         => $users[$x]['user_email'],
                           'password'      => $users[$x]['user_pass']); // MD5 compatible
@@ -121,9 +122,9 @@
         }
 
         /* Categories */
-        $res = @mysql_query("SELECT id       AS cat_ID, 
-                                    cat_name AS cat_name, 
-                                    cat_info AS category_description 
+        $res = @mysql_query("SELECT id       AS cat_ID,
+                                    cat_name AS cat_name,
+                                    cat_info AS category_description
                                FROM bmc_cats ORDER BY id;", $txpdb);
         if (!$res) {
             return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($txpdb));
@@ -198,13 +199,13 @@
         while ($a = mysql_fetch_assoc($res)) {
             foreach ($entries as $entry) {
                 if ($entry['id'] == $a['post'] ) {
-                    $username = '';
+                    $author   = '';
                     $mail     = '';
                     $url      = '';
                     if (!empty($a['author'])) {
                         foreach($users AS $user) {
                             if ($user['ID'] == $a['author']) {
-                                $username = $user['user_login'];
+                                $author = $user['user_login'];
                                 $mail = $user['user_email'];
                                 $url  = $user['user_url'];
                                 break;
@@ -212,8 +213,8 @@
                         }
                     }
 
-                    if (empty($username) && empty($mail)) {
-                        $username = $a['auth_name'];
+                    if (empty($author) && empty($mail)) {
+                        $author = $a['auth_name'];
                         $mail = $a['auth_email'];
                         $url = $a['auth_url'];
                     }
@@ -221,7 +222,7 @@
                     $comment = array('entry_id ' => $entry['entryid'],
                                      'parent_id' => 0,
                                      'timestamp' => $a['date'],
-                                     'author'    => $username,
+                                     'author'    => $author,
                                      'email'     => $mail,
                                      'url'       => $url,
                                      'ip'        => $a['auth_ip'],

[php-blog-cvs] serendipity/include/tpl config_personal.inc.php,1.7,1.8

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

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

Modified Files:
	config_personal.inc.php 
Log Message:
- Added ability to define a real name for each author
- Added serendipity_addAuthor() and serendipity_deleteAuthor functions

Version bump


Index: config_personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_personal.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- config_personal.inc.php	3 Feb 2005 18:25:15 -0000	1.7
+++ config_personal.inc.php	24 Feb 2005 20:14:24 -0000	1.8
@@ -12,7 +12,7 @@
                                           'title'       => USERCONF_USERNAME,
                                           'description' => USERCONF_USERNAME_DESC,
                                           'type'        => 'string',
-                                          'default'     => 'John',
+                                          'default'     => 'johndoe',
                                           'userlevel'   => USERLEVEL_EDITOR),
 
                                     array('var'         => 'password',
@@ -22,6 +22,13 @@
                                           'default'     => '',
                                           'userlevel'   => USERLEVEL_EDITOR),
 
+                                    array('var'         => 'realname',
+                                          'title'       => USERCONF_REALNAME,
+                                          'description' => USERCONF_REALNAME_DESC,
+                                          'type'        => 'string',
+                                          'default'     => 'John Doe',
+                                          'userlevel'   => USERLEVEL_EDITOR),
+
                                     array('var'         => 'userlevel',
                                           'title'       => USERCONF_USERLEVEL,
                                           'description' => USERCONF_USERLEVEL_DESC,

[php-blog-cvs] serendipity/include functions.inc.php,1.22,1.23 functions_comments.inc.php,1.19,1.20 functions_config.inc.php,1.21,1.22 functions_entries.inc.php,1.58,1.59 functions_smarty.inc.php,1.14,1.15 plugin_internal.inc.php,1.24,1.25

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

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

Modified Files:
	functions.inc.php functions_comments.inc.php 
	functions_config.inc.php functions_entries.inc.php 
	functions_smarty.inc.php plugin_internal.inc.php 
Log Message:
- Added ability to define a real name for each author
- Added serendipity_addAuthor() and serendipity_deleteAuthor functions

Version bump


Index: functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- functions_config.inc.php	16 Feb 2005 12:36:19 -0000	1.21
+++ functions_config.inc.php	24 Feb 2005 20:14:22 -0000	1.22
@@ -2,9 +2,27 @@
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
-function serendipity_remove_config_var($name, $authorid = 0) {
+function serendipity_addAuthor($username, $password, $realname, $email, $userlevel=0) {
+    global $serendipity;
+    $password = md5($password);
+    $query = "INSERT INTO {$serendipity['dbPrefix']}authors (username, password, realname, email, userlevel)
+                        VALUES  ('" . serendipity_db_escape_string($username) . "',
+                                 '" . serendipity_db_escape_String($password) . "',
+                                 '" . serendipity_db_escape_String($realname) . "',
+                                 '" . serendipity_db_escape_String($email) . "',
+                                 '" . serendipity_db_escape_String($userlevel) . "')";
+    serendipity_db_query($query);
+    return serendipity_db_insert_id('authors', 'authorid');
+}
+
+function serendipity_deleteAuthor($authorid) {
     global $serendipity;
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}authors WHERE authorid=" . (int)$authorid ." and userlevel <= ". (int)$serendipity['serendipityUserlevel'] ." LIMIT 1");
+    return true;
+}
 
+function serendipity_remove_config_var($name, $authorid = 0) {
+    global $serendipity;
     serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . (int)$authorid);
 }
 

Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- functions_smarty.inc.php	26 Jan 2005 14:14:02 -0000	1.14
+++ functions_smarty.inc.php	24 Feb 2005 20:14:22 -0000	1.15
@@ -86,7 +86,7 @@
         $comments[] =
             array(
                     'email'     => $serendipity['POST']['email'],
-                    'username'  => $serendipity['POST']['name'],
+                    'author'    => $serendipity['POST']['name'],
                     'body'      => $serendipity['POST']['comment'],
                     'url'       => $serendipity['POST']['url'],
                     'parent_id' => $serendipity['POST']['replyTo'],

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- functions_entries.inc.php	18 Feb 2005 19:48:10 -0000	1.58
+++ functions_entries.inc.php	24 Feb 2005 20:14:22 -0000	1.59
@@ -233,7 +233,7 @@
                     e.allow_comments,
                     e.last_modified,
 
-                    a.username,
+                    a.realname AS author,
                     a.email
 
                     $body
@@ -311,7 +311,7 @@
 
     $querystring = "SELECT
                             *,
-                            a.username,
+                            a.realname AS author,
                             a.email
                       FROM
                             {$serendipity['dbPrefix']}entries e
@@ -461,7 +461,7 @@
     $querystring = "SELECT $distinct
                             e.id,
                             e.author,
-                            a.username,
+                            a.realname AS author,
                             a.email,
                             ec.categoryid,
                             e.timestamp,
@@ -598,7 +598,7 @@
             $entry['link_rdf']               = serendipity_rewriteURL(PATH_FEEDS . '/ei_'. $entry['id'] .'.rdf');
             $entry['link_viewmode_threaded'] = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&amp;serendipity[cview]='. VIEWMODE_THREADED;
             $entry['link_viewmode_linear']   = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&amp;serendipity[cview]='. VIEWMODE_LINEAR;
-            $entry['link_username']          = serendipity_rewriteURL(PATH_AUTHORS .'/'. serendipity_makePermalink(PERM_AUTHORS, array('id' => $entry['authorid'], 'title' => $entry['username'])));
+            $entry['link_username']          = serendipity_rewriteURL(PATH_AUTHORS .'/'. serendipity_makePermalink(PERM_AUTHORS, array('id' => $entry['authorid'], 'title' => $entry['author'])));
 
             if (is_array($entry['categories'])) {
                 foreach ($entry['categories'] as $k => $v) {
@@ -689,7 +689,7 @@
             $entryLink = serendipity_archiveURL($id, $entry['title']);
             if ($comments == true) {
                 // Display username as part of the title for easier feed-readability
-                $entry['title'] = $entry['username'] . ': ' . $entry['title'];
+                $entry['title'] = $entry['realname'] . ': ' . $entry['title'];
             }
 
             // Embed a link to extended entry, if existing
@@ -712,7 +712,7 @@
             if (isset($entry['no_email']) && $entry['no_email']) {
                 $entry['email'] = '';
             } elseif (empty($entry['email'])) {
-                $query = "select email FROM {$serendipity['dbPrefix']}authors WHERE username = '". serendipity_db_escape_string($entry['username']) ."'";
+                $query = "select email FROM {$serendipity['dbPrefix']}authors WHERE authorid = '". serendipity_db_escape_string($entry['authorid']) ."'";
                 $results = serendipity_db_query($query);
                 $entry['email'] = $results[0]['email'];
             }
@@ -727,7 +727,7 @@
 <entry>
     <link href="<?php echo $entryLink; ?>" rel="alternate" title="<?php echo serendipity_utf8_encode(htmlspecialchars($entry['title'])); ?>" type="text/html" />
     <author>
-        <name><?php echo serendipity_utf8_encode(htmlspecialchars($entry['username'])); ?></name>
+        <name><?php echo serendipity_utf8_encode(htmlspecialchars($entry['author'])); ?></name>
         <email><?php echo serendipity_utf8_encode(htmlspecialchars($entry['email'])); ?></email>
     </author>
 
@@ -781,7 +781,7 @@
 <?php
                     }
 ?>
-    <author><?php echo serendipity_utf8_encode(htmlspecialchars($entry['email'])) . ' (' . serendipity_utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></author>
+    <author><?php echo serendipity_utf8_encode(htmlspecialchars($entry['email'])) . ' (' . serendipity_utf8_encode(htmlspecialchars($entry['author'])) . ')'; ?></author>
     <content:encoded>
 <?php
                     echo serendipity_utf8_encode(htmlspecialchars($entry['body'].$ext));
@@ -828,7 +828,7 @@
       echo $entry['display_dat'];
     ?>
     <dc:publisher><?php echo serendipity_utf8_encode(htmlspecialchars($serendipity['blogTitle'])); ?></dc:publisher>
-    <dc:creator><?php echo serendipity_utf8_encode(htmlspecialchars($entry['email'])) . ' (' . serendipity_utf8_encode(htmlspecialchars($entry['username'])) . ')'; ?></dc:creator>
+    <dc:creator><?php echo serendipity_utf8_encode(htmlspecialchars($entry['email'])) . ' (' . serendipity_utf8_encode(htmlspecialchars($entry['author'])) . ')'; ?></dc:creator>
     <dc:subject><?php echo serendipity_utf8_encode(htmlspecialchars(implode(', ', $categories))); ?></dc:subject>
     <dc:date><?php echo date('Y-m-d\TH:i:s\Z', serendipity_serverOffsetHour($entry['timestamp'])); ?></dc:date>
     <wfw:comment><?php echo $serendipity['baseURL']; ?>wfwcomment.php?cid=<?php echo $id; ?></wfw:comment>
@@ -1117,7 +1117,7 @@
 
     serendipity_plugin_api::hook_event('backend_entryform', $entry);
 
-    if ( (isset($entry['isdraft']) && $entry['isdraft'] == 'true') || 
+    if ( (isset($entry['isdraft']) && $entry['isdraft'] == 'true') ||
          (!isset($entry['isdraft']) && $serendipity['publishDefault'] == 'draft') ) {
         $draftD = ' selected="selected"';
     } else {

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- functions.inc.php	19 Feb 2005 12:02:41 -0000	1.22
+++ functions.inc.php	24 Feb 2005 20:14:22 -0000	1.23
@@ -147,7 +147,7 @@
         $where = "WHERE authorid = '" . (int)$user ."'";
     }
 
-    $querystring = "SELECT * FROM {$serendipity['dbPrefix']}authors $where ORDER BY username ASC";
+    $querystring = "SELECT * FROM {$serendipity['dbPrefix']}authors $where ORDER BY realname ASC";
 
     return serendipity_db_query($querystring);
 }

Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- plugin_internal.inc.php	22 Feb 2005 10:50:36 -0000	1.24
+++ plugin_internal.inc.php	24 Feb 2005 20:14:22 -0000	1.25
@@ -939,11 +939,11 @@
         global $serendipity;
         switch($name) {
             case 'authorid':
-                $row_authors = serendipity_db_query("SELECT username, authorid FROM {$serendipity['dbPrefix']}authors");
+                $row_authors = serendipity_db_query("SELECT realname, authorid FROM {$serendipity['dbPrefix']}authors");
                 $authors     = array('all' => ALL_AUTHORS);
                 if (is_array($row_authors)) {
                     foreach($row_authors as $row) {
-                        $authors[$row['authorid']] = $row['username'];
+                        $authors[$row['authorid']] = $row['realname'];
                     }
                 }
 

Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- functions_comments.inc.php	17 Feb 2005 11:46:18 -0000	1.19
+++ functions_comments.inc.php	24 Feb 2005 20:14:22 -0000	1.20
@@ -95,7 +95,7 @@
     $query = "SELECT $distinct
                     co.id,
                     co.entry_id, co.timestamp, co.title, co.email, co.url, co.ip, co.body, co.type, co.subscribed,
-                    co.author AS username,
+                    co.author,
                     e.title,
                     e.id AS entryid,
                     e.authorid,
@@ -136,7 +136,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('&#160;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . serendipity_mb('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['author']) ? ANONYMOUS : htmlspecialchars($comment['author'])) . ' ' . ON . ' ' . serendipity_mb('ucfirst', serendipity_strftime(DATE_FORMAT_SHORT, $comment['timestamp'])) . "</option>\n";
             $retval .= serendipity_generateCommentList($id, $comments, $selected, $comment['id'], $level + 1, $indent . $i . '.');
         }
     }
@@ -185,7 +185,6 @@
                 $comment['email'] = str_replace('@', '[at]', $comment['email']);
             }
 
-            $comment['author']  = $comment['username'];
             $comment['body']    = $comment['comment'];
             $comment['pos']     = $i;
             $comment['trace']   = $trace . $i;