php-blog-cvs — Serendipity commit list

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

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

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

Modified Files:
	installer.inc.php 
Log Message:
- Check post_max_size, thanks messju


Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- installer.inc.php	25 Dec 2004 00:37:57 -0000	1.15
+++ installer.inc.php	29 Dec 2004 19:07:06 -0000	1.16
@@ -301,6 +301,17 @@
      ?></td>
     </tr>
     <tr>
+      <td>post_max_size</td>
+      <td width="150"><strong>10M</strong></td>
+      <td width="150"><?php
+            if ( serendipity_ini_bytesize(ini_get('post_max_size')) >= (10*1024*1024) ) {
+                echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, ini_get('post_max_size'));
+            } else {
+                echo serendipity_installerResultDiagnose(S9Y_I_WARNING, ini_get('post_max_size'));
+            }
+     ?></td>
+    </tr>
+    <tr>
       <td>upload_max_filesize</td>
       <td width="150"><strong>10M</strong></td>
       <td width="150"><?php

[php-blog-cvs] serendipity/plugins/serendipity_event_spartacus serendipity_event_spartacus.php,NONE,1.1

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

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

Added Files:
	serendipity_event_spartacus.php 
Log Message:
groundwork for SPARTACUS. See mailinglist.


--- NEW FILE: serendipity_event_spartacus.php ---
<?php # $Id: serendipity_event_spartacus.php,v 1.1 2004/12/29 14:06:05 garvinhicking Exp $

/************
  TODO:

  - If a plugin is already installed, try to detect if version numbers match. Show "update" icon in case of a newer version, show "already installed" in case of same version
  - Perform Serendipity version checks to only install plugins available for version
  - Allow fetching files from mirrors / different locations - don't use ViewCVS hack (revision 1.999 dumbness)

 ***********/

switch ($serendipity['lang']) {
    case 'en':
    default:
        @define('PLUGIN_EVENT_SPARTACUS_NAME', 'Spartacus');
        @define('PLUGIN_EVENT_SPARTACUS_DESC', '[S]erendipity [P]lugin [A]ccess [R]epository [T]ool [A]nd [C]ustomization/[U]nification [S]ystem - Allows you to download plugins from our online repository');
        @define('PLUGIN_EVENT_SPARTACUS_FETCH', 'Click here to fetch a new %s from the Serendipity Online Repository');
        @define('PLUGIN_EVENT_SPARTACUS_FETCHERROR', 'The URL %s could not be opened. Maybe the Serendipity or SourceForge.net Server is down - we are sorry, you need to try again later.');
        @define('PLUGIN_EVENT_SPARTACUS_FETCHING', 'Trying to open URL %s...');
        break;
}

class serendipity_event_spartacus extends serendipity_event
{
    var $title = PLUGIN_EVENT_SPARTACUS_NAME;

    function introspect(&$propbag)
    {
        global $serendipity;

        $propbag->add('name',          PLUGIN_EVENT_SPARTACUS_NAME);
        $propbag->add('description',   PLUGIN_EVENT_SPARTACUS_DESC);
        $propbag->add('stackable',     false);
        $propbag->add('author',        'Garvin Hicking');
        $propbag->add('version',       '1.0');
        $propbag->add('event_hooks',    array(
            'backend_plugins_sidebar_header' => true,
            'backend_plugins_event_header'   => true,

            'backend_plugins_fetchlist'      => true,
            'backend_plugins_fetchplugin'    => true
        ));
    }

    function generate_content(&$title) {
        $title = $this->title;
    }

    function GetChildren(&$vals, &$i) {
        $children = array();
        $cnt = sizeof($vals);
        while (++$i < $cnt) {
            // compare type
            switch ($vals[$i]['type']) {
                case 'cdata':
                    $children[] = $vals[$i]['value'];
                    break;

                case 'complete':
                    $children[] = array(
                        'tag'        => $vals[$i]['tag'],
                        'attributes' => $vals[$i]['attributes'],
                        'value'      => $vals[$i]['value']
                    );
                    break;

                case 'open':
                    $children[] = array(
                        'tag'        => $vals[$i]['tag'],
                        'attributes' => $vals[$i]['attributes'],
                        'value'      => $vals[$i]['value'],
                        'children'   => $this->GetChildren($vals, $i)
                    );
                    break;

                case 'close':
                    return $children;
            }
        }
    }

    function &fetchfile($url, $target, $cacheTimeout = 0) {
        printf(PLUGIN_EVENT_SPARTACUS_FETCHING, '<a href="' . $url . '">' . serendipity_truncateString($url, 68) . '</a>');
        echo '<br />';

        if (file_exists($target) && filesize($target) > 0 && filemtime($target) >= (time()-$cacheTimeout)) {
            $data = file_get_contents($target);
        } else {
            require_once "HTTP/Request.php";
            $req = &new HTTP_Request($url);

            if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') {
                printf(PLUGIN_EVENT_SPARTACUS_FETCHERROR, $url);
                if (file_exists($target) && filesize($target) > 0) {
                    $data = file_get_contents($target);
                }
            } else {
                // Fetch file
                $data = $req->getResponseBody();
                $fp = @fopen($target, 'w');
                if ($fp) {
                    fwrite($fp, $data);
                    fclose($fp);
                } else {
                    printf(FILE_WRITE_ERROR, $target);
                }
            }
        }

        return $data;
    }

    function &fetchOnline($type) {
        switch($type) {
            // Sanitize to not fetch other URLs
            default:
            case 'event':
                $url_type = 'event';
                break;

            case 'sidebar':
                $url_type = 'sidebar';
                break;
        }

        $url    = 'http://netmirror.org/mirror/serendipity/package_' . $url_type . '.xml';
        $cacheTimeout = 60*60*12; // XML file is cached for half a day
        $target = dirname(__FILE__) . '/package_' . $url_type . '.xml';

        $xml = $this->fetchfile($url, $target, $cacheTimeout);

        echo '<br /><br />';

        // XML functions
        $p = xml_parser_create();
        xml_parser_set_option($p, XML_OPTION_CASE_FOLDING, 0);
        xml_parse_into_struct($p, $xml, $vals, $index);
        xml_parser_free($p);

        $i = 0;
        $tree = array();
        $tree[] = array(
            'tag'        => $vals[$i]['tag'],
            'attributes' => $vals[$i]['attributes'],
            'value'      => $vals[$i]['value'],
            'children'   => $this->GetChildren($vals, $i)
        );

        return $tree;
    }

    function &buildList(&$tree, $type) {
        $plugins = serendipity_plugin_api::get_installed_plugins();
        $pluginstack = array();
        $i = 0;

        foreach($tree[0]['children'] AS $idx => $subtree) {
            if ($subtree['tag'] == 'package') {
                $i++;
                foreach($subtree['children'] AS $child => $childtree) {
                    switch($childtree['tag']) {
                        case 'name':
                            $pluginstack[$i]['plugin_class'] = $childtree['value'];
                            $pluginstack[$i]['class_name']   = $childtree['value'];
                            break;

                        case 'summary':
                            $pluginstack[$i]['name']         = $childtree['value'];
                            break;

                        case 'description':
                            $pluginstack[$i]['desc']         = $childtree['value'];
                            break;

                        case 'release':
                            $pluginstack[$i]['version']      = $childtree['children'][0]['value'];
                            break;

                        case 'maintainers':
                            $pluginstack[$i]['author']       = $childtree['children'][0]['children'][0]['value']; // I dig my PHP arrays ;-)
                            break;
                    }
                }

                $pluginstack[$i]['installable'] = !in_array($pluginstack[$i]['class_name'], $plugins);
                $pluginstack[$i]['pluginPath']  = 'online_repository';
                $pluginstack[$i]['customURI']   = '&amp;serendipity[spartacus_fetch]=' . $type;
            }
        }

        return $pluginstack;
    }

    function download(&$tree, $plugin_to_install) {
        global $serendipity;

        $pdir = $serendipity['serendipityPath'] . '/plugins/';
        if (!is_writable($pdir)) {
            printf(DIRECTORY_WRITE_ERROR, $pdir);
            return false;
        }

        $files = array();
        $found = false;
        foreach($tree[0]['children'] AS $idx => $subtree) {
            if ($subtree['tag'] != 'package') {
                continue;
            }

            foreach($subtree['children'] AS $child => $childtree) {
                if ($childtree['tag'] == 'name' && $childtree['value'] == $plugin_to_install) {
                    $found = true;
                }

                if (!$found || $childtree['tag'] != 'release') {
                    continue;
                }

                foreach($childtree['children'] AS $child2 => $childtree2) {
                    if ($childtree2['tag'] != 'serendipityFilelist') {
                        continue;
                    }

                    foreach($childtree2['children'] AS $idx => $_files) {
                        if ($_files['tag'] == 'file' && !empty($_files['value'])) {
                            $files[] = $_files['value'];
                        }
                    }
                }

                $found = false;
            }
        }

        foreach($files AS $file) {
            $url    = 'http://cvs.sourceforge.net/viewcvs.py/*checkout*/php-blog/additional_plugins/' . $file . '?rev=1.9999';
            $target = $pdir . $file;
            @mkdir($pdir . $plugin_to_install);
            $this->fetchfile($url, $target);
        }
    }

    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;

        $hooks = &$bag->get('event_hooks');

        if (isset($hooks[$event])) {
            switch($event) {
                case 'backend_plugins_sidebar_header':
?>
    <br /><a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/install.png') ?>" style="border: 0px none ; vertical-align: middle; display: inline;" alt=""><?php echo sprintf(PLUGIN_EVENT_SPARTACUS_FETCH, SIDEBAR_PLUGIN) ?></a>
<?php
                    return true;
                    break;

                case 'backend_plugins_event_header':
?>
    <br /><a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[type]=event" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/install.png') ?>" style="border: 0px none ; vertical-align: middle; display: inline;" alt=""><?php echo sprintf(PLUGIN_EVENT_SPARTACUS_FETCH, EVENT_PLUGIN) ?></a>
<?php
                    return true;
                    break;

                case 'backend_plugins_fetchlist':
                    $type = (isset($serendipity['GET']['type']) ? $serendipity['GET']['type'] : 'sidebar');

                    $eventData = array(
                                   'pluginstack' => $this->buildList($this->fetchOnline($type), $type),
                                   'errorstack'  => array()
                    );

                    return false;
                    break;

                case 'backend_plugins_fetchplugin':
                    if (!empty($eventData['spartacus_fetch'])) {
                        $this->download($this->fetchOnline($eventData['spartacus_fetch']), $eventData['install_plugin']);
                        $eventData['pluginPath'] = $eventData['install_plugin'];
                    }

                    return false;
                    break;

                default:
                    return false;
                    break;
            }
        } else {
            return false;
        }
    }
}

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

[php-blog-cvs] serendipity/plugins/serendipity_event_spartacus - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/plugins/serendipity_event_spartacus added to the repository

[php-blog-cvs] serendipity/include/admin plugins.inc.php,1.9,1.10

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

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

Modified Files:
	plugins.inc.php 
Log Message:
add new property bag "type" called "content". Using the 'default' property bag value you can emit any HTML code you like on the plugin config. (See mailinglist)



Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- plugins.inc.php	22 Dec 2004 18:05:45 -0000	1.9
+++ plugins.inc.php	29 Dec 2004 10:18:06 -0000	1.10
@@ -452,6 +452,10 @@
                 }
                 break;
 
+            case 'content':
+                ?><tr><td colspan="2"><?php echo $cbag->get('default'); ?></td></tr><?php
+                break;
+
             case 'hidden':
                 ?><tr><td colspan="2"><input type="hidden" name="serendipity[plugin][<?php echo $config_item; ?>]" value="<?php echo $cbag->get('value'); ?>" /></td></tr><?php
                 break;

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

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

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

Modified Files:
	serendipity_event_mailer.php 
Log Message:
use new function serendipity_sendMail (right, Tom?)


Index: serendipity_event_mailer.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_mailer/serendipity_event_mailer.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_event_mailer.php	22 Dec 2004 11:32:45 -0000	1.9
+++ serendipity_event_mailer.php	29 Dec 2004 10:09:43 -0000	1.10
@@ -91,22 +91,20 @@
                 case 'backend_publish':
                     $mail = array(
                       'to'      => $this->get_config('mailto'),
-                      'subject' => '[' . $serendipity['blogTitle'] . '] ' . $eventData['title'],
+                      'subject' => $eventData['title'],
                       'body'    => $eventData['body'] . $eventData['extended'],
                       'from'    => $serendipity['blogTitle'] . ' - ' . $eventData['author'] . ' <' . $serendipity['serendipityEmail'] . '>'
                     );
 
                     if (serendipity_db_bool($this->get_config('striptags', false)) == true) {
-                       $mail['body'] = strip_tags($mail['body']) . $serendipity['signature'];
-                    } else {
-                        $mail['body'] .= $serendipity['signature'];
+                        $mail['body'] = strip_tags($mail['body']);
                     }
 
                     if (serendipity_db_bool($this->get_config('includelink', false)) == true) {
                        $mail['body'] = serendipity_archiveURL($eventData['id'], $eventData['title']) . "\n\n" . $mail['body'];
                     }
 
-                    mail($mail['to'], $mail['subject'], $mail['body'], "From: {$mail['from']}\r\n{$serendipity['mailheaders']}");
+                    serendipity_sendMail($mail['to'], $mail['subject'], $mail['body'], $mail['from']);
                     return true;
                     break;
 

[php-blog-cvs] serendipity/include functions.inc.php,1.13,1.14 functions_comments.inc.php,1.9,1.10

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

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

Modified Files:
	functions.inc.php functions_comments.inc.php 
Log Message:
Create serendipity_sendMail() which makes it a lot easier to send mail :)
It also supports mb_send_mail() so we can send mails with multibyte chars



Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- functions_comments.inc.php	3 Dec 2004 10:07:39 -0000	1.9
+++ functions_comments.inc.php	28 Dec 2004 17:49:44 -0000	1.10
@@ -359,7 +359,7 @@
     global $serendipity;
 
     $entryURI = serendipity_archiveURL($entry_id, $title, 'baseURL');
-    $subject =  '[' . $serendipity['blogTitle'] . '] ' . sprintf(NEW_COMMENT_TO_SUBSCRIBED_ENTRY, $title);
+    $subject =  sprintf(NEW_COMMENT_TO_SUBSCRIBED_ENTRY, $title);
 
     $pgsql_insert = '';
     $mysql_insert = '';
@@ -405,7 +405,7 @@
             );
         }
 
-        mail($subscriber['email'], $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} <$fromEmail>\r\n". $serendipity['mailheaders']);
+        serendipity_sendMail($subscriber['email'], $subject, $text, $fromEmail);
     }
 }
 
@@ -435,7 +435,7 @@
     if ($type == 'TRACKBACK') {
 
         /******************* TRACKBACKS *******************/
-        $subject =  '[' . $serendipity['blogTitle'] . '] ' . NEW_TRACKBACK_TO . ' ' . $title;
+        $subject =  NEW_TRACKBACK_TO . ' ' . $title;
         $text = sprintf(A_NEW_TRACKBACK_BLAHBLAH, $title)
               . "\n"
               . "\n" . REQUIRES_REVIEW          . ': ' . (($moderate_comment) ? YES : NO) . (isset($serendipity['moderate_reason']) ? ' (' . $serendipity['moderate_reason'] . ')' : '')
@@ -456,7 +456,7 @@
     } else {
 
         /******************* COMMENTS *********************/
-        $subject = '[' . $serendipity['blogTitle'] . '] ' . NEW_COMMENT_TO . ' ' . $title;
+        $subject = NEW_COMMENT_TO . ' ' . $title;
         $text = sprintf(A_NEW_COMMENT_BLAHBLAH, $serendipity['blogTitle'], $title)
               . "\n" . LINK_TO_ENTRY . ': ' . $entryURI
               . "\n"
@@ -477,5 +477,5 @@
               . (($moderate_comment) ? "\n" . str_repeat(' ', 3) . str_pad(APPROVE_COMMENT, 15) . ' -- '. $approveURI : '');
     }
 
-    return mail($to, $subject,  $text . $serendipity['signature'], "From: {$serendipity['blogTitle']} - $fromName <$to>". (!empty($fromEmail) ? "\r\nReply-To: $fromEmail" : ''). "\r\n". $serendipity['mailheaders']);
+    return serendipity_sendMail($to, $subject, $text, $fromEmail);
 }

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- functions.inc.php	22 Dec 2004 17:44:52 -0000	1.13
+++ functions.inc.php	28 Dec 2004 17:49:44 -0000	1.14
@@ -149,9 +149,39 @@
     return serendipity_db_query($querystring);
 }
 
-/**
-*  Creates a filename that consists of [a-zA-z0-9-] (with some custom adjustments (space -> _, ä -> ae and such)
-**/
+
+function serendipity_sendMail($to, $subject, $message, $fromMail, $headers = NULL, $fromName = NULL) {
+    global $serendipity;
+
+    if ( !is_null($headers) && !is_array($headers) ) {
+        trigger_error(__FUNCTION__ . ': $headers must be either an array or null', E_USER_ERROR);
+    }
+
+    if ( is_null($fromName) ) {
+        $fromName = $serendipity['blogTitle'];
+    }
+
+    /* Prefix all mail with weblog title */
+    $subject = '['. $serendipity['blogTitle'] . '] '.  $subject;
+
+    /* Append signature to every mail */
+    $message .= "\n" . sprintf(SIGNATURE, $serendipity['blogTitle']);
+
+    /* Always add these headers */
+    $headers[] = 'X-Mailer: Serendipity/'. $serendipity['version'];
+    $headers[] = 'X-Engine: PHP/'. phpversion();
+    $headers[] = 'Content-Type: text/plain; charset=' . LANG_CHARSET;
+    $headers[] = 'From: '. $fromName .' <'. $fromMail .'>';
+
+    if ( function_exists('mb_send_mail') ) {
+        $funcSend = 'mb_send_mail';
+    } else {
+        $funcSend = 'mail';
+    }
+
+    return $funcSend($to, $subject, $message, implode("\n", $headers));
+}
+
 function serendipity_makeFilename($str) {
     static $from = array(
                      ' ',

[php-blog-cvs] serendipity serendipity_config.inc.php,1.122,1.123

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Create serendipity_sendMail() which makes it a lot easier to send mail :)
It also supports mb_send_mail() so we can send mails with multibyte chars



Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- serendipity_config.inc.php	28 Dec 2004 13:59:23 -0000	1.122
+++ serendipity_config.inc.php	28 Dec 2004 17:49:43 -0000	1.123
@@ -266,14 +266,6 @@
     $serendipity['email'] = $_SESSION['serendipityEmail'];
 }
 
-/* Signature sent with all mails */
-$serendipity['signature'] = sprintf(SIGNATURE, $serendipity['blogTitle']);
-
-/* Default mail headers */
-$serendipity['mailheaders'] = 'X-Mailer: Serendipity/'. $serendipity['version'] . "\n"
-                            . 'X-Engine: PHP/'. phpversion() . "\n"
-                            . 'Content-Type: text/plain; charset=' . LANG_CHARSET;
-
 serendipity_plugin_api::hook_event('frontend_configure', $serendipity);
 
 /* vim: set sts=4 ts=4 expandtab : */

[php-blog-cvs] serendipity serendipity_config.inc.php,1.121,1.122

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
thanks tom :)


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- serendipity_config.inc.php	28 Dec 2004 13:16:03 -0000	1.121
+++ serendipity_config.inc.php	28 Dec 2004 13:59:23 -0000	1.122
@@ -271,7 +271,7 @@
 
 /* Default mail headers */
 $serendipity['mailheaders'] = 'X-Mailer: Serendipity/'. $serendipity['version'] . "\n"
-                            . 'X-Engine: PHP/'. phpversion()
+                            . 'X-Engine: PHP/'. phpversion() . "\n"
                             . 'Content-Type: text/plain; charset=' . LANG_CHARSET;
 
 serendipity_plugin_api::hook_event('frontend_configure', $serendipity);

[php-blog-cvs] serendipity serendipity_config.inc.php,1.120,1.121

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
make emails use the charset of the blog


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- serendipity_config.inc.php	22 Dec 2004 17:44:51 -0000	1.120
+++ serendipity_config.inc.php	28 Dec 2004 13:16:03 -0000	1.121
@@ -271,7 +271,8 @@
 
 /* Default mail headers */
 $serendipity['mailheaders'] = 'X-Mailer: Serendipity/'. $serendipity['version'] . "\n"
-                            . 'X-Engine: PHP/'. phpversion();
+                            . 'X-Engine: PHP/'. phpversion()
+                            . 'Content-Type: text/plain; charset=' . LANG_CHARSET;
 
 serendipity_plugin_api::hook_event('frontend_configure', $serendipity);
 

[php-blog-cvs] serendipity/include plugin_internal.inc.php,1.18,1.19

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

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

Modified Files:
	plugin_internal.inc.php 
Log Message:
- Revert back to old Nested Category vs. XML Icon display style


Index: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/plugin_internal.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- plugin_internal.inc.php	22 Dec 2004 18:27:30 -0000	1.18
+++ plugin_internal.inc.php	28 Dec 2004 11:40:47 -0000	1.19
@@ -973,11 +973,11 @@
         if (is_array($categories) && count($categories)) {
             $categories = serendipity_walkRecursive($categories, 'categoryid', 'parentid', VIEWMODE_THREADED);
             foreach ( $categories as $cat ) {
-                $html .= '<div style="padding-bottom: 2px; padding-left: '. $cat['depth']*5 .'px">';
+                $html .= '<div style="padding-bottom: 2px;>';
                 if ( !empty($image) ) {
                     $html .= '<a href="'. $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] .'"><img src="'. $image .'" alt="XML" border="0" style="vertical-align: bottom; display: inline; border: 0px" /></a> ';
                 }
-                $html .= '<a href="'. serendipity_rewriteURL(PATH_CATEGORIES . '/' . serendipity_makePermalink(PERM_CATEGORIES, array('id' => $cat['categoryid'], 'title' => $cat['category_name'])), 'serendipityHTTPPath') .'" title="'. $cat['category_name'] .'">'. $cat['category_name'] .'</a>';
+                $html .= '<a href="'. serendipity_rewriteURL(PATH_CATEGORIES . '/' . serendipity_makePermalink(PERM_CATEGORIES, array('id' => $cat['categoryid'], 'title' => $cat['category_name'])), 'serendipityHTTPPath') .'" title="'. $cat['category_name'] .'" style="padding-left: '. $cat['depth']*6 .'px">'. $cat['category_name'] .'</a>';
                 $html .= '</div>' . "\n";
             }
         }

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.17,1.18

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

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

Modified Files:
	comments.inc.php 
Log Message:
Fix the Show/Hide link to work with an icon


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- comments.inc.php	26 Dec 2004 22:34:30 -0000	1.17
+++ comments.inc.php	26 Dec 2004 22:53:30 -0000	1.18
@@ -160,12 +160,13 @@
     if ( document.getElementById(id + '_full').style.display == '' ) {
         document.getElementById(id + '_full').style.display='none';
         document.getElementById(id + '_summary').style.display='';
-        document.getElementById(id + '_link').innerHTML = '<?php echo VIEW ?>';
+        document.getElementById(id + '_text').innerHTML = '<?php echo VIEW ?>';
     } else {
         document.getElementById(id + '_full').style.display='';
         document.getElementById(id + '_summary').style.display='none';
-        document.getElementById(id + '_link').innerHTML = '<?php echo HIDE ?>';
+        document.getElementById(id + '_text').innerHTML = '<?php echo HIDE ?>';
     }
+    return false;
 }
 function invertSelection() {
     var f = document.formMultiDelete;
@@ -334,7 +335,7 @@
           <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>" class="serendipityIconLink" title="<?php echo APPROVE; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/accept.png'); ?>" alt="<?php echo APPROVE ?>" /><?php echo APPROVE ?></a>
 <?php } ?>
 <?php if (strlen($fullBody) > strlen($summary) ) { ?>
-          <a href="#c<?php echo $rs['id'] ?>" onclick="toggle(<?php echo $rs['id'] ?>); return false;" id="<?php echo $rs['id'] ?>_link" title="<?php echo VIEW; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" style="border: 0px none ; vertical-align: bottom;" /></a>
+          <a href="#c<?php echo $rs['id'] ?>" onclick="toggle(<?php echo $rs['id'] ?>); return false;" title="<?php echo VIEW; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><span id="<?php echo $rs['id'] ?>_text"><?php echo VIEW ?></span></a>
 <?php } ?>
           <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" title="<?php echo EDIT; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>
           <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" onclick="return confirm('<?php echo sprintf(COMMENT_DELETE_CONFIRM, $rs['id'], htmlspecialchars($rs['author'])) ?>')" title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>

[php-blog-cvs] serendipity/templates/default/admin/img zoom.png,1.2,1.3

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

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

Added Files:
	zoom.png 
Log Message:
Re-add zoom.png as a correctly sized icon


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

[php-blog-cvs] serendipity/templates/default/admin/img big_delete.png,NONE,1.1 big_rename.png,NONE,1.1 big_resize.png,NONE,1.1 big_rotate_ccw.png,NONE,1.1 big_rotate_cw.png,NONE,1.1 big_zoom.png,NONE,1.1 delete_image.png,1.1,NONE rename.png,1.1,NONE resize.png,1.1,NONE rotate_ccw.png,1.1,NONE rotate_cw.png,1.1,NONE zoom.png,1.1,NONE

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

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

Added Files:
	big_delete.png big_rename.png big_resize.png 
	big_rotate_ccw.png big_rotate_cw.png big_zoom.png 
Removed Files:
	delete_image.png rename.png resize.png rotate_ccw.png 
	rotate_cw.png zoom.png 
Log Message:
Apprently people get the size of the icons mixed up, so lets prefix them

# big_* is ONLY used in the image manager


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

--- rotate_cw.png DELETED ---

--- zoom.png DELETED ---

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

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

--- rename.png DELETED ---

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

--- rotate_ccw.png DELETED ---

--- delete_image.png DELETED ---

--- resize.png DELETED ---

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

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

[php-blog-cvs] serendipity/include functions_images.inc.php,1.20,1.21

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
Apprently people get the size of the icons mixed up, so lets prefix them

# big_* is ONLY used in the image manager


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- functions_images.inc.php	26 Dec 2004 18:34:33 -0000	1.20
+++ functions_images.inc.php	26 Dec 2004 22:41:34 -0000	1.21
@@ -917,12 +917,12 @@
                     $popupWidth = ($is_image ? ($file['dimensions_width'] + 20) : 600);
                     $popupHeight = ($is_image ? ($file['dimensions_height'] + 20) : 500);
 ?>
-                            <img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png') ?>"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /><br />
-                            <img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>" alt="<?php echo MEDIA_RENAME; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rename.png') ?>" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /><br />
-                            <?php if ($is_image) { ?><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo serendipity_getTemplateFile('admin/img/resize.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&amp;serendipity[adminAction]=scaleSelect&amp;serendipity[fid]=<?php echo $file['id']; ?>';" /><br /><?php } ?>
-                            <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=rotateCCW&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_LEFT; ?>" alt="<?php echo IMAGE_ROTATE_LEFT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rotate_ccw.png') ?>" border="0" /><br /><?php } ?>
-                            <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=rotateCW&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_RIGHT; ?>" alt="<?php echo IMAGE_ROTATE_RIGHT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rotate_cw.png') ?>" border="0" /><br /><?php } ?>
-                            <a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=delete&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo serendipity_getTemplateFile('admin/img/delete_image.png') ?>" border="0" /><br />
+                            <img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/big_zoom.png') ?>"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /><br />
+                            <img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>" alt="<?php echo MEDIA_RENAME; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/big_rename.png') ?>" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /><br />
+                            <?php if ($is_image) { ?><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo serendipity_getTemplateFile('admin/img/big_resize.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&amp;serendipity[adminAction]=scaleSelect&amp;serendipity[fid]=<?php echo $file['id']; ?>';" /><br /><?php } ?>
+                            <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=rotateCCW&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_LEFT; ?>" alt="<?php echo IMAGE_ROTATE_LEFT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/big_rotate_ccw.png') ?>" border="0" /><br /><?php } ?>
+                            <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=rotateCW&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_RIGHT; ?>" alt="<?php echo IMAGE_ROTATE_RIGHT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/big_rotate_cw.png') ?>" border="0" /><br /><?php } ?>
+                            <a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=delete&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo serendipity_getTemplateFile('admin/img/big_delete.png') ?>" border="0" /><br />
 <?php
                 }
 ?>

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.16,1.17

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

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

Modified Files:
	comments.inc.php 
Log Message:
Make "email" and "link" links - this required a little restructuring, sadly


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- comments.inc.php	26 Dec 2004 21:21:38 -0000	1.16
+++ comments.inc.php	26 Dec 2004 22:34:30 -0000	1.17
@@ -264,18 +264,6 @@
     if (empty($rs['author'])) {
         $rs['author'] = ANONYMOUS;
     }
-    if (empty($rs['ip'])) {
-        $rs['ip'] = '0.0.0.0';
-    }
-    if (empty($rs['email'])) {
-        $rs['email'] = 'N/A';
-    }
-    if (empty($rs['url'])) {
-        $rs['url'] = 'N/A';
-    }
-    if (empty($rs['referer'])) {
-#        $rs['referer'] = 'N/A';
-    }
 
     $fullBody = nl2br(strip_tags($rs['body']));
     $summary = serendipity_mb('substr', $fullBody, 0, $summaryLength);
@@ -298,15 +286,43 @@
             <tr>
                 <td rowspan="3" width="20" align="center"><input type="checkbox" name="serendipity[delete][<?php echo $rs['id'] ?>]" value="<?php echo $rs['entry_id'] ?>" onclick="highlightComment('comment_<?php echo $rs['id'] ?>', this.checked)" tabindex="<?php echo $i ?>" /></td>
                 <td width="40%"><strong><?php echo AUTHOR ?></strong>: <?php echo htmlspecialchars($rs['author']) ?></td>
-                <td><strong><?php echo EMAIL ?></strong>: <?php echo htmlspecialchars($rs['email']) ?></td>
+                <td><strong><?php echo EMAIL ?></strong>:
+                    <?php
+                        if ( empty($rs['email']) ) {
+                            echo 'N/A';
+                        } else {
+                    ?>
+                            <a href="mailto:<?php echo htmlspecialchars($rs['email']) ?>"><?php echo htmlspecialchars($rs['email']) ?></a>
+                    <?php } ?></td>
             </tr>
             <tr>
-                <td width="40%"><strong>IP</strong>: <?php echo htmlspecialchars($rs['ip']) ?></td>
-                <td><strong><?php echo URL; ?></strong>: <?php echo htmlspecialchars($rs['url']) ?></td>
+                <td width="40%"><strong>IP</strong>:
+                    <?php
+                        if ( empty($rs['ip']) ) {
+                            echo '0.0.0.0';
+                        } else {
+                            echo htmlspecialchars($rs['ip']);
+                        }
+                    ?></td>
+                <td><strong><?php echo URL; ?></strong>:
+                    <?php
+                        if ( empty($rs['url']) ) {
+                            echo 'N/A';
+                        } else {
+                    ?>
+                            <a href="<?php echo htmlspecialchars($rs['url']) ?>" target="_blank"><?php echo htmlspecialchars($rs['url']) ?></a>
+                    <?php } ?></td>
             </tr>
             <tr>
                 <td width="40%">&nbsp;</td>
-                <td><strong><?php echo REFERER; ?></strong>: <a href="<?php echo htmlspecialchars($rs['referer']) ?>" title="<?php echo htmlspecialchars($rs['referer']) ?>"><?php echo htmlspecialchars(serendipity_truncateString($rs['referer'],30)) ?></a></td>
+                <td><strong><?php echo REFERER; ?></strong>:
+                    <?php
+                        if ( empty($rs['referer']) ) {
+                            echo 'N/A';
+                        } else {
+                    ?>
+                          <a href="<?php echo htmlspecialchars($rs['referer']) ?>" title="<?php echo htmlspecialchars($rs['referer']) ?>"><?php echo htmlspecialchars(serendipity_truncateString($rs['referer'],30)) ?></a>
+                    <?php } ?></td>
             <tr>
                 <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="3">
                     <div id="<?php echo $rs['id'] ?>_summary"><?php echo $summary ?></div>

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

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

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

Modified Files:
	category.inc.php 
Log Message:
- Fix invalid markup
- Add some alt="" attributes to images


Index: category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/category.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- category.inc.php	23 Dec 2004 01:51:19 -0000	1.5
+++ category.inc.php	26 Dec 2004 21:38:56 -0000	1.6
@@ -124,7 +124,7 @@
     <tr>
         <td><?php echo NAME; ?></td>
         <td><input type="text" name="serendipity[cat][name]" value="<?php echo isset($this_cat['category_name']) ? htmlspecialchars($this_cat['category_name']) : ''; ?>" /></td>
-        <td rowspan="5" align="center" valign="middle" width="200" style="border: 1px solid #ccc"><img src="<?php echo isset($this_cat['category_icon']) ? $this_cat['category_icon'] : '' ?>" id="imagepreview" <?php echo empty($this_cat['category_icon']) ? 'style="display: none' : '' ?>"></td>
+        <td rowspan="5" align="center" valign="middle" width="200" style="border: 1px solid #ccc"><img src="<?php echo isset($this_cat['category_icon']) ? $this_cat['category_icon'] : '' ?>" id="imagepreview" <?php echo empty($this_cat['category_icon']) ? 'style="display: none"' : '' ?>></td>
     </tr>
 
     <tr>
@@ -189,8 +189,8 @@
                 foreach ( $categories as $category ) {
 ?>
             <tr>
-                <td width="16"><a href="?serendipity[adminModule]=category&amp;serendipity[adminAction]=edit&amp;serendipity[cid]=<?php echo $category['categoryid'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png') ?>" border="0" /></a></td>
-                <td width="16"><a href="?serendipity[adminModule]=category&amp;serendipity[adminAction]=delete&amp;serendipity[cid]=<?php echo $category['categoryid'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png') ?>" border="0" /></a></td>
+                <td width="16"><a href="?serendipity[adminModule]=category&amp;serendipity[adminAction]=edit&amp;serendipity[cid]=<?php echo $category['categoryid'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png') ?>" border="0" alt="<?php echo EDIT ?>" /></a></td>
+                <td width="16"><a href="?serendipity[adminModule]=category&amp;serendipity[adminAction]=delete&amp;serendipity[cid]=<?php echo $category['categoryid'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png') ?>" border="0" alt="<?php echo DELETE ?>" /></a></td>
                 <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 $category['category_name'] ?></td>
                 <td><?php echo $category['category_description'] ?></td>

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.15,1.16

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

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

Modified Files:
	comments.inc.php 
Log Message:
Move the links around to match the order on the "edit entries" page


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- comments.inc.php	26 Dec 2004 21:16:42 -0000	1.15
+++ comments.inc.php	26 Dec 2004 21:21:38 -0000	1.16
@@ -317,11 +317,11 @@
 <?php if ($rs['status'] == 'pending') { ?>
           <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>" class="serendipityIconLink" title="<?php echo APPROVE; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/accept.png'); ?>" alt="<?php echo APPROVE ?>" /><?php echo APPROVE ?></a>
 <?php } ?>
-          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" onclick="return confirm('<?php echo sprintf(COMMENT_DELETE_CONFIRM, $rs['id'], htmlspecialchars($rs['author'])) ?>')" title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
-          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" title="<?php echo EDIT; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>
 <?php if (strlen($fullBody) > strlen($summary) ) { ?>
           <a href="#c<?php echo $rs['id'] ?>" onclick="toggle(<?php echo $rs['id'] ?>); return false;" id="<?php echo $rs['id'] ?>_link" title="<?php echo VIEW; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" style="border: 0px none ; vertical-align: bottom;" /></a>
 <?php } ?>
+          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" title="<?php echo EDIT; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>
+          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" onclick="return confirm('<?php echo sprintf(COMMENT_DELETE_CONFIRM, $rs['id'], htmlspecialchars($rs['author'])) ?>')" title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
     </td>
 </tr>
 <tr>

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

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

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

Modified Files:
	comments.inc.php 
Log Message:
"Approve" needed a makeover


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- comments.inc.php	26 Dec 2004 18:45:34 -0000	1.14
+++ comments.inc.php	26 Dec 2004 21:16:42 -0000	1.15
@@ -314,10 +314,8 @@
                 </td>
             </tr>
         </table>
-<?php if ($rs['status'] == 'pending') {
-          $title = ($rs['type'] == 'NORMAL' ? APPROVE_COMMENT : APPROVE_TRACKBACK);
-?>
-          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>" title="<?php echo $title; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/clock_future.png'); ?>" alt="<?php echo $title; ?>" style="border: 0px none;" /></a>&nbsp;&nbsp;&nbsp;
+<?php if ($rs['status'] == 'pending') { ?>
+          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>" class="serendipityIconLink" title="<?php echo APPROVE; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/accept.png'); ?>" alt="<?php echo APPROVE ?>" /><?php echo APPROVE ?></a>
 <?php } ?>
           <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" onclick="return confirm('<?php echo sprintf(COMMENT_DELETE_CONFIRM, $rs['id'], htmlspecialchars($rs['author'])) ?>')" title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
           <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>" title="<?php echo EDIT; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.44,1.45 serendipity_lang_cn.inc.php,1.11,1.12 serendipity_lang_cs.inc.php,1.90,1.91 serendipity_lang_cz.inc.php,1.90,1.91 serendipity_lang_da.inc.php,1.110,1.111 serendipity_lang_de.inc.php,1.132,1.133 serendipity_lang_en.inc.php,1.111,1.112 serendipity_lang_es.inc.php,1.106,1.107 serendipity_lang_fr.inc.php,1.90,1.91 serendipity_lang_it.inc.php,1.30,1.31 serendipity_lang_nl.inc.php,1.67,1.68 serendipity_lang_no.inc.php,1.31,1.32 serendipity_lang_pt.inc.php,1.66,1.67 serendipity_lang_ru.inc.php,1.4,1.5 serendipity_lang_tn.inc.php,1.12,1.13 serendipity_lang_tw.inc.php,1.27,1.28 serendipity_lang_zh.inc.php,1.11,1.12

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

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

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php 
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fr.inc.php serendipity_lang_it.inc.php 
	serendipity_lang_nl.inc.php serendipity_lang_no.inc.php 
	serendipity_lang_pt.inc.php serendipity_lang_ru.inc.php 
	serendipity_lang_tn.inc.php serendipity_lang_tw.inc.php 
	serendipity_lang_zh.inc.php 
Log Message:
"Approve" needed a makeover


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- serendipity_lang_cs.inc.php	26 Dec 2004 18:34:35 -0000	1.90
+++ serendipity_lang_cs.inc.php	26 Dec 2004 21:16:44 -0000	1.91
@@ -664,6 +664,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_lang_no.inc.php	26 Dec 2004 18:34:36 -0000	1.31
+++ serendipity_lang_no.inc.php	26 Dec 2004 21:16:47 -0000	1.32
@@ -659,5 +659,6 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 ?>
\ No newline at end of file

Index: serendipity_lang_zh.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_lang_zh.inc.php	26 Dec 2004 18:34:36 -0000	1.11
+++ serendipity_lang_zh.inc.php	26 Dec 2004 21:16:48 -0000	1.12
@@ -662,6 +662,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- serendipity_lang_en.inc.php	26 Dec 2004 18:34:36 -0000	1.111
+++ serendipity_lang_en.inc.php	26 Dec 2004 21:16:46 -0000	1.112
@@ -660,6 +660,7 @@
 @define('ENTRIES_BY', 'Entries by %s');
 @define('PREVIOUS', 'Previous');
 @define('NEXT', 'Next');
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_lang_tw.inc.php	26 Dec 2004 18:34:36 -0000	1.27
+++ serendipity_lang_tw.inc.php	26 Dec 2004 21:16:48 -0000	1.28
@@ -663,6 +663,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_lang_bg.inc.php	26 Dec 2004 18:34:35 -0000	1.44
+++ serendipity_lang_bg.inc.php	26 Dec 2004 21:16:43 -0000	1.45
@@ -646,6 +646,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- serendipity_lang_pt.inc.php	26 Dec 2004 18:34:36 -0000	1.66
+++ serendipity_lang_pt.inc.php	26 Dec 2004 21:16:48 -0000	1.67
@@ -665,6 +665,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_lang_it.inc.php	26 Dec 2004 18:34:36 -0000	1.30
+++ serendipity_lang_it.inc.php	26 Dec 2004 21:16:47 -0000	1.31
@@ -664,6 +664,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- serendipity_lang_da.inc.php	26 Dec 2004 18:34:35 -0000	1.110
+++ serendipity_lang_da.inc.php	26 Dec 2004 21:16:45 -0000	1.111
@@ -659,6 +659,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- serendipity_lang_fr.inc.php	26 Dec 2004 18:34:36 -0000	1.90
+++ serendipity_lang_fr.inc.php	26 Dec 2004 21:16:47 -0000	1.91
@@ -668,6 +668,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- serendipity_lang_cz.inc.php	26 Dec 2004 18:34:35 -0000	1.90
+++ serendipity_lang_cz.inc.php	26 Dec 2004 21:16:44 -0000	1.91
@@ -662,6 +662,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- serendipity_lang_es.inc.php	26 Dec 2004 18:34:36 -0000	1.106
+++ serendipity_lang_es.inc.php	26 Dec 2004 21:16:47 -0000	1.107
@@ -668,6 +668,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cn.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_lang_cn.inc.php	26 Dec 2004 18:34:35 -0000	1.11
+++ serendipity_lang_cn.inc.php	26 Dec 2004 21:16:44 -0000	1.12
@@ -662,6 +662,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_tn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tn.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_lang_tn.inc.php	26 Dec 2004 18:34:36 -0000	1.12
+++ serendipity_lang_tn.inc.php	26 Dec 2004 21:16:48 -0000	1.13
@@ -663,6 +663,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_ru.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ru.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_lang_ru.inc.php	26 Dec 2004 18:34:36 -0000	1.4
+++ serendipity_lang_ru.inc.php	26 Dec 2004 21:16:48 -0000	1.5
@@ -665,6 +665,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- serendipity_lang_de.inc.php	26 Dec 2004 18:34:36 -0000	1.132
+++ serendipity_lang_de.inc.php	26 Dec 2004 21:16:45 -0000	1.133
@@ -661,6 +661,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- serendipity_lang_nl.inc.php	26 Dec 2004 18:34:36 -0000	1.67
+++ serendipity_lang_nl.inc.php	26 Dec 2004 21:16:47 -0000	1.68
@@ -668,6 +668,7 @@
 @define('ENTRIES_BY', 'Entries by %s'); // Translate
 @define('PREVIOUS', 'Previous'); // Translate
 @define('NEXT', 'Next'); // Translate
+@define('APPROVE', 'Approve'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/templates/default/admin/img accept.png,NONE,1.1

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

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

Added Files:
	accept.png 
Log Message:
"Approve" needed a makeover


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

[php-blog-cvs] serendipity/templates/default entries.tpl,1.9,1.10

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

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

Modified Files:
	entries.tpl 
Log Message:
Broken link to categories when clicking their image


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/entries.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- entries.tpl	22 Dec 2004 17:44:57 -0000	1.9
+++ entries.tpl	26 Dec 2004 20:43:49 -0000	1.10
@@ -17,7 +17,7 @@
             <span class="serendipity_entryIcon">
             {foreach from=$entry.categories item="category"}
                 {if $category.category_icon}
-                    <a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.category_id}-{$category.category_name|@makeFilename}"><img class="serendipity_entryIcon" title="{$category.category_name|@escape}{$category.category_description|@emptyPrefix}" alt="{$category.category_name|@escape}" src="{$category.category_icon}" /></a>
+                    <a href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.categoryid}-{$category.category_name|@makeFilename}"><img class="serendipity_entryIcon" title="{$category.category_name|@escape}{$category.category_description|@emptyPrefix}" alt="{$category.category_name|@escape}" src="{$category.category_icon}" /></a>
                 {/if}
             {/foreach}
             </span>

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.22,1.23

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
Fix possible problem on windows installations where the installer could freeze when enabling the use of imagick


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- functions_installer.inc.php	25 Dec 2004 00:37:56 -0000	1.22
+++ functions_installer.inc.php	26 Dec 2004 19:00:49 -0000	1.23
@@ -471,10 +471,8 @@
         $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_ARCHIVES);
     }
 
-    // plugins directory now part of basic CVS
-
     // Check imagick
-    if ($_POST['magick'] == 'true' && !@is_executable($_POST['convert'])) {
+    if ($_POST['magick'] == 'true' && function_exists('is_executable') && !@is_executable($_POST['convert'])) {
         $errs[] = sprintf(CANT_EXECUTE_BINARY, 'convert imagemagick');
     }
 

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

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

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

Modified Files:
	comments.inc.php 
Log Message:
- Referer URIs can get very long and break layout, trim them down
- Link to referer

TODO: Should we also link URLs? and Emails?
TODO: Figure out how to best do this while still preserving the N/A thing


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- comments.inc.php	26 Dec 2004 18:34:34 -0000	1.13
+++ comments.inc.php	26 Dec 2004 18:45:34 -0000	1.14
@@ -274,7 +274,7 @@
         $rs['url'] = 'N/A';
     }
     if (empty($rs['referer'])) {
-        $rs['referer'] = 'N/A';
+#        $rs['referer'] = 'N/A';
     }
 
     $fullBody = nl2br(strip_tags($rs['body']));
@@ -296,17 +296,17 @@
     <td class="serendipity_admin_list_item <?php echo $class ?>" id="comment_<?php echo $rs['id'] ?>">
         <table width="100%" cellspacing="0" cellpadding="3" border="0">
             <tr>
-                <td rowspan="2" width="20" align="center"><input type="checkbox" name="serendipity[delete][<?php echo $rs['id'] ?>]" value="<?php echo $rs['entry_id'] ?>" onclick="highlightComment('comment_<?php echo $rs['id'] ?>', this.checked)" tabindex="<?php echo $i ?>" /></td>
-                <td width="250"><strong><?php echo AUTHOR ?></strong>: <?php echo htmlspecialchars($rs['author']) ?></td>
+                <td rowspan="3" width="20" align="center"><input type="checkbox" name="serendipity[delete][<?php echo $rs['id'] ?>]" value="<?php echo $rs['entry_id'] ?>" onclick="highlightComment('comment_<?php echo $rs['id'] ?>', this.checked)" tabindex="<?php echo $i ?>" /></td>
+                <td width="40%"><strong><?php echo AUTHOR ?></strong>: <?php echo htmlspecialchars($rs['author']) ?></td>
                 <td><strong><?php echo EMAIL ?></strong>: <?php echo htmlspecialchars($rs['email']) ?></td>
             </tr>
             <tr>
-                <td><strong>IP</strong>: <?php echo htmlspecialchars($rs['ip']) ?></td>
+                <td width="40%"><strong>IP</strong>: <?php echo htmlspecialchars($rs['ip']) ?></td>
                 <td><strong><?php echo URL; ?></strong>: <?php echo htmlspecialchars($rs['url']) ?></td>
             </tr>
             <tr>
-                <td colspan="2"></td>
-                <td><strong><?php echo REFERER; ?></strong>: <?php echo htmlspecialchars($rs['referer']) ?></td>
+                <td width="40%">&nbsp;</td>
+                <td><strong><?php echo REFERER; ?></strong>: <a href="<?php echo htmlspecialchars($rs['referer']) ?>" title="<?php echo htmlspecialchars($rs['referer']) ?>"><?php echo htmlspecialchars(serendipity_truncateString($rs['referer'],30)) ?></a></td>
             <tr>
                 <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="3">
                     <div id="<?php echo $rs['id'] ?>_summary"><?php echo $summary ?></div>

[php-blog-cvs] serendipity/include functions_images.inc.php,1.19,1.20

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
- Add prettier (non-javascript and non-fake button) navigation links


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- functions_images.inc.php	15 Dec 2004 19:58:04 -0000	1.19
+++ functions_images.inc.php	26 Dec 2004 18:34:33 -0000	1.20
@@ -780,8 +780,9 @@
         $extraParems .= 'serendipity[sortorder]['. $k .']='. $v .'&';
     }
 
-    $left  = '<input type="button" value="&lt;&lt;&lt;" onclick="location.href=\'?'. $extraParems .'serendipity[page]=' . ($page-1) . '\';" '. (($start <= 0) ? 'disabled' : '') .'>' . "\n";
-    $right = '<input type="button" value="&gt;&gt;&gt;" onclick="location.href=\'?'. $extraParems .'serendipity[page]=' . ($page+1) . '\';" '. (($totalImages < $start+$perPage) ? 'disabled' : '') .'>' . "\n";
+    $pages = ceil($totalImages/$perPage);
+    $linkPrevious  = '?'. $extraParems .'serendipity[page]=' . ($page-1);
+    $linkNext      = '?'. $extraParems .'serendipity[page]=' . ($page+1);
 
     $sort_order = serendipity_getImageFields();
 
@@ -871,8 +872,14 @@
         <td colspan="<?php echo floor($lineBreak); ?>">
             <table width="100%">
                 <tr>
-                    <td><?php echo $left; ?></td>
-                    <td align="right"><?php echo $right; ?></td>
+                    <td>
+                    <?php if ( $page != 1 && $page <= $pages ) { ?>
+                        <a href="<?php echo $linkPrevious ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/previous.png') ?>" /><?php echo PREVIOUS ?></a>
+                    <?php } ?></td>
+                    <td align="right">
+                    <?php if ($page != $pages ) { ?>
+                        <a href="<?php echo $linkNext ?>" class="serendipityIconLinkRight"><?php echo NEXT ?><img src="<?php echo serendipity_getTemplateFile('admin/img/next.png') ?>" /></a>
+                    <?php } ?></td>
                 </tr>
             </table>
         </td>
@@ -952,17 +959,6 @@
     }
 ?>
     </tr>
-
-    <tr>
-        <td colspan="<?php echo floor($lineBreak); ?>">
-            <table width="100%">
-                <tr>
-                    <td><?php echo $left; ?></td>
-                    <td align="right"><?php echo $right; ?></td>
-                </tr>
-            </table>
-        </td>
-    </tr>
 </table>
 <?php
 }

[php-blog-cvs] serendipity/include/admin comments.inc.php,1.12,1.13 entries.inc.php,1.15,1.16

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

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

Modified Files:
	comments.inc.php entries.inc.php 
Log Message:
- Add prettier (non-javascript and non-fake button) navigation links


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- comments.inc.php	22 Dec 2004 18:05:45 -0000	1.12
+++ comments.inc.php	26 Dec 2004 18:34:34 -0000	1.13
@@ -144,17 +144,8 @@
     $page = 1;
 }
 
-if ( $page != 1 && $page <= $pages ) {
-    $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="&lt;&lt;&lt;" onclick="location.href=\'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page-1) . $searchString . '\'" />';
-} else {
-    $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="&lt;&lt;&lt;" disabled="disabled" />';
-}
-
-if ( $page != $pages ) {
-    $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" onclick="location.href=\'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page+1) . $searchString . '\'" />';
-} else {
-    $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" disabled="disabled" />';
-}
+$linkPrevious = 'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page-1) . $searchString;
+$linkNext = 'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page+1) . $searchString;
 
 $limit = serendipity_db_limit_sql(serendipity_db_limit(($page-1)*$commentsPerPage, $commentsPerPage));
 $sql = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c
@@ -250,9 +241,17 @@
     <td align="center">
         <table width="100%" cellspacing="5" cellpadding="0" border="0">
             <tr>
-                <td><?php echo $linkPrevious; ?></td>
+                <td>
+                <?php if ( $page != 1 && $page <= $pages ) { ?>
+                    <a href="<?php echo $linkPrevious; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/previous.png') ?>" /><?php echo PREVIOUS ?></a>
+                <?php } ?>
+                </td>
                 <td align="center"><?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?></td>
-                <td align="right"><?php echo $linkNext ?></td>
+                <td align="right">
+                <?php if ( $page != $pages ) { ?>
+                    <a href="<?php echo $linkNext; ?>" class="serendipityIconLinkRight"><?php echo NEXT ?><img src="<?php echo serendipity_getTemplateFile('admin/img/next.png') ?>" /></a>
+                <?php } ?>
+                </td>
             </tr>
         </table>
     </td>
@@ -334,17 +333,6 @@
 <tr>
     <td><input type="button" name="toggle" value="<?php echo INVERT_SELECTIONS ?>" onclick="invertSelection()" /> <input type="submit" name="toggle" value="<?php echo DELETE_SELECTED_COMMENTS ?>" onclick="return confirm('<?php echo COMMENTS_DELETE_CONFIRM ?>')" tabindex="<?php echo ($i+1) ?>" /></td>
 </tr>
-<tr>
-    <td align="center">
-           <table width="100%" cellspacing="5" cellpadding="0" border="0">
-            <tr>
-                <td><?php echo $linkPrevious; ?></td>
-                <td align="center"><?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?></td>
-                <td align="right"><?php echo $linkNext ?></td>
-            </tr>
-        </table>
-    </td>
-</tr>
 </table>
 </form>
 <?php } ?>

Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- entries.inc.php	23 Dec 2004 01:31:23 -0000	1.15
+++ entries.inc.php	26 Dec 2004 18:34:34 -0000	1.16
@@ -162,17 +162,13 @@
 ?>
         <tr>
             <td>
-                <?php if ($offSet <= 0) { ?>
-                    <a name="dummy_linkPrevious" class="button_disabled">&lt;&lt;&lt;</a>
-                <?php } else { ?>
-                    <a href="<?php echo $linkPrevious ?>" class="button">&lt;&lt;&lt;</a>
+                <?php if ($offSet > 0) { ?>
+                    <a href="<?php echo $linkPrevious ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/previous.png') ?>" /><?php echo PREVIOUS ?></a>
                 <?php } ?>
             </td>
             <td align="right">
-                <?php if ($count != $perPage) { ?>
-                    <a name="dummy_linkNext" class="button_disabled">&gt;&gt;&gt;</a>
-                <?php } else { ?>
-                    <a href="<?php echo $linkNext ?>" class="button">&gt;&gt;&gt;</a>
+                <?php if ($count == $perPage) { ?>
+                    <a href="<?php echo $linkNext ?>" class="serendipityIconLinkRight"><?php echo NEXT ?><img src="<?php echo serendipity_getTemplateFile('admin/img/next.png') ?>" /></a>
                 <?php } ?>
             </td>
         </tr>