php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/docs CHANGED_FILES,NONE,1.1.2.1 INSTALL,NONE,1.1.2.1 LICENSE,NONE,1.1.2.1 NEWS,NONE,1.1.2.1 README,NONE,1.1.2.1 TODO,NONE,1.1.2.1 upgrade.sh,NONE,1.1.2.1

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

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

Added Files:
      Tag: branch-smarty
	CHANGED_FILES INSTALL LICENSE NEWS README TODO upgrade.sh 
Log Message:
* renamed files as announced on the list. upgrader will take care of moving
  old files to a 'backup' directory for upgrading (non-CVS) users.
* MFH'ed some parts
* Fixed quicksave button display
* Fixed footer
* Fixed entry preview properly
* Fixed printing categories where no categories appeard in entry view



--- NEW FILE: LICENSE ---
Copyright (c) 2003-2004, Jannis Hermanns
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, 
are permitted provided that the following conditions are met:
    * Redistributions of source code must retain the above copyright notice, 
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of the serendipity developer group nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.

--- NEW FILE: INSTALL ---
###############################################################################
# INSTALLATION                                                                #
###############################################################################

1. Decompress and put this folder somewhere inside your document root
2. If you want the directory to be called something other than "serendipity",
change the directory name now
3. Open serendipity in your browser (installer will say hi to you)
4. Serendipity ships world-writeable (777) to make installation easier.
After the install is complete,  you should change the permissions to allow
only your web-server user (e.g. Nobody) to access the serendipity directory.
If you have enabled file-upload and/or caching, you need to do something
like this:
  chown -R Nobody serendipity/
  chmod -R 744 serendipity/
because the web server needs to be able to write to directories inside the
distribution.  Otherwise, you should probably chmod -R 644 serendipity.
5. Done!

###############################################################################
# UPGRADE                                                                     #
###############################################################################

See README file for detailed actions.

###############################################################################
# REQUIREMENTS                                                                #
###############################################################################

1. The Apache Webserver
2. .htaccess support allowing overrides for DirectoryIndex
3. PHP Version 4 or greater (PHP 4.3.1 or greater recommended)
4. php.ini options:
   - error_reporting E_ALL & ~E_NOTICE (or lower)
   - file_uploads on (For import/image upload features)
5. Any of the following database engines:
   - Mysql
   - PostGreSQL
   - SQLite (not quite!)

###############################################################################
# FILE STRUCTURE                                                                #
###############################################################################
serendipity consists of 3 parts:

1. Function library / API
   -serendipity_admin_entries.inc.php
   -serendipity_admin_overview.inc.php
   -serendipity_config.inc.php
   -serendipity_functions.inc.php
   -lang/serendipity_lang_*.inc.php
   These files are never loaded in the browser, but included (as their
   suffix suggests).

3. Sample usage of the API
  -layout.php (in templates/[theme]/)
   This file displays the calendar, the search field, and the diary entries.
   You can either include this file somewhere in your site, or use the 
   callback functions directly in your site. It's up to you. I designed this,
   so you can quickly start off with a default layout :)

4. Dummy page
   -index.php
   This file "simulates" your homepage, you can safely ignore it, it is mainly
   for testing, whether serendipity works (currently it just prints a standard
   HTML header and includes layout.php

###############################################################################

Serendipity Weblog - http://s9y.org

Licensed under the BSD License

# $Id: INSTALL,v 1.1.2.1 2004/11/06 11:22:48 garvinhicking Exp $

--- NEW FILE: CHANGED_FILES ---
This documents the change of filestructure between version 0.7 and 0.8:

Where functions from serendipity_config.inc.php went to:
------------------------------------------------------------------------
./include/functions_comments.inc.php
    * serendipity_rememberComment() {
    * serendipity_rememberCommentDetails()
    * serendipity_forgetCommentDetails()
    * serendipity_displayCommentForm()
    * serendipity_fetchComments()
    * serendipity_generateCommentList()
    * serendipity_printComments()
    * serendipity_deleteComment()
    * serendipity_allowCommentsToggle()
    * serendipity_approveComment()
    * serendipity_saveComment()
    * serendipity_mailSubscribers()
    * serendipity_cancelSubscription()
    * serendipity_sendComment()

./include/functions_trackbacks.inc.php
    * serendipity_fetchTrackbacks()
    * serendipity_printTrackbacks()
    * serendipity_trackback_is_success()
    * serendipity_pingback_autodiscover()
    * _serendipity_send()
    * serendipity_trackback_autodiscover()
    * serendipity_reference_autodiscover()
    * add_trackback()
    * add_pingback()
    * serendipity_trackback_excerpt()
    * report_trackback_success()
    * report_trackback_failure()
    * report_pingback_success()
    * report_pingback_failure()
    * serendipity_handle_references()

./include/functions_smarty.inc.php
    * serendipity_smarty_fetch()
    * serendipity_emptyPrefix()
    * serendipity_smarty_hookPlugin()
    * serendipity_smarty_printSidebar()
    * serendipity_smarty_getFile()
    * serendipity_smarty_formatTime()
    * serendipity_smarty_printComments()
    * serendipity_smarty_printTrackbacks()

./include/functions_entries.inc.php
    * serendipity_fetchCategoryRange()
    * serendipity_fetchCategoryInfo()
    * serendipity_fetchEntryCategories()
    * serendipity_fetchEntries()
    * serendipity_fetchEntry()
    * serendipity_fetchEntryProperties()
    * serendipity_fetchCategories()
    * serendipity_rebuildCategoryTree()
    * serendipity_searchEntries()
    * serendipity_printEntryFooter()
    * serendipity_getTotalEntries()
    * serendipity_printEntries()
    * serendipity_printEntries_rss()
    * serendipity_purgeEntry()
    * serendipity_updertEntry()
    * serendipity_deleteEntry()
    * serendipity_generateCategoryList()
    * serendipity_printEntryForm()
    * serendipity_emit_htmlarea_code()
    * serendipity_updateEntryCategories()
    * serendipity_printArchives()

./include/functions.inc.php (remaining)
    * serendipity_truncateString()
    * serendipity_formatTime()
    * serendipity_logout()
    * serendipity_login()
    * serendipity_userLoggedIn()
    * serendipity_fetchTemplates()
    * serendipity_fetchTemplateInfo()
    * serendipity_setCookie()
    * serendipity_deleteCookie()
    * serendipity_fetchUsers()
    * serendipity_makeFilename()
    * serendipity_fetchReferences()
    * serendipity_utf8_encode()
    * serendipity_rss_getguid()
    * xhtml_cleanup()
    * serendipity_rewriteURL()
    * serendipity_archiveURL()
    * serendipity_archiveDateUrl()
    * serendipity_maxfileuploadsize()
    * serendipity_fetchAuthor()
    * serendipity_parseFileName()
    * serendipity_authenticate_author()
    * serendipity_track_referrer()
    * serendipity_track_referrer_gc()
    * serendipity_track_url()
    * serendipity_displayTopReferrers()
    * serendipity_displayTopExits()
    * serendipity_displayTopUrlList()
    * serendipity_discover_rss()
    * serendipity_isResponseClean()
    * serendipity_printLogin()

Moved functions:
------------------------------------------------------------------------
serendipity_saveTemplateSelection()
    -> OBSOLETE

serendipity_importWP()
    -> ./include/admin/rss_exchange.inc.php

serendipity_importMT()
    -> ./include/admin/rss_exchange.inc.php

serendipity_load_configuration()
    -> ./include/functions_config.inc.php

Removed files:
------------------------------------------------------------------------
./serendipity.inc.php
./serendipity_layout.inc.php
./serendipity_layout_table.inc.php

Moved/Renamed files:
------------------------------------------------------------------------
./serendipity_entries_overview.inc.php
    -> ./include/admin/entries_overview.inc.php

./serendipity_rss_exchange.inc.php
    -> ./include/admin/rss_exchange.inc.php

./serendipity_admin_category.inc.php
    -> ./include/admin/category.inc.php

./serendipity_admin_comments.inc.php
    -> ./include/admin/comments.inc.php

./serendipity_admin_entries.inc.php
    -> ./include/admin/entries.inc.php

./serendipity_admin_images.inc.php
    -> ./include/admin/images.inc.php

./serendipity_admin_installer.inc.php
    -> ./include/admin/installer.inc.php

./serendipity_admin_interop.inc.php
    -> ./include/admin/interop.inc.php

./serendipity_admin_overview.inc.php
    -> ./include/admin/overview.inc.php

./serendipity_admin_plugins.inc.php
    -> ./include/admin/plugins.inc.php

./serendipity_admin_templates.inc.php
    -> ./include/admin/templates.inc.php

./serendipity_admin_upgrader.inc.php
    -> ./include/admin/upgrader.inc.php

./serendipity_admin_users.inc.php
    -> ./include/admin/users.inc.php


./compat.php
    -> ./include/compat.inc.php

./serendipity_functions_config.inc.php
    -> ./include/functions_config.inc.php

./serendipity_functions_images.inc.php
    -> ./include/functions_images.inc.php

./serendipity_functions_installer.inc.php
    -> ./include/functions_installer.inc.php

./serendipity_genpage.inc.php
    -> ./include/genpage.inc.php

./serendipity_lang.inc.php
    -> ./include/lang.inc.php

./serendipity_plugin_api.php
    -> ./include/plugin_api.inc.php

./serendipity_sidebar_items.php
    -> ./include/plugin_internal.inc.php


./serendipity_db.inc.php
    -> ./include/db/db.inc.php

./serendipity_db_mysql.inc.php
    -> ./include/db/mysql.inc.php

./serendipity_db_mysqli.inc.php
    -> ./include/db/mysqli.inc.php

./serendipity_db_postgres.inc.php
    -> ./include/db/postgres.inc.php

./serendipity_db_sqlite.inc.php
    -> ./include/db/sqlite.inc.php


./htaccess.cgi.errordocs.tpl
    -> ./include/tpl/htaccess_cgi_errordocs.tpl

./htaccess.cgi.normal.tpl
    -> ./include/tpl/htaccess_cgi_normal.tpl

./htaccess.cgi.rewrite.tpl
    -> ./include/tpl/htaccess_cgi_rewrite.tpl

./htaccess.errordocs.tpl
    -> ./include/tpl/htaccess_errordocs.tpl

./htaccess.normal.tpl
    -> ./include/tpl/htaccess_normal.tpl

./htaccess.rewrite.tpl
    -> ./include/tpl/htaccess_rewrite.tpl

./serendipity_config_local.tpl
    -> ./include/tpl/config_local.tpl

./serendipity_config_user.tpl
    -> ./include/tpl/config_user.tpl


./INSTALL
    -> ./docs/INSTALL

./LICENSE
    -> ./docs/LICENSE

./NEWS
    -> ./docs/NEWS

./README
    -> ./docs/README

./TODO
    -> ./docs/TODO

./upgrade.sh
    -> ./docs/upgrade.sh
--- NEW FILE: README ---
########################################################################
# README                                                               #
########################################################################

For the most up-to-date information on documentation, creating styles,
plugins and so on, please visit our Wiki on http://www.s9y.org/!

########################################################################
# UPDATING                                                             #
########################################################################

The automatic update script should find and execute any necessary
changes to the database layout made in different s9y versions beginning
from 0.5. The upgrader will perform its automatic actions, as soon as you
have copied the new s9y files over your old installation and access the start
page of your blog.
You can speed up the process of backing up your data and copying the files by
using the supplied "upgrade.sh" script. Be sure to edit the file and change
the variables to your needs.

Usually all DB schema upgrades in previous versions will be used. So
when you upgrade from 0.5 to 0.7 you will get upgrades from 0.5 -> 0.6
and 0.6 -> 0.7.

However, you are always advised to look at the corresponding
SQL update file in sql/db_update* to see which changes were made.

Please bear in mind that the automatic update script is executable by
any user visiting your blog at the time of updating. You should modify
your .htaccess file before upgradding and include this directives:

---- .htaccess
AuthType Basic
AuthName "Authorisation: Serendipity Upgrade IN PROGRESS"
AuthUserFile /absolute/path/to/your/s9y/.htpasswd
require valid-user
----

Then create a file .htpasswd using a simple 'username:cryptpasswd'
combination. Look at http://www.advancehost.com/htpasswd.html for an
online generator for .htpasswd files.

---- .htpasswd
s9y:s9QXoc9dcFOT2
----

This would create a user "s9y" with password "s9y" with which you'd have
to log into your blog.

A proper backup of BOTH the file system and your database is suggested.
Whenever you made changes to the distributed files (or to the files like
xml.gif or the smilies) you have to make sure to copy them over the
distributed files after updating.

########################################################################
# NOTES ON UPDATING FROM 0.5/0.5.1 -> 0.6                              #
########################################################################

* [The 0.5.1 release was renamed to 0.6, but there will still be DB
  layout changes applied which are labelled as 0.5.1 - just ignore it.
  It's only to easy migration to CVS-Snapshot users using the
  0.5.1-version]

* The structure of the content_rewrite plugin has changed. It will get
  rewritten automatically by the update script, but if you had output on
  your sidebar before, you need to do this:

  - Add the 'serendipity_plugin_eventwrapper' to the sidebar plugins.
  - Configure the 'serendipity_plugin_eventwrapper' and set it to use
    your existing 'serendpity_event_contentrewrite' plugin.

* Smilies and the XML-button where moved from the '/pixel' subdirectory
  into per-template 'img/' subdirectories. If you modified the original
  files, you need to copy your versions inside the
  'templates/default/img/' directory.

* A home-link has been added to the page headers. For that, two new CSS
  classes have been introduced: .homelink1 (header), .homelink2 (
  subheader). If you have a custom template, you need to adapt to those
  changes. To make them look like your header previously has, insert
  this in your style.css:

  a.homelink1,
  a.homelink1:hover,
  a.homelink1:link,
  a.homelink1:visited,
  #serendipity_banner h1 {
    ... your css-definitions ...
    text-decoration: none;
  }

  a.homelink2,
  a.homelink2:hover,
  a.homelink2:link,
  a.homelink2:visited,
  #serendipity_banner h2 {
    ... your css-definitions ...
    text-decoration: none;
  }

########################################################################
# NOTES ON UPDATING FROM 0.4 -> 0.5                                    #
########################################################################

No changes where made to the database scheme in this version.

########################################################################
# NOTES ON UPDATING FROM 0.3 -> 0.4                                    #
########################################################################

Run the file 'sql/db_update_0.3_0.4_mysql.sql' or
'sql/db_update_0.3_0.4_pgsql.sql' to update your database. Apart from
that, just copy over the new files of the distribution.

########################################################################
# THE 'embed' CONFIGURATION DIRECTIVE                                  #
########################################################################

In your serendipity configuration, you can set an 'embed' option to true
or false.

This defines, whether you use your blog as a standalone webpage - or if
you have different content wrapped around your blog, like the menu of
your usual homepage.

By setting the 'embed' option to true, you have to make sure the
following things to get everything to work well:

1. 'indexFile' option.

   This configuration option needs to be set to the wrapper file you
   want to use. Let's say you normally have a 'content.php' file for
   your webpage. This 'content.php' file sets up your internal
   templates, your menu structure and such.
   Now you want this file to be used to include your weblog. A simple
   content.php could look like this:

   <?php
   $homepage = new Template_Class;
   $homepage->set_template($_REQUEST['page']);
   $homepage->output_header();
   $homepage->output_content();
   $homepage->output_footer();
   $homepage->track_statistics();
   ?>

   So normally your file would be called with 'content.php?page=about'
   to display your 'about' page of your personal homepage.

   Now we want this file to be displayed, having the 'page' variable
   being set to 'blog'.

   For this, we set up a 'wrapper.php' file:

   <?php
   $_REQUEST['page'] = 'blog';
   // Let serendipity generate our content:
   ob_start();
   require 'index.php';
   $blog_data = ob_get_contents();
   ob_end_clean();

   // Now we include our normal content building file.
   // This one has to make use of your $blog_data variable to print
   // the content where appropriate!
   require 'content.php';
   ?>

   You would then set your 'indexFile' serendipity-option to the
   'wrapper.php' file.

  2. Plugin panes & HTML-headers

   With the example above, we only get the main blog data printed. One
   of the most visible actions when using the 'embed' option is that the
   plugin panes are not generated. And HTML headers/foooters are also
   not provided by s9y in this case, as this should be done by your
   'content.php' file.

   So you have to include them in your 'content.php' file, to have them
   visible in your embedded setup.

   You can use this snippet:
   <?php
   serendipity_plugin_api::generate_plugins('left','div');
   serendipity_plugin_api::generate_plugins('right','div');
   ?>
   somewhere in your 'content.php' file.

The 'embed' option is therefore only recommended to be used by advanced
users going for a most flexible setup!

########################################################################
# HOW TO USE SERENDIPITY AS SHARED LIBRARY                             #
########################################################################

******************************************
* WARNING: THIS FEATURE IS EXPERIMENTAL! *
******************************************

You can install ONE s9y distribution and manage multiple users on it by
sharing the core files and then deploying specially crafted files in
each user's directory.

Let's do this using an example. You own the domain 's9yblogs.org'.
You want to have multiple virtual hosts for as many users as you like.
They are going to be called 'username.s9yblogs.org'. We choose the users
'garvin', 'j' and 'tom' for example hosts. We assume that your webserver
runs as user 'www', group 'www'. We also assume that all your users
are called like the subdomains, and they are also in group 'www'. We
further assume that PHP's safe_mod is turned off.

Of course, for security reasons, you should set the open_basedir
directive to the user's document root, so he can't access other
installations on your host.

So your Apache-Webser should contain VirtualHosts like this:

-- httpd.conf
<VirtualHost 42.42.42.42:80>
    ServerName garvin.s9yblogs.org
    DocumentRoot /home/www/garvin.s9yblogs.org/htdocs
    <Directory "/home/www/garvin.s9yblogs.org/htdocs">
        AllowOverride All
    </Directory>
    php_value include_path ".:/usr/local/lib/php:/usr/local/lib/php/s9y/:/usr/local/lib/php/s9y/bundled-libs/"
    php_admin_value open_basedir "/usr/local/lib/php/:/usr/local/lib/php/s9y/:/home/www/garvin.s9yblogs.org/"
</VirtualHost>

<VirtualHost 42.42.42.42:80>
    ServerName j.s9yblogs.org
    DocumentRoot /home/www/j.s9yblogs.org/htdocs
    <Directory "/home/www/j.s9yblogs.org/htdocs">
        AllowOverride All
    </Directory>
    php_value include_path ".:/usr/local/lib/php:/usr/local/lib/php/s9y/:/usr/local/lib/php/s9y/bundled-libs/"
    php_admin_value open_basedir "/usr/local/lib/php/:/usr/local/lib/php/s9y/:/home/www/j.s9yblogs.org/"
</VirtualHost>

<VirtualHost 42.42.42.42:80>
    ServerName tom.s9yblogs.org
    DocumentRoot /home/www/tom.s9yblogs.org/htdocs
    <Directory "/home/www/tom.s9yblogs.org/htdocs">
        AllowOverride All
    </Directory>
    php_value include_path ".:/usr/local/lib/php:/usr/local/lib/php/s9y/:/usr/local/lib/php/s9y/bundled-libs/"
    php_admin_value open_basedir "/usr/local/lib/php/:/usr/local/lib/php/s9y/:/home/www/tom.s9yblogs.org/"
</VirtualHost>
-- httpd.conf

You will unpack the default s9y distribution files in
"/usr/local/lib/php/s9y/". Where you store the directory 's9y' is
not important, as long as you adjust the include_path setting in the
VirtualHosts. But the directory name 's9y' is significant.

Now copy the subdirectories called

 * "/usr/local/lib/php/s9y/deployment/"  [core redirection files]
 * "/usr/local/lib/php/s9y/templates/"   [templates so that users can change them]
 * "/usr/local/lib/php/s9y/htmlarea/"    [htmlarea WYSIWYG-editor]

 to each of the user's subdirectories:

$ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/garvin.s9yblogs.org/htdocs/
$ cp -r /usr/local/lib/php/s9y/templates /home/www/garvin.s9yblogs.org/htdocs/
$ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/garvin.s9yblogs.org/htdocs/
$ chown -R garvin.www /home/www/garvin.s9yblogs.org/htdocs/*
$ chmod go+rwx /home/www/garvin.s9yblogs.org/htdocs
$ chmod go+rwx /home/www/garvin.s9yblogs.org/htdocs/uploads/

$ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/j.s9yblogs.org/htdocs/
$ cp -r /usr/local/lib/php/s9y/templates /home/www/j.s9yblogs.org/htdocs/
$ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/j.s9yblogs.org/htdocs/
$ chown -R j.www /home/www/j.s9yblogs.org/htdocs/*
$ chmod go+rwx /home/www/j.s9yblogs.org/htdocs
$ chmod go+rwx /home/www/j.s9yblogs.org/htdocs/uploads/

$ cp -r /usr/local/lib/php/s9y/deployment/* /home/www/tom.s9yblogs.org/htdocs/
$ cp -r /usr/local/lib/php/s9y/templates /home/www/tom.s9yblogs.org/htdocs/
$ cp -r /usr/local/lib/php/s9y/htmlarea /home/www/tom.s9yblogs.org/htdocs/
$ chown -R tom.www /home/www/tom.s9yblogs.org/htdocs/*
$ chmod go+rwx /home/www/tom.s9yblogs.org/htdocs
$ chmod go+rwx /home/www/tom.s9yblogs.org/htdocs/uploads/

For later management access, it is advised you keep a list of all URLs
for your s9y-managed blogs. We suggest to create a SQL table like
'my_managed_s9y_blogs':

sql> CREATE TABLE my_managed_s9y_blogs (url varchar(255) default null);
sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://garvin.s9yblogs.org/');
sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://j.s9yblogs.org/');
sql> INSERT INTO my_managed_s9y_blogs (url) VALUES ('http://tom.s9yblogs.org/');

Now you are almost ready for take-off. We assume that every user has
access to a seperate SQL database where his blog-data is later stored
in. You can already see, that the steps needed above shouldn't be to
hard to put into a customized script.sh file for use in your setup.

Open up your http://garvin.s9yblogs.org/ file. You should now see s9y's
installation screen. Enter the database- and username and the
corresponding password. Everything else can be left to the user.

Now every user can manage his/her blog just as if it were a standalone
installation.

SPECIAL NOTES:
========================================================================

* Each blog is still a standalone blog.

* If you update the core library files from version 0.5 to 0.6 (for
  example) every user of your core library will get the default s9y-
  Upgrader script to see and needs to update his local configuration.

  As a provider for s9y blogs to your users, you are advised to migrate
  the user's blogs on your own. To do so, it is best that you always
  have a "spare" testing blog installed just like your user's blogs.

  Open that installation and look at the upgrader. Execute it and see
  that it completes without errors. If that happened, you should cycle
  through a list of ALL your s9y-managed blogs like this:

  <?php
  $sql = mysql_query('SELECT url FROM my_managed_s9y_blogs');
  while ($row = mysql_fetch_array($sql, MYSQL_ASSOC)) {
     $fp = fopen($row['url'] . 'serendipity_admin.php?serendipity[action]=upgrade');
  }
  ?>

  So basically all you need to do is call that script for every s9y-
  powered blog you host.

########################################################################
# NOTES FOR CONDITIONAL GET IN RSS FEEDS                               #
########################################################################

Serendipity supports an HTTP-cache compatible way of only showing items
in an RSS feed which where modified since the last request from a
client.

Typically, an RSS reader fetches your RSS feeds (15 items, per default).
It then remembers the timestamp when those items where fetched. By the
time your RSS reader updates the feed (typically after 1 hour)
Serendipity will now only serve all new or modified items since the last
time of refresh. If no entries where updated since then, serendipity
will only serve the 304 Header (Not Modified) and saves a lot of
bandwidth for both client and server on periodical updates.

Technically an RSS reader catches the "Last-Modified" Header of the RSS
output as well as a special "ETag"-Header. Both are set to the last
modification time of your article base. On the next fetch, those
received headers are sent as "IF_MODIFIED_SINCE" (= Last-Modified) and
"IF_NONE_MATCH" (= ETag) Headers and will affect your rss feed. This
saves a lot of bandwidth on both client and server side.

Users who have been watching your feed and where not able to catch up
the latest articles may miss some of them, because you usually only get
15 items per feed. In case your reader provides the IF_MODIFIED_SINCE
header the client can now catch all items (resp. a maximum of 50
articles to prevent abuse).

If you want to permanently disable that feature (whatever the reasons
are) you can either set a "$_REQUEST['nocache'] = true" inside your
rss.php file (first line) or append the '&nocache=true' request variable
to your feed so that it looks like:
http://example.host/serendipity/rss.php?version=2.0&nocache=true.

Of course, the usual feed behaviour is not affected if none of the
caching headers are provided. So if you use syndication methods to embed
content from a blog inside an application, just tune your application to
either send the 'nocache'-Variable to a Serendipity blog, or to not send
the caching headers.

The syndication plugin can be configured to append that variable to your
feed URLs from your blog.

########################################################################
# USER MANAGEMENT                                                      #
########################################################################

New users can be created by inserting them to the 'authors' table.

The field 'userlevel' is a special field describing which actions a
user may have:

- Userlevel 0:   Standard editor. Cannot apply many administrative tasks

- Userlevel 1:   Chief editor. Can apply some administrative tasks (like
                 title of the blog, ...

- Userlevel 255: Admin. Can change everything.

Userlevels are cumulative, thus a user with level '30' can do anything
which users of a lower level can do. Currently only the levels mentioned
above are used.

Here is a short chart of what users can do:

ACTION                                               |editor|chief|admin
-----------------------------------------------------|------|-----|-----
Manage private plugins                               |   -     +     +
Manage global plugins                                |   -     -     +
Manage order of plugins                              |   -     +     +
Manage configuration of private plugins              |   -     +     +
Manage configuration of all protected plugins        |   -     -     +
Manage configuration of private protected plugins    |   +     +     +

Manage all categories                                |   -     +     +
Manage public categories                             |   +     +     +
Manage private categories                            |   +     +     +
Manage global configuration                          |   -     -     +

Manage basic configuration                           |   -     +     +
Manage private configuration                         |   +     +     +

Manage templates                                     |   -     +     +

Manage 'admin' users                                 |   -     -     +
Manage 'chief' users                                 |   -     +     +
Manage 'editor' users                                |   -     +     +

Manage private entries                               |   +     +     +
Manage others entries                                |   -     +     +
Manage comments/trackbacks to private entries        |   +     +     +
Manage comments/trackbacks to others entries         |   -     +     +

View/Link/Upload all pictures                        |   +     +     +
View/Link/Upload private pictures                    |   +     +     +
View/Link/Upload public pictures                     |   +     +     +

Edit all pictures                                    |   -     +     +
Edit public pictures                                 |   +     +     +
Edit private pictures                                |   +     +     +
------------------------------------------------------------------------

It is advised that in shared setups only the webmaster has an admin-
access. The users should be given a chief-login, and them theirselves
can distribute user logins.

########################################################################

Serendipity Weblog - http://s9y.org

Licensed under the BSD License

# $Id: README,v 1.1.2.1 2004/11/06 11:22:48 garvinhicking Exp $

--- NEW FILE: NEWS ---
# $Id: NEWS,v 1.1.2.1 2004/11/06 11:22:48 garvinhicking Exp $

Version 0.8 ()
------------------------------------------------------------------------

    * Cleaned up directory structure, created new subdirectories,
      split up functions file (garvinhicking)

    * "Recent Entries" Plugin can now have userdefined title and only
      show entries of a specific category (+ subcategories).
      (garvinhicking)

    * New "quicksave" button to save an entry as draft without being
      redirected to entry overview, and immediately showing the preview.
      Use Accesskeys: Alt-S saves entry, Alt-P previews, ALT-Q
      quicksaves. (garvinhicking)

    * Media browser now allows to immediately upload a file from the
      entry creation screen and use that file/image easily
[...1366 lines suppressed...]
    * Fixed bug #719016 - (entry-title does not escape correctly)
      (tomsommer)

    * Allow the showing of *complete* archived months (tomsommer)

    * Fixed typo in serendipity_getCSS_avail() mysql-query (tomsommer)

    * Prevent the Admin interface to be logged as referrer when using
      the 'Back to Blog' link (bergmann)

    * Added full language support - English, German (jhermanns)

    * Keep track of which blog entry was linked from or referred to
      (bergmann)

    * Regenerate the .htaccess file, if installation fails (sterling &
      muesli)

Version 0.2 (April 4th, 2003)
------------------------------------------------------------------------

--- NEW FILE: TODO ---
# $Id: TODO,v 1.1.2.1 2004/11/06 11:22:48 garvinhicking Exp $

This document has been moved to our WiKi: 

http://www.s9y.org/32.html


--- NEW FILE: upgrade.sh ---
#!/bin/sh
# File: serendipity_safe_upgrade.sh
# Author: Jez Hancock
#
# Description:
# This shell script performs a backup of the serendipity MySQL database and
# files prior to upgrading from one version to another.

########################################################################
# Configuration options start
########################################################################
# Change this to the IP address from which you will be updgrading the blog from
# in a browser.  This IP address will be used in a .htaccess file to restrict
# access during the upgrade process:
ip=192.168.0.1

# Change this to the directory containing the current serendipity web files:
blog_dir=/usr/local/www/htdocs/serendipity

# Change this to the directory containing the new serendipity web files:
# This should be the directory containing the cvs version of s9y or the s9y
# tarball contents:
import_dir=/home/username/serendipity

# Change this to the directory you wish your weblog files and database to be
# backed up to.  A subdirectory 's9y.YYYYMMDD' will be created under here into
# which a tarball will be created containing the backed up webfiles and
# database.  

# For example if your backup_dir is set to '/home/user/backup', a directory
# called '/home/user/backup/serendipity.20040406' will be created to contain
# the backup tarball 'serendipity_backup.tar.gz' and the backup database file
# 'serendipity_backup.sql'.
# Note if the backup directory already contains a backup from the current day,
# the script will exit without doing anything.
backup_dir=/home/username/backup

# Change this to match your database user/name.  Note you will be prompted for
# your password on the commandline.
db_name="serendipity"
db_user="serendipity"

########################################################################
# Configuration options end
# You should not need to modify anything below here!
########################################################################

ok() { 
	echo "[OK]" ; echo ""
}

nl() {
	echo ""
}

# the date ... ymd=20040331 etc ... used in backup
ymd=`date "+%Y%m%d"`

# Our backup directory:
backup_dir=$backup_dir/serendipity.$ymd

# if the backup dir exists already, exit gracefully:
if [ -d $backup_dir ];then
	echo "$backup_dir already exists - exiting."
	exit
fi

# make backup dir:
echo "Creating backup directory:"
nl
echo "$backup_dir"
mkdir $backup_dir && ok || \
	echo "Could not create $backup_dir - exiting."

# backup current weblog to a tarball in the backup dir:
echo "Backing up weblog files from:"
nl
echo "$blog_dir"
nl
echo "to the tarball:"
nl
echo "$backup_dir/serendipity_backup.tar.gz"
set `echo "$blog_dir" | sed -e 's,\(.*\)/\(.*\),\1 \2,'`
tar zcf $backup_dir/serendipity_backup.tar.gz -C $1 $2 && ok

echo "Backing up database $db_name to file:"
nl
echo "$backup_dir/serendipity_backup.sql"
nl
echo -n "MySQL user $db_user - "
mysqldump -u$db_user -p $db_name > $backup_dir/serendipity_backup.sql \
	&& ok

# make backup dir safe:
echo "Changing perms on $backup_dir to 700"
chmod 700 $backup_dir && ok

# move current blogdir out of way:
echo "Moving:"
nl
echo "$blog_dir"
nl
echo "to:"
nl
echo "$blog_dir.$ymd"
mv $blog_dir $blog_dir.$ymd && ok

# now copy in the new files:
echo "Copying files from:"
nl
echo "$import_dir"
nl
echo "to:"
nl
echo "$blog_dir"
cp -R $import_dir $blog_dir && ok

# check if a .htaccess file exists in old blog dir - if so copy over:
if [ -f "$blog_dir.$ymd/.htaccess" ]; then
	cp $blog_dir.$ymd/.htaccess $blog_dir
fi

# allow only our ip during upgrade - remember to remove these lines 
# after you've finished updating!:
echo "Adding .htaccess directives to restrict browser access to blog to $ip"
echo "during upgrade process"
exec >> $blog_dir/.htaccess
echo "deny from all" 
echo "allow from $ip"
echo 'ErrorDocument 403 "Upgrading, please check back soon!!!'
exec > /dev/tty
ok

# copy old uploads folder over:
if [ -d $blog_dir.$ymd/uploads ];then
	echo "Copying old uploads folder from:"
	nl
	echo "$blog_dir.$ymd/uploads"
	nl
	echo "to:"
	nl
	echo "$blog_dir/uploads"
	cp -R $blog_dir.$ymd/uploads $blog_dir/uploads && ok
fi


# most importantly don't forget the local config file - this is checked
# to see whether or not your current config setup needs upgrading or
# not:
echo "Copying $blog_dir.$ymd/serendipity_config_local.inc.php to $blog_dir"
cp $blog_dir.$ymd/serendipity_config_local.inc.php $blog_dir \
	&& ok

echo "########################################################################"
echo "Important!"
echo "########################################################################"
echo "Backup is now complete.  Continue to upgrade your serendipity"
echo "installation by browsing to it in a web browser - you will be prompted"
echo "with instructions from there."
nl
echo "After completing the upgrade via a browser, remember to remove the lines"
echo "starting:"
nl
echo "deny from all"
echo "allow from $ip"
echo "ErrorDocument 403 ..."
nl
echo "from the .htaccess file:"
nl
echo "$blog_dir/.htaccess"
nl
nl
echo "A copy of the original serendipity web folder can be found here:"
nl
echo "$blog_dir.$ymd"
nl
echo "After confirming the upgrade was successful, you can safely remove"
echo "this directory."

# This is the place to do any custom backup stuff - for example I have various
# directory structures that I copy from my blog base directory, a few custom
# plugins I copy, etc etc.
# ...

# Uncomment/modify the following line if you run the server:
#chown -R www:www $blog_dir && chmod 600 $blog_dir/serendipity_config_local.inc.php

[php-blog-cvs] serendipity/bundled-libs tmp,1.1.1.1,NONE

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

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

Removed Files:
      Tag: branch-smarty
	tmp 
Log Message:
* renamed files as announced on the list. upgrader will take care of moving
  old files to a 'backup' directory for upgrading (non-CVS) users.
* MFH'ed some parts
* Fixed quicksave button display
* Fixed footer
* Fixed entry preview properly
* Fixed printing categories where no categories appeard in entry view



--- tmp DELETED ---

[php-blog-cvs] serendipity/include/admin category.inc.php,NONE,1.1.2.1 comments.inc.php,NONE,1.1.2.1 entries.inc.php,NONE,1.1.2.1 entries_overview.inc.php,NONE,1.1.2.1 images.inc.php,NONE,1.1.2.1 installer.inc.php,NONE,1.1.2.1 interop.inc.php,NONE,1.1.2.1 overview.inc.php,NONE,1.1.2.1 plugins.inc.php,NONE,1.1.2.1 rss_exchange.inc.php,NONE,1.1.2.1 templates.inc.php,NONE,1.1.2.1 upgrader.inc.php,NONE,1.1.2.1 users.inc.php,NONE,1.1.2.1

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

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

Added Files:
      Tag: branch-smarty
	category.inc.php comments.inc.php entries.inc.php 
	entries_overview.inc.php images.inc.php installer.inc.php 
	interop.inc.php overview.inc.php plugins.inc.php 
	rss_exchange.inc.php templates.inc.php upgrader.inc.php 
	users.inc.php 
Log Message:
* renamed files as announced on the list. upgrader will take care of moving
  old files to a 'backup' directory for upgrading (non-CVS) users.
* MFH'ed some parts
* Fixed quicksave button display
* Fixed footer
* Fixed entry preview properly
* Fixed printing categories where no categories appeard in entry view



--- NEW FILE: templates.inc.php ---
<?php # $Id: templates.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $

if (IN_serendipity !== true) {
    die ("Don't hack!");
}

if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
    return;
}

if ($serendipity['GET']['adminAction'] == 'save' ) {
    serendipity_set_config_var('template', $serendipity['POST']['theme']);
}
?>

<?php echo SELECT_TEMPLATE; ?>
<div>
    <form method="post" action="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin.php?serendipity[adminModule]=templates&amp;serendipity[adminAction]=save">
<?php
    foreach (serendipity_fetchTemplates() as $theme) {
        $info = serendipity_fetchTemplateInfo($theme);
        if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/preview.png')) {
            $preview = '<img src="templates/' . $theme . '/preview.png" width="100" style="border: 1px #000000 solid" />';
        } else {
            $preview = '&nbsp;';
        }

        if (serendipity_get_config_var('template', $serendipity['defaultTemplate']) == $theme) {
            $is_active = 'checked="checked"';
        } else {
            $is_active = '';
        }

        $jsLine  = " onmousedown=\"document.getElementById('serendipity_theme_radio_". $theme ."').checked = true;\"";
        $jsLine .= " onmouseout=\"document.getElementById('serendipity_theme_". $theme ."').className='';\"";
        $jsLine .= " onmouseover=\"document.getElementById('serendipity_theme_". $theme ."').className='serendipity_admin_list_item_uneven'; style.cursor = 'pointer';\"";
?>
    <table width="100%" id="serendipity_theme_<?php echo $theme; ?>">
        <tr>
            <td colspan="3" <?php echo $jsLine ?>><strong><?php echo $info['name']; ?></strong></td>
        </tr>

        <tr>
            <td width="100" <?php echo $jsLine ?> style="padding-left: 10px"><?php echo $preview; ?></td>

            <td valign="top" <?php echo $jsLine ?>>
                <?php echo AUTHOR; ?>      : <?php echo $info['author'];?><br />
                <?php echo LAST_UPDATED; ?>: <?php echo $info['date'];  ?>
            </td>

            <td valign="middle" align="center" width="70" <?php echo $jsLine ?>>
                <div><input type="radio" name="serendipity[theme]" value="<?php echo $theme; ?>" id="serendipity_theme_radio_<?php echo $theme; ?>" <?php echo $is_active; ?> /></div>
            </td>
        </tr>
    </table>
    <br />
<?php
    }
?>
        <div align="right"><input type="submit" name="submit" value="<?php echo SET_AS_TEMPLATE; ?>" /></div>
    </form>
</div>
<?php
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: users.inc.php ---
<?php # $Id: users.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $

if (IN_serendipity !== true) {
    die ('Don\'t hack!');
}
session_start();

if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
    return;
}

require_once(S9Y_INCLUDE_PATH . 'include/functions_installer.inc.php');

/*
 * User actions
 */

if (!empty($_POST['DELETE_YES'])) {
    $user = serendipity_fetchUsers($serendipity['POST']['user']);
    if ($user[0]['userlevel'] >= $serendipity['serendipityUserlevel'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED . '</strong>';
    } elseif ($_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</strong>';
    } else {
        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}authors WHERE authorid=" . (int)$serendipity['POST']['user']);
        printf('<strong>' . DELETED_USER . '</strong>', $serendipity['POST']['user'], $user[0]['username']);
    }
}

if (!empty($_POST['SAVE_NEW'])) {
    if ($serendipity['POST']['userlevel'] >= $serendipity['serendipityUserlevel'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED . '</strong>';
    } 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');
        printf('<strong>' . CREATED_USER . '</strong>', '#' . $serendipity['POST']['user'] . ', ' . $_POST['username']);
    }
    echo '<br />';
}

if (!empty($_POST['SAVE']) || !empty($_POST['SAVE_NEW'])) {
    $user = serendipity_fetchUsers($serendipity['POST']['authorid']);
    if ($user[0]['userlevel'] >= $serendipity['serendipityUserlevel'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED . '</strong>';
    } elseif ($_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</strong>';
    } else {
        $u = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, true);
        foreach($u AS $key => $entry) {
            serendipity_set_user_var(
              $entry['name'],
              $_POST[$entry['name']],
              $serendipity['POST']['user'],
              ($serendipity['authorid'] == $serendipity['POST']['authorid'] ? true : false)
            );
        }
        printf('<strong>' . MODIFIED_USER . '</strong>', $_POST['username']);
        echo '<br />';
    }
}


/*
 * User chooser
 */
?>
<strong><?php echo EDIT_USERS; ?></strong>
<hr noshade="noshade" />
    <table width="100%">
        <tr>
            <td><strong><?php echo USER; ?></strong></td>
            <td><strong><?php echo USER_LEVEL ?></strong></td>
            <td>&nbsp;</td>
        </tr>
<?php
$users = serendipity_fetchUsers();
foreach($users AS $user) {
    if ($user['userlevel'] < $serendipity['serendipityUserlevel'] || $user['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN ) {
?>
    <tr>
        <td><?php echo htmlspecialchars($user['username']); ?></td>
        <td width="200"><?php echo $user['userlevel']; ?></td>
        <td align="right">
                <form action="?serendipity[adminModule]=users" method="post">
                    <input type="hidden" name="serendipity[user]" value="<?php echo $user['authorid']; ?>" />
                    <input type="submit" name="EDIT"   value="<?php echo EDIT; ?>" />
                    <input type="submit" name="DELETE" value="<?php echo DELETE; ?>" />
                </form>
        </td>
    </tr>
<?php
    }
}
?>

        <tr>
            <th colspan="3"><br />- <?php echo WORD_OR; ?> -<br /><br /></th>
        </tr>

        <tr>
            <td><strong><?php echo CREATE_USERS; ?>:</strong></td>
            <td>&nbsp;</td>
            <td>
                <form action="?serendipity[adminModule]=users" method="post">
                    <input type="submit" name="NEW"   value="<?php echo CREATE_NEW_USER; ?>" />
                </form>
            </td>
        </tr>
    </table>

<hr noshade="noshade" />

<?php
/*
 * User editing/creation
 */

if (!empty($_POST['NEW']) || !empty($_POST['EDIT'])) {
?>
<form action="?serendipity[adminModule]=users" method="post">
    <div>
    <h3>
<?php
if (!empty($_POST['EDIT'])) {
    $user = serendipity_fetchUsers($serendipity['POST']['user']);
    if ($user[0]['userlevel'] >= $serendipity['serendipityUserlevel'] && $user[0]['authorid'] != $serendipity['authorid'] && $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN) {
        echo '<strong>' . CREATE_NOT_AUTHORIZED . '</strong><br />';
        echo CREATE;
        $from = array();
    } else {
        echo EDIT;
        $from = &$user[0];
        unset($from['password']);
        echo '<input type="hidden" name="serendipity[user]" value="' . $from['authorid'] . '" />';
    }
} else {
    echo CREATE;
    $from = array();
}
?>
    </h3>

<?php
$t = array();
$t = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, false, $t, false);
serendipity_printConfigTemplate($t, $from, true, false);

if (!empty($_POST['EDIT'])) { ?>
        <input type="submit" name="SAVE"   value="<?php echo SAVE; ?>" />
<?php } else { ?>
        <input type="submit" name="SAVE_NEW"   value="<?php echo CREATE_NEW_USER; ?>" />
<?php } ?>

    </div>
</form>
<?php
} elseif (!empty($_POST['DELETE'])) {
    $user = serendipity_fetchUsers($serendipity['POST']['user']);
?>
<form action="?serendipity[adminModule]=users" method="post">
    <div>
    <?php printf(DELETE_USER, $serendipity['POST']['user'], $user[0]['username']); ?>
        <br /><br />
        <input type="hidden" name="serendipity[user]" value="<?php echo $serendipity['POST']['user']; ?>" />
        <input type="submit" name="DELETE_YES" value="<?php echo DUMP_IT; ?>" />
        <input type="submit" name="NO" value="<?php echo NOT_REALLY; ?>" />
    </div>
</form>
<?php
}

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

--- NEW FILE: upgrader.inc.php ---
<?php
require_once(S9Y_INCLUDE_PATH . 'include/functions_installer.inc.php');

// 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
// your setting being changed when updating serendipity in first place.
$showAbort  = (isset($serendipity['UpgraderShowAbort']) ? $serendipity['UpgraderShowAbort'] : true);

$abortLoc   = $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php?serendipity[action]=ignore';
$upgradeLoc = $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php?serendipity[action]=upgrade';

/* A list of files which got obsoleted in 0.8 */
$obsolete_files = array(
    'serendipity.inc.php',
    'serendipity_layout.inc.php',
    'serendipity_layout_table.inc.php',
    'serendipity_entries_overview.inc.php',
    'serendipity_rss_exchange.inc.php',
    'serendipity_admin_category.inc.php',
    'serendipity_admin_comments.inc.php',
    'serendipity_admin_entries.inc.php',
    'serendipity_admin_images.inc.php',
    'serendipity_admin_installer.inc.php',
    'serendipity_admin_interop.inc.php',
    'serendipity_admin_overview.inc.php',
    'serendipity_admin_plugins.inc.php',
    'serendipity_admin_templates.inc.php',
    'serendipity_admin_upgrader.inc.php',
    'serendipity_admin_users.inc.php',
    'compat.php',
    'serendipity_functions_config.inc.php',
    'serendipity_functions_images.inc.php',
    'serendipity_functions_installer.inc.php',
    'serendipity_genpage.inc.php',
    'serendipity_lang.inc.php',
    'serendipity_plugin_api.php',
    'serendipity_sidebar_items.php',
    'serendipity_db.inc.php',
    'serendipity_db_mysql.inc.php',
    'serendipity_db_mysqli.inc.php',
    'serendipity_db_postgres.inc.php',
    'serendipity_db_sqlite.inc.php',
    'htaccess.cgi.errordocs.tpl',
    'htaccess.cgi.normal.tpl',
    'htaccess.cgi.rewrite.tpl',
    'htaccess.errordocs.tpl',
    'htaccess.normal.tpl',
    'htaccess.rewrite.tpl',
    'serendipity_config_local.tpl',
    'serendipity_config_user.tpl',
    'INSTALL',
    'LICENSE',
    'NEWS',
    'README',
    'TODO',
    'upgrade.sh',
    'templates/default/layout.php'
);

/* Functions which needs to be run if installed version is equal or lower */
$tasks = array('0.5.1' => array('function' => 'serendipity_syncThumbs',
                                'title' => 'Image Sync',
                                'desc' => 'Version 0.5.1 introduces image sync with the database'. "\n" .
                                          'With your permission I would like to perform the image sync'),

               '0.6.5' => array('function' => 'serendipity_rebuildCategoryTree',
                                'title' => 'Nested subcategories, post to multiple categories',
                                'desc' => 'This update will update the categories table of your database and update the relations from entries to categories.'. "\n" .
                                          'This is a possibly dangerous task to perform, so <strong style="color: red">make sure you have a backup of your database!</strong>'),

               '0.6.8' => array('function' => 'serendipity_installFiles',
                                'title' => 'Update of .htaccess file',
                                'desc' => 'Changes were made to the .htaccess file, you need to regenerate it'),

               '0.6.10' => array('functon' => 'serendipity_installFiles',
                                'title' => 'Update of .htaccess file',
                                'desc' => 'Changes were made to the .htaccess file, you need to regenerate it'),

               '0.6.12' => array('function' => 'serendipity_installFiles',
                                'title' => 'Update of .htaccess file',
                                'desc' => 'Changes were made to the .htaccess file, you need to regenerate it'),

               '0.8-alpha3' => array('function'  => 'serendipity_removeFiles',
                                     'title'     => 'Removal of obsolete files',
                                     'arguments' => $obsolete_files,
                                     'desc'      => 'The directory structure has been reworked. The following files will be moved to a folder called "backup". If you made manual changes to those files, be sure to read the file docs/CHANGED_FILES to re-implement your changes.<br /><div style="font-size: x-small; margin: 15px">' . implode(', ', $obsolete_files) . '</div>')
);

/* Fetch SQL files which needs to be run */
$dir      = opendir(S9Y_INCLUDE_PATH . 'sql/');
$tmpfiles = array();
while (($file = readdir($dir)) !== false ) {
    if (preg_match('@db_update_(.*)_(.*)_(.*).sql@', $file, $res)) {
        list(, $verFrom, $verTo, $dbType) = $res;
        if (version_compare($verFrom, serendipity_version($serendipity['versionInstalled'])) >= 0) {
            $tmpFiles[$verFrom][$dbType] = $file;
        }
    }
}

$sqlfiles = array();
if (is_array($tmpFiles)) {
    foreach ($tmpFiles as $version => $db) {
        if (array_key_exists($serendipity['dbType'], $db) === false ) {
            $sqlfiles[$version] = $db['mysql'];
        } else {
            $sqlfiles[$version] = $db[$serendipity['dbType']];
        }
    }
}

@uksort($sqlfiles, "strnatcasecmp");

if ($serendipity['GET']['action'] == 'ignore') {
    /* Todo: Don't know what to put here? */

} elseif ($serendipity['GET']['action'] == 'upgrade') {

    /* Install SQL files */
    foreach ($sqlfiles as $sqlfile) {
        $sql = file_get_contents(S9Y_INCLUDE_PATH .'sql/'. $sqlfile);
        $sql = str_replace('{PREFIX}', $serendipity['dbPrefix'], $sql);
        preg_match_all("@(.*);@iUs", $sql, $res);
        foreach ($res[0] as $sql) {
            $r = serendipity_db_schema_import($sql);
            if (is_string($r)) {
                $errors[] = $r;
            }
        }
    }


    /* Call functions */
    $errors = array();
    foreach ($tasks as $version => $task) {
        if (version_compare(serendipity_version($serendipity['versionInstalled']), $version, '<') ) {
            if (is_callable($task['function'])) {
                echo 'Calling ' . $task['function'] . '...<br />';
                if (empty($task['arguments']) || !is_array($task['arguments'])) {
                    $task['arguments'] = array();
                }
                call_user_func($task['function'], $task['arguments']);
            } else {
                $errors[] = 'Unable to call '. $task['function'];
            }
        }
    }

    if (sizeof($errors)) {
        echo DIAGNOSTIC_ERROR . '<br /><br />';
        echo '<span class="serendipity_msg_important">- ' . implode('<br />', $errors) . '</span><br /><br />';
    }

}

if (($showAbort && $serendipity['GET']['action'] == 'ignore') || $serendipity['GET']['action'] == 'upgrade') {
    $privateVariables = array();
    if (isset($serendipity['UpgraderShowAbort'])) {
        $privateVariables['UpgraderShowAbort'] = $serendipity['UpgraderShowAbort'];
    }

    $r = serendipity_updateLocalConfig(
           $serendipity['dbName'],
           $serendipity['dbPrefix'],
           $serendipity['dbHost'],
           $serendipity['dbUser'],
           $serendipity['dbPass'],
           $serendipity['dbType'],
           'serendipity_config_local.inc.php',
           null,
           $privateVariables
    );

    if ($serendipity['GET']['action'] == 'ignore') {
        echo SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED;
    } elseif ($serendipity['GET']['action'] == 'upgrade') {
        printf(SERENDIPITY_UPGRADER_NOW_UPGRADED, $serendipity['version']);
    }
    echo '<br />';
    printf(SERENDIPITY_UPGRADER_RETURN_HERE, '<a href="'. $serendipity['serendipityHTTPPath'] .'">', '</a>');
    $_SESSION['serendipityAuthedUser'] = false;
    @session_destroy();
} else {
    echo SERENDIPITY_UPGRADER_WELCOME . '<br />';
    printf(SERENDIPITY_UPGRADER_PURPOSE . '<br />', $serendipity['versionInstalled']);
    printf(SERENDIPITY_UPGRADER_WHY, $serendipity['version']);

    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>';
        }
    }
?>
<br />

<h3><?php echo SERENDIPITY_UPGRADER_VERSION_SPECIFIC ?>:</h3>
<?php
    $taskCount = 0;

    foreach ( $tasks as $version => $task ) {
        if (version_compare(serendipity_version($serendipity['versionInstalled']), $version, '<'))  {
            echo '<div><strong>'. $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;
    }
?>

<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 ?>'"> <?php if ($showAbort) { ?><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_ABORT ?>" onclick="location.href='<?php echo $abortLoc ?>'"> <?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 ?>'">
<?php }
}
?>

--- NEW FILE: overview.inc.php ---
<?php # $Id: overview.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $

##########################################################################
# serendipity - another blogger...                                       #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                      #
#                                                                        #
##########################################################################

if (IN_serendipity !== true) {
    die ("Don't hack!");
}

echo WELCOME_BACK . ' ' . $_SESSION['serendipityUser'] . '.';
echo '<br /><br />'. RUNNING .  $serendipity['version'];
/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: rss_exchange.inc.php ---
<?php # $Id: rss_exchange.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $

require_once 'bundled-libs/Onyx/RSS.php';

function serendipity_rss_buildEntry($item, &$entry)
{
    global $serendipity;

    $entry    = array();
    $bodyonly = (isset($serendipity['POST']['bodyonly']) && $serendipity['POST']['bodyonly'] == 'true' ? true : false);

    if ($item['description']) {
        $entry['body'] = utf8_decode($item['description']);
    }

    if ($item['content:encoded']) {
        if (!isset($entry['body']) || $bodyonly) {
            $data = &$entry['body'];
        } else {
            $data = &$entry['extended'];
        }

        // See if the 'description' element is a substring of the 'content:encoded' part. If it is,
        // we will only fetch the full 'content:encoded' part. If it's not a substring, we append
        // the 'content:encoded' part to either body or extended entry (respecting the 'bodyonly'
        // switch). We substract 4 letters because of possible '...' additions to an entry.
        $testbody = substr(trim(strip_tags($entry['body'])), 0, -4);
        if ($testbody != substr(trim(strip_tags($item['content:encoded'])), 0, strlen($testbody))) {
            $data .= utf8_decode($item['content:encoded']);
        } else {
            $data = utf8_decode($item['content:encoded']);
        }
    }

    $entry['title'] = utf8_decode($item['title']);
    $entry['timestamp'] = utf8_decode(strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']));
    if ($entry['timestamp'] == -1) {
        $entry['timestamp'] = time();
    }

    if ($serendipity['POST']['type'] == 'draft') {
        $entry['isdraft'] = 'true';
    } else {
        $entry['isdraft'] = 'false';
    }

    if (!empty($item['category'])) {
        $cat = serendipity_fetchCategoryInfo(0, trim(utf8_decode($item['category'])));
        if (is_array($cat) && isset($cat['categoryid'])) {
            $entry['categories'][] = $cat['categoryid'];
        }
    }

    if (!is_array($entry['categories'])) {
        $entry['categories'][] = $serendipity['POST']['category'];
    }

    if (!isset($entry['extended'])) {
        $entry['extended'] = '';
    }

    $entry['allow_comments'] = true;

    return true;
}

function serendipity_rss_import($url)
{
    global $serendipity;

    $c = &new Onyx_RSS();
    $c->parse($url);

    $serendipity['noautodiscovery'] = 1;
    while ($item = $c->getNextItem()) {
        if (serendipity_rss_buildEntry($item, $entry)) {
            serendipity_updertEntry($entry);
        }
    }

    return true;
}

/**
* Import from Movable Type's format.
**/
function serendipity_importMT($contents, $force = false) {
    global $serendipity;

    if ( $serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN ) {
        return array(MUST_BE_ADMIN);
    }

    $authors = array();
    $categories = serendipity_fetchCategories();
    $tasks = array();

    $entries = array();
    $n = 0;
    foreach ( preg_split('/\r?\n--------\r?\n/', $contents) as $entry ) {
        if ( preg_match_all('/([A-Z ]+):( |\r?\n)(.*)\r?\n(-----)?/', $entry, $res) ) {
            $entries[$n]['categories'] = array();
            for ( $x=0 ; $x<sizeof($res[1]) ; $x++ ) {
                switch ( $res[1][$x] ) {
                    case 'AUTHOR':
                        if ( !isset($authors[$res[3][$x]]) ) {
                            $au_inf = serendipity_fetchAuthor($res[3][$x]);
                            if ( !is_array($au_inf) ) {
                                $tasks[] = sprintf(CREATE_AUTHOR, htmlspecialchars($res[3][$x]));
                                $au_inf = serendipity_fetchAuthor($serendipity['authorid']);
                            }
                            $authors[$res[3][$x]] = $au_inf[0];
                        }
                        $entries[$n]['authorid'] = $authors[$res[3][$x]]['authorid'];
                        $entries[$n]['author'] = $authors[$res[3][$x]]['username'];
                        break;
                    case 'TITLE':
                        $entries[$n]['title'] = $res[3][$x];
                        break;
                    case 'STATUS':
                        $entries[$n]['isdraft'] = ($res[3][$x] == 'Publish') ? 'false' : 'true';
                        break;
                    case 'ALLOW COMMENTS':
                        $entries[$n]['allow_comments'] = ($res[3][$x] == '1') ? 'true' : 'false';
                        break;
                    case 'DATE':
                        $entries[$n]['timestamp'] = strtotime($res[3][$x]);
                        if ( $entries[$n]['timestamp'] == 0 ) {
                            $entries[$n]['timestamp'] = time();
                        }
                        break;
                    case 'BODY':
                        $entries[$n]['body'] = $res[3][$x];
                        break;
                    case 'EXTENDED BODY':
                        $entries[$n]['extended'] = $res[3][$x];
                        break;
                    case 'PRIMARY CATEGORY':
                    case 'CATEGORY':
                        $cat_found = false;
                        if ( is_array($categories) ) {
                            for ( $y=0 ; $y<sizeof($categories) ; $y++ ) {
                                if ( $categories[$y]['category_name'] == $res[3][$x] ) {
                                    $cat_found = true;
                                    break;
                                }
                            }
                        }
                        if ( $cat_found && !in_array($categories[$y]['categoryid'], $entries[$n]['categories']) ) {
                            $entries[$n]['categories'][] = $categories[$y]['categoryid'];
                            $entries[$n]['categories'][] = $categories[$y]['categoryid'];
                        }
                        else {
                            $tasks[] = sprintf(CREATE_CATEGORY, htmlspecialchars($res[3][$x]));
                        }
                        break;
                }
            }
        }
        $n++;
    }

    if ( !sizeof($tasks) || $force == true ) {
        foreach ( $entries as $entry ) {
            if ( !is_int($r = serendipity_updertEntry($entry)) ) {
                echo '<div class="important">' . $r . '</div>';
            }
        }
        return true;
    }
    else {
        return array_unique($tasks);
    }
}

/**
* Import from a WordPress installation.
**/
function serendipity_importWP($wp) {
    global $serendipity;

    $wp['prefix'] = serendipity_db_escape_string($wp['prefix']);
    $users = array();
    $categories = array();
    $entries = array();

    if ( $serendipity['serendipityUserlevel'] < USERLEVEL_ADMIN ) {
        return MUST_BE_ADMIN;
    }

    if ( !extension_loaded('mysql') ) {
        return MYSQL_REQUIRED;;
    }

    $wpdb = @mysql_connect($wp['host'], $wp['user'], $wp['pass']);
    if ( !$wpdb ) {
        return sprintf(COULDNT_CONNECT, mysql_error($wpdb));
    }

    if ( !@mysql_select_db($wp['name']) ) {
        return sprintf(COULDNT_SELECT_DB, mysql_error($wpdb));
    }

    /* Users */
    $res = @mysql_query("SELECT ID, user_login, user_pass, user_email, user_level FROM {$wp['prefix']}users;", $wpdb);
    if ( !$res ) {
        return sprintf(COULDNT_COULDNT_SELECT_USER_INFO, mysql_error($wpdb));
    }

    for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
        $users[$x] = mysql_fetch_assoc($res);

        $data = array('right_publish' => ($users[$x]['user_level'] >= 1) ? 1 : 0,
                      'username'      => $users[$x]['user_login'],
                      'password'      => $users[$x]['user_pass']); // WP uses md5, too.

        if ( $users[$x]['user_level'] <= 1 ) {
            $data['userlevel'] = USERLEVEL_EDITOR;
        } elseif ( $users[$x]['user_level'] < 5 ) {
            $data['userlevel'] = USERLEVEL_CHIEF;
        } else {
            $data['userlevel'] = USERLEVEL_ADMIN;
        }

        serendipity_db_insert('authors', $data);
        $users[$x]['authorid'] = serendipity_db_insert_id('authors', 'authorid');
    }

    /* Categories */
    $res = @mysql_query("SELECT cat_ID, cat_name, category_description, category_parent FROM {$wp['prefix']}categories ORDER BY category_parent, cat_ID;", $wpdb);
    if ( !$res ) {
        return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($wpdb));
    }

    // Get all the info we need
    for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ )
        $categories[] = mysql_fetch_assoc($res);

    // Insert all categories as top level (we need to know everyone's ID before we can represent the hierarchy).
    for ( $x=0 ; $x<sizeof($categories) ; $x++ ) {
        $cat = array('category_name'        => $categories[$x]['cat_name'],
                     'category_description' => $categories[$x]['category_description'],
                     'parentid'             => 0, // <---
                     'category_left'        => 0,
                     'category_right'       => 0);

        serendipity_db_insert('category', $cat);
        $categories[$x]['categoryid'] = serendipity_db_insert_id('category', 'categoryid');
    }

    // There has to be a more efficient way of doing this...
    foreach ( $categories as $cat ) {
        if ( $cat['category_parent'] != 0 ) {
            // Find the parent
            $par_id = 0;
            foreach ( $categories as $possible_par ) {
                if ( $possible_par['cat_ID'] == $cat['category_parent'] ) {
                    $par_id = $possible_par['categoryid'];
                    break;
                }
            }

            if ( $par_id != 0 ) {
              serendipity_db_query("UPDATE {$serendipity['dbPrefix']}category SET parentid={$par_id} WHERE categoryid={$cat['categoryid']};");
            } // else { echo "D'oh! " . random_string_of_profanity(); }
        }
    }

    serendipity_rebuildCategoryTree();

    /* Entries */
    $res = @mysql_query("SELECT * FROM {$wp['prefix']}posts ORDER BY post_date;", $wpdb);
    if ( !$res ) {
        return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($wpdb));
    }

    for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
        $entries[$x] = mysql_fetch_assoc($res);

        $entry = array('title' => $entries[$x]['post_title'],
                       'isdraft' => ($entries[$x]['post_status'] == 'publish') ? 'false' : 'true',
                       'allow_comments' => ($entries[$x]['comment_status '] == 'open ') ? 'true' : 'false',
                       'timestamp' => strtotime($entries[$x]['post_date']),
                       'body' => $entries[$x]['post_content']);

        foreach ( $users as $user ) {
            if ( $user['ID'] == $entries[$x]['post_author'] ) {
                $entry['authorid'] = $user['authorid'];
                break;
            }
        }

        if ( !is_int($entries[$x]['entryid'] = serendipity_updertEntry($entry)) ) {
            return $entries[$x]['entryid'];
        }
    }

    /* Entry/category */
    $res = @mysql_query("SELECT * FROM {$wp['prefix']}post2cat;", $wpdb);
    if ( !$res ) {
        return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($wpdb));
    }

    while ( $a = mysql_fetch_assoc($res) ) {
        foreach ( $categories as $category ) {
            if ( $category['cat_ID'] == $a['category_id'] ) {
                foreach ( $entries as $entry ) {
                    if ( $a['post_id'] == $entry['ID'] ) {
                        $data = array('entryid' => $entry['entryid'],
                                      'categoryid' => $category['categoryid']);
                        serendipity_db_insert('entrycat', $data);
                        break;
                    }
                }
                break;
            }
        }
    }

    /* Comments */
    $res = @mysql_query("SELECT * FROM {$wp['prefix']}comments;", $wpdb);
    if ( !$res ) {
        return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($wpdb));
    }

    while ( $a = mysql_fetch_assoc($res) ) {
        foreach ( $entries as $entry ) {
            if ( $entry['ID'] == $a['comment_post_ID'] ) {
                $comment = array('entry_id ' => $entry['entryid'],
                                 'parent_id' => 0,
                                 'timestamp' => strtotime($a['comment_date']),
                                 'author' => $a['comment_author'],
                                 'email' => $a['comment_author_email'],
                                 'url' => $a['comment_author_url'],
                                 'ip' => $a['comment_author_IP'],
                                 'status' => 'approved',
                                 'body' => $a['comment_content'],
                                 'type' => 'NORMAL');

                serendipity_db_insert('comments', $comment);
                serendipity_approveComment($cid, $id, true);
            }
        }
    }

    // That was fun.
    return false;
}

/* vim: set sts=4 ts=4 expandtab : */
?>
--- NEW FILE: installer.inc.php ---
<?php # $Id: installer.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $

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

require_once('serendipity_config.inc.php');
require_once(S9Y_INCLUDE_PATH . 'include/functions_installer.inc.php');
require_once S9Y_INCLUDE_PATH . 'include/functions_config.inc.php';

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

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

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

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

            echo '<br />';

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

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

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

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

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

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

            printf(
              SERENDIPITY_INSTALLED . '<br />',

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

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

              '<br /><br />',

              $_POST['serendipityHTTPPath']
            );

            @session_destroy();

        }

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

        break;

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

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

        $t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);

        // If s9y is installed, append the current userconfiguration
        if (IS_installed === true) {
            $t = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, false, $t);
        }

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

/* vim: set sts=4 ts=4 expandtab : */
?>
--- NEW FILE: interop.inc.php ---
<?php # $Id: interop.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $

include_once S9Y_INCLUDE_PATH . 'include/admin/rss_exchange.inc.php';
if (IN_serendipity !== true) {
    die ("Don't hack!");
}

session_start();

if (!empty($serendipity['POST']['url'])) {
    if (serendipity_rss_import($serendipity['POST']['url'])) {
        echo ENTRIES_SUCCESSFULLY_INSERTED . "\n<br />\n";
    } else {
        echo ENTRIES_NOT_SUCCESSFULLY_INSERTED . "\n<br />\n";
    }
} else if (!empty($serendipity['POST']['export'])) {
?>
    <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&amp;all=1"><?php echo VIEW_FEED_EXPORT; ?></a>
<?php
    exit;
} else if (isset($serendipity['POST']['import_mt'])) {
    $tasks = serendipity_importMT(file_get_contents($_FILES['serendipity']['tmp_name']['mt_dat']), isset($serendipity['POST']['mt_force']));

    if ( is_array($tasks) ) {
        echo MAX_COMPAT_OLD_BLOG . "\n<ul>\n";
        foreach ( array_unique($tasks) as $task ) {
            echo "  <li>$task</li>\n";
        }
        echo "</ul>\n" . IMPORT_AGAIN_FORCE;
    }
    else {
        echo ENTRIES_SUCCESSFULLY_INSERTED . "\n<br />\n";
    }
} else if (isset($serendipity['POST']['wp']['submit'])) {
    if ( $wp_err = serendipity_importWP($serendipity['POST']['wp']) ) {
        echo '<div class="serendipity_msg_important">' . var_dump($wp_err) . '</div>';
    }
}

?>

<p>
    <h3><?php echo IMPORT; ?> RSS</h3>

    <form method="POST">
        <div>
            <?php echo RSS_IMPORT_DESC; ?><br /><br />

            RSS URL: <input type="text" name="serendipity[url]" size="30" /> <?php echo TYPE . ': '; ?><select name="type">
                <option value="draft"><?php echo DRAFT; ?></option>
                <option value="publish"><?php echo PUBLISH; ?></option>
            </select><br />

            <?php
            $cats = serendipity_fetchCategories('all');
            echo RSS_IMPORT_CATEGORY . ': ';
            ?>
            <select name="serendipity[category]">
                <option value="0">[ <?php echo NO_CATEGORY; ?> ]</option>
                <?php echo serendipity_generateCategoryList($cats, array(), 1); ?>
            </select><br />
            <input type="checkbox" name="serendipity[bodyonly]" id="bodyonly" value="true" /><label for="bodylonly"><?php echo RSS_IMPORT_BODYONLY; ?></label><br />
            <input type="submit" value="<?php echo IMPORT; ?> RSS" />

        </div>
    </form>
</p>

<p>
    <h3><?php echo IMPORT . ' ' . MT_DATA_FILE; ?></h3>

    <form method="post" enctype="multipart/form-data">
<?php if (serendipity_maxFileUploadSize()) { ?>
        <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo serendipity_maxFileUploadSize(); ?>" />
<?php } ?>
        <div>
            <label for="serendipity[mt_dat]"><?php echo MT_DATA_FILE; ?></label>
            <input id="serendipity[mt_dat]" type="file" name="serendipity[mt_dat]" size="30" />
        </div>
        <div>
            <label for="serendipity[mt_force]"><?php echo FORCE; ?></label>
            <input id="serendipity[mt_force]" type="checkbox" name="serendipity[mt_force]" size="30" />
        </div>
        <div>
            <input type="submit" name="serendipity[import_mt]" value="<?php echo IMPORT . ' ' . MT_DATA_FILE; ?>" />
        </div>
    </form>
</p>

<p>
    <h3><?php echo IMPORT . ' ' . WORDPRESS_DATA; ?></h3>

    <form method="post">
        <div>
            <label for="serendipity_wp_host"><?php echo INSTALL_DBHOST; ?>:</label>
            <input type="text" name="serendipity[wp][host]" value="<?php echo isset($serendipity['POST']['wp']['host']) ? $serendipity['POST']['wp']['host'] : $serendipity['dbHost']; ?>" id="serendipity_wp_host"/>
        </div>
        <div>
            <label for="serendipity_wp_user"><?php echo INSTALL_DBUSER; ?>:</label>
            <input type="text" name="serendipity[wp][user]" value="<?php echo isset($serendipity['POST']['wp']['user']) ? $serendipity['POST']['wp']['user'] : $serendipity['dbUser']; ?>" id="serendipity_wp_user"/>
        </div>
        <div>
            <label for="serendipity_wp_pass"><?php echo INSTALL_DBPASS; ?>:</label>
            <input type="password" name="serendipity[wp][pass]" <?php echo isset($serendipity['POST']['wp']['pass']) ? 'value="' . $serendipity['POST']['wp']['pass'] . '" ' : ($serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN ? 'value="' . $serendipity['dbPass'] . '" ' : '') ?>id="serendipity_wp_pass"/>
        </div>
        <div>
            <label for="serendipity_wp_name"><?php echo INSTALL_DBNAME; ?>:</label>
            <input type="text" name="serendipity[wp][name]" value="<?php echo isset($serendipity['POST']['wp']['name']) ? $serendipity['POST']['wp']['name'] : $serendipity['dbName']; ?>" id="serendipity_wp_name"/>
        </div>
        <div>
            <label for="serendipity_wp_prefix"><?php echo INSTALL_DBPREFIX; ?>:</label>
            <input type="text" name="serendipity[wp][prefix]" value="<?php echo isset($serendipity['POST']['wp']['prefix']) ? $serendipity['POST']['wp']['prefix'] : 'wp_'; ?>" id="serendipity_wp_prefix"/>
        </div>
        <div>
            <input type="submit" name="serendipity[wp][submit]" value="<?php echo IMPORT . ' ' . WORDPRESS_DATA; ?>" />
        </div>
    </form>
</p>

<p>
    <h3><?php echo EXPORT; ?></h3>

    <form method="POST">
        <div>
            <input type="submit" name="serendipity[export]" value="<?php echo EXPORT; ?> RSS" />
        </div>
    </form>
</p>

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

--- NEW FILE: entries.inc.php ---
<?php # $Id: entries.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $

##########################################################################
# serendipity - another blogger...                                       #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                      #
#                                                                        #
##########################################################################

if (IN_serendipity !== true) {
    die ("Don't hack!");
}

$sort_order = array('timestamp'     => DATE,
                    'username'      => AUTHOR,
                    'category_name' => CATEGORY,
                    'last_modified' => LAST_UPDATED,
                    'title'         => TITLE);
$per_page = array('12', '16', '50', '100');


// A little helper we don't want in _functions.inc.php
function serendipity_drawList() {
    global $serendipity, $sort_order, $per_page;

    $perPage = (!empty($serendipity['GET']['sort']['perPage']) ? $serendipity['GET']['sort']['perPage'] : $per_page[0]);
    $page    = (int)$serendipity['GET']['page'];
    $offSet  = $perPage*$page;

    if (empty($serendipity['GET']['sort']['ordermode'])) {
        $serendipity['GET']['sort']['ordermode'] = 'DESC';
    }

    if (!empty($serendipity['GET']['sort']['order'])) {
        $orderby = serendipity_db_escape_string($serendipity['GET']['sort']['order'] . ' ' . $serendipity['GET']['sort']['ordermode']);
    } else {
        $orderby = 'timestamp ' . serendipity_db_escape_string($serendipity['GET']['sort']['ordermode']);
    }

    $filter = array();
    if (!empty($serendipity['GET']['filter']['author'])) {
        $filter[] = "e.authorid = '" . serendipity_db_escape_string($serendipity['GET']['filter']['author']) . "'";
    }

    if (!empty($serendipity['GET']['filter']['category'])) {
        $filter[] = "ec.categoryid = '" . serendipity_db_escape_string($serendipity['GET']['filter']['category']) . "'";
    }

    if (!empty($serendipity['GET']['filter']['body'])) {
        if ($serendipity['dbType'] == 'mysql') {
            $filter[] = "MATCH (title,body,extended) AGAINST ('" . serendipity_db_escape_string($serendipity['GET']['filter']['body']) . "')";
            $full     = true;
        }
    }

    $filter_sql = implode(' AND ', $filter);

    // Fetch the entries
    $entries = serendipity_fetchEntries(
                 false,
                 false,
                 serendipity_db_limit(
                   $offSet,
                   $perPage
                 ),
                 true,
                 false,
                 $orderby,
                 $filter_sql
               );
?>
<form action="?" method="get">
<div class="serendipity_admin_list">
    <input type="hidden" name="serendipity[action]"      value="admin"      />
    <input type="hidden" name="serendipity[adminModule]" value="entries"    />
    <input type="hidden" name="serendipity[adminAction]" value="editSelect" />
    <table width="100%" class="serendipity_admin_filters">
        <tr>
            <td class="serendipity_admin_filters_headline" colspan="6"><strong><?php echo FILTERS ?></strong> - <?php echo FIND_ENTRIES ?></td>
        </tr>
        <tr>
            <td width="80"><?php echo AUTHOR ?></td>
            <td>
                <select name="serendipity[filter][author]">
                    <option value="">--</option>
<?php
                    $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";
                        }
                    }
?>              </select>
            </td>
            <td width="80"><?php echo CATEGORY ?></td>
            <td>
                <select name="serendipity[filter][category]">
                    <option value="">--</option>
<?php
                    $categories = serendipity_fetchCategories();
                    if (is_array($categories)) {
                        echo serendipity_generateCategoryList($categories, (isset($serendipity['GET']['filter']['category']) ? array($serendipity['GET']['filter']['category']) : array(0)), 2);
                    }
?>              </select>
            </td>
            <td width="80"><?php echo CONTENT ?></td>
            <td><input size="10" type="text" name="serendipity[filter][body]" value="<?php echo (isset($serendipity['GET']['filter']['body']) ? htmlspecialchars($serendipity['GET']['filter']['body']) : '') ?>" /></td>
        </tr>
        <tr>
            <td class="serendipity_admin_filters_headline" colspan="6"><strong><?php echo SORT_ORDER ?></strong></td>
        </tr>
        <tr>
            <td><?php echo SORT_BY ?></td>
            <td>
                <select name="serendipity[sort][order]">
<?php
    foreach($sort_order as $so_key => $so_val) {
        echo '<option value="' . $so_key . '" ' . (isset($serendipity['GET']['sort']['order']) && $serendipity['GET']['sort']['order'] == $so_key ? 'selected="selected"': '') . '>' . $so_val . '</option>' . "\n";
    }
?>              </select>
            </td>
            <td><?php echo SORT_ORDER ?></td>
            <td>
                <select name="serendipity[sort][ordermode]">
                    <option value="DESC" <?php echo (isset($serendipity['GET']['sort']['ordermode']) && $serendipity['GET']['sort']['ordermode'] == 'DESC' ? 'selected="selected"' : '') ?>><?php echo SORT_ORDER_DESC ?></option>
                    <option value="ASC" <?php echo (isset($serendipity['GET']['sort']['ordermode']) && $serendipity['GET']['sort']['ordermode'] == 'ASC'  ? 'selected="selected"' : '') ?>><?php echo SORT_ORDER_ASC ?></option>
                </select>
            </td>
            <td><?php echo ENTRIES_PER_PAGE ?></td>
            <td>
                <select name="serendipity[sort][perPage]">
<?php
    foreach($per_page AS $per_page_nr) {
       echo '<option value="' . $per_page_nr . '"   ' . (isset($serendipity['GET']['sort']['perPage']) && $serendipity['GET']['sort']['perPage'] == $per_page_nr ? 'selected="selected"' : '') . '>' . $per_page_nr . '</option>' . "\n";
    }

?>
                </select>
            </td>
        </tr>
        <tr>
            <td align="right" colspan="6"><input type="submit" name="go" value="<?php echo GO ?>" /></td>
        </tr>
    </table>
    <table class="serendipity_admin_list" cellpadding="5" width="100%">
<?php
    if (is_array($entries)) {
        $count = count($entries);
        $qString = '?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect';
        foreach ((array)$serendipity['GET']['sort'] as $k => $v) {
            $qString .= '&amp;serendipity[sort]['. $k .']='. $v;
        }
        foreach ((array)$serendipity['GET']['filter'] as $k => $v) {
            $qString .= '&amp;serendipity[filter]['. $k .']='. $v;
        }
        $linkPrevious = $qString . '&amp;serendipity[page]=' . ($page-1);
        $linkNext     = $qString . '&amp;serendipity[page]=' . ($page+1);
?>
        <tr>
            <td>
                <input type="button" name="serendipity[prevpage]" value="&lt;&lt;&lt;" onclick="location.href='<?php echo $linkPrevious ?>'" <?php if ($offSet <= 0) echo ' disabled="disabled"' ?> />
            </td>
            <td align="right">
                <input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" onclick="location.href='<?php echo $linkNext ?>'" <?php if ($count != $perPage) echo ' disabled="disabled"'; ?> />
            </td>
        </tr>
    </table>
    <table class="serendipity_admin_list" cellpadding="5" width="100%">
<?php
        // Print the entries
        $rows = 0;
        foreach ( $entries as $entry ) {
            $rows++;
            // Find out if the entry has been modified later than 30 minutes after creation
            if ($entry['timestamp'] <= ($entry['last_modified'] - 60*30)) {
                $lm = '<a href="#" title="' . LAST_UPDATED . ': ' . serendipity_formatTime(DATE_FORMAT_SHORT, $entry['last_modified']) . '" onclick="alert(this.title)">*</a>';
            } else {
                $lm = '';
            }

?>
        <tr>
            <td class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo ($rows % 2 ? 'even' : 'uneven'); ?>">
                <table width="100%">
                    <tr>
                        <td>
                            <strong><?php if ($entry['isdraft'] == 'true') echo DRAFT . ': '; ?><a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo serendipity_truncateString($entry['title'],50) ?></a></strong>
                        </td>
                        <td align="right">
                            <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entry['timestamp']) . ' ' .$lm; ?>
                        </td>
                    </tr>
                    <tr>
                        <td>
                            <?php
                echo POSTED_BY . ' ' . $entry['username'];
                if (count($entry['categories'])) {
                    echo ' ' . IN . ' ';
                    $cats = array();
                    foreach ($entry['categories'] as $cat) {
                        $cats[] = '<a href="' . $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'categories/' . $cat['categoryid'] . '_' . serendipity_makeFilename($cat['category_name']) . '">' . $cat['category_name'] . '</a>';
                    }
                    echo implode(', ', $cats);
                }
                ?>

                        </td>
                        <td align="right">
                            [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo EDIT ?></a>]
                          - [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $entry['id']; ?>" title="#<?php echo $entry['id']; ?>"><?php echo DELETE ?></a>]
                        </td>
                    </tr>
                </table>
            </td>
        </tr>
<?php
        } // end entries output
?>

        <tr>
            <td class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo (($rows+1) % 2 ? 'even' : 'uneven'); ?>">
                <br />
                    <?php echo EDIT_ENTRY . ': #<input type="text" size="3" name="serendipity[id]" /> <input type="submit" name="serendipity[editSubmit]" value="' . GO . '" />'; ?>
            </td>
        </tr>
 <?php
    } else {
        // We've got nothing
?>
        <tr>
            <td align="center">
                - <?php echo NO_ENTRIES_TO_PRINT ?> -
            </td>
        </tr>
<?php
    }
?>
    </table>
</div>
</form>
<?php
} // End function serendipity_drawList()

if (!empty($serendipity['GET']['editSubmit'])) {
    $serendipity['GET']['adminAction'] = 'edit';
}

switch($serendipity['GET']['adminAction']) {
    case 'save':
        $entry = array(
                   'id'                 => $serendipity['POST']['id'],
                   'title'              => $serendipity['POST']['title'],
                   'timestamp'          => $serendipity['POST']['timestamp'],
                   'body'               => $serendipity['POST']['body'],
                   'extended'           => $serendipity['POST']['extended'],
                   'categories'         => $serendipity['POST']['categories'],
                   'isdraft'            => $serendipity['POST']['isdraft'],
                   'allow_comments'     => $serendipity['POST']['allow_comments'],
                   'moderate_comments'  => $serendipity['POST']['moderate_comments'],
                   'exflag'             => (!empty($serendipity['POST']['extended']) ? true : false)
        );

        if ($entry['allow_comments'] != 'true' && $entry['allow_comments'] !== true) {
            $entry['allow_comments'] = 'false';
        }

        if ($entry['moderate_comments'] != 'true' && $entry['moderate_comments'] !== true) {
            $entry['moderate_comments'] = 'false';
        }

        // Check if the user changed the timestamp.
        if (isset($serendipity['allowDateManipulation']) && $serendipity['allowDateManipulation'] && isset($serendipity['POST']['new_timestamp']) && $serendipity['POST']['new_timestamp'] != date(DATE_FORMAT_2, $serendipity['POST']['chk_timestamp'])) {
            // The user changed the timestamp, now set the DB-timestamp to the user's date
            $entry['timestamp'] = strtotime($serendipity['POST']['new_timestamp']);

            if ($entry['timestamp'] == -1) {
                echo DATE_INVALID . '<br />';
                // The date given by the user is not convertable. Reset the timestamp.
                $entry['timestamp'] = $serendipity['POST']['timestamp'];
            }
        }

        if ($serendipity['POST']['quicksave'] == 'true') {
            // When quicksaving a new entry, set it to 'draft'
            if (!is_numeric($entry['id'])) {
                $entry['isdraft'] = 'true';
            }

            $serendipity['POST']['preview'] = 'true';
            $res = serendipity_updertEntry($entry);
            if (is_string($res)) {
                echo '<div class="serendipity_msg_error">' . QUICKSAVE . ': <b>' . $res . '</b></div><br />';
            } else {
                // serendipity_updertEntry sets this global variable to store the entry id. Couldn't pass this
                // by reference or as return value because it affects too many places inside our API and dependant
                // function calls.
                if (!empty($serendipity['lastSavedEntry'])) {
                    $entry['id'] = $serendipity['lastSavedEntry'];
                }
                echo '<div class="serendipity_msg_notice">' . QUICKSAVE . ': ' . ENTRY_SAVED . '</div><br />';
            }
        }

        // Save the entry, or just display a preview
        if ($serendipity['POST']['preview'] != 'true') {
            $res = serendipity_updertEntry($entry);
            if (is_string($res)) {
                serendipity_printEntryForm(
                  '?',
                  array(
                    'serendipity[action]'      => 'admin',
                    'serendipity[adminModule]' => 'entries',
                    'serendipity[adminAction]' => 'save'
                  ),
                  $entry,
                  ERROR . ': <b>' . $res . '</b>');
            } else {
                echo '<div class="serendipity_msg_notice">' . ENTRY_SAVED . '</div>';
            }
        } else {
            // Only display the preview
            $serendipity['hidefooter'] = true;
            if (!is_numeric($entry['timestamp'])) $entry['timestamp']  = time();
            if (!isset($entry['trackbacks']) || !$entry['trackbacks']) $entry['trackbacks'] = 0;
            if (!isset($entry['comments']) || !$entry['comments'])     $entry['comments']   = 0;
            if (!isset($entry['username']) || !$entry['username'])     $entry['username']   = $serendipity['serendipityUser'];

            $categories ...
 
[truncated message content]

[php-blog-cvs] serendipity/include compat.inc.php,NONE,1.1.2.1 functions.inc.php,NONE,1.1.2.1 functions_comments.inc.php,NONE,1.1.2.1 functions_config.inc.php,NONE,1.1.2.1 functions_entries.inc.php,NONE,1.1.2.1 functions_images.inc.php,NONE,1.1.2.1 functions_installer.inc.php,NONE,1.1.2.1 functions_smarty.inc.php,NONE,1.1.2.1 functions_trackbacks.inc.php,NONE,1.1.2.1 genpage.inc.php,NONE,1.1.2.1 lang.inc.php,NONE,1.1.2.1 plugin_api.inc.php,NONE,1.1.2.1 plugin_internal.inc.php,NONE,1.1.2.1

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

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

Added Files:
      Tag: branch-smarty
	compat.inc.php functions.inc.php functions_comments.inc.php 
	functions_config.inc.php functions_entries.inc.php 
	functions_images.inc.php functions_installer.inc.php 
	functions_smarty.inc.php functions_trackbacks.inc.php 
	genpage.inc.php lang.inc.php plugin_api.inc.php 
	plugin_internal.inc.php 
Log Message:
* renamed files as announced on the list. upgrader will take care of moving
  old files to a 'backup' directory for upgrading (non-CVS) users.
* MFH'ed some parts
* Fixed quicksave button display
* Fixed footer
* Fixed entry preview properly
* Fixed printing categories where no categories appeard in entry view



--- NEW FILE: functions_installer.inc.php ---
<?php # $Id: functions_installer.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $
function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $file = 'serendipity_config_local.inc.php', $path = null, $privateVariables = null) {
    global $serendipity;
    umask(0000);
    if (is_null($path)) {
        $path = $serendipity['serendipityPath'];
    }
    $configfp = fopen($path . $file, 'w');

    if (!is_resource($configfp)) {
        $errs[] = sprintf(FILE_WRITE_ERROR, $file);
        $errs[] = sprintf(DIRECTORY_RUN_CMD, 'chown -R www:www', $path) . ' (' . WWW_USER . ')';
        $errs[] = sprintf(DIRECTORY_RUN_CMD, 'chmod 770'       , $path);
        $errs[] = BROWSER_RELOAD;

        return $errs;
    }

    if (isset($_POST['sqlitedbName']) && !empty($_POST['sqlitedbName'])) {
        $dbName = $_POST['sqlitedbName'];
    }

    fwrite($configfp, "<?php\n");

    fwrite($configfp, "\t/*\n");
    fwrite($configfp, "\t  Serendipity configuration file\n");
    fwrite($configfp, "\t  Written on ". date('r') ."\n");
    fwrite($configfp, "\t*/\n\n");

    fwrite($configfp, "\t\$serendipity['versionInstalled']  = '{$serendipity['version']}';\n");
    fwrite($configfp, "\t\$serendipity['dbName']            = '{$dbName}';\n");
    fwrite($configfp, "\t\$serendipity['dbPrefix']          = '{$dbPrefix}';\n");
    fwrite($configfp, "\t\$serendipity['dbHost']            = '{$dbHost}';\n");
    fwrite($configfp, "\t\$serendipity['dbUser']            = '{$dbUser}';\n");
    fwrite($configfp, "\t\$serendipity['dbPass']            = '{$dbPass}';\n");
    fwrite($configfp, "\t\$serendipity['dbType']            = '{$dbType}';\n");

    if (is_array($privateVariables) && count($privateVariables) > 0) {
        foreach($privateVariables AS $p_idx => $p_val) {
            fwrite($configfp, "\t\$serendipity['{$p_idx}']  = '{$p_val}';\n");
        }
    }

    fwrite($configfp, "?>\n");

    fclose($configfp);

    @chmod($path . $file, 0700);
    return true;
}

function serendipity_query_default($optname, $default, $usertemplate = false, $type = 'string') {
    global $serendipity;

    /* I won't tell you the password, it's MD5 anyway, you can't do anything with it */
    if ( $type == 'protected' && IS_installed === true ) {
        return '';
    }

    switch ($optname) {

        case 'dbType' :
            if ( extension_loaded('mysqli') ) {
                $type = 'mysqli';
            }
            if ( extension_loaded('postgres') ) {
                $type = 'postgres';
            }
            if ( extension_loaded('mysql') ) {
                $type = 'mysql';
            }
            return $type;

        case 'serendipityPath':
            $test_path1 = $_SERVER['DOCUMENT_ROOT'] . rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/';
            $test_path2 = serendipity_getRealDir(__FILE__);
            if (file_exists($test_path1 . 'serendipity_entries.php')) {
                return $test_path1;
            } else {
                return $test_path2;
            }

        case 'serendipityHTTPPath':
            return rtrim(dirname($_SERVER['PHP_SELF']), '/') .'/';

        case 'baseURL':
            $ssl  = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on';
            $port = $_SERVER['SERVER_PORT'];

            return sprintf('http%s://%s%s%s',

                            $ssl ? 's' : '',
                            preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']),
                            (($ssl && $port != 443) || (!$ssl && $port != 80)) ? (':' . $port) : '',
                            rtrim(dirname($_SERVER['PHP_SELF']), '/') .'/'
                   );

        case 'convert':
            if (isset($_EVN['PATH'])) {
                $path = explode(':', $_ENV['PATH']);
            } else {
                $path = '';
            }

            /* add some other possible locations to the path while we are at it,
             * as these are not always included in the apache path */
            $path[] = '/usr/X11R6/bin';
            $path[] = '/usr/bin';

            foreach ($path as $dir) {
                if (function_exists('is_executable') && @is_executable($dir . '/convert') || @is_file($dir . '/convert')) {
                    return $dir . '/convert';
                }
            }
            return $default;

        default:
            if ($usertemplate) {
                return serendipity_get_user_var($optname, $serendipity['authorid'], $default);
            }

            return $default;
    }
}

function serendipity_replaceEmbeddedConfigVars ($s) {
    return str_replace(
                  array(
                    '[USERLEVEL_ADMIN]',
                    '[USERLEVEL_CHIEF]',
                    '[USERLEVEL_EDITOR]',
                    '[LANGUAGE_LIST]'
                  ),

                  array(
                    USERLEVEL_ADMIN,
                    USERLEVEL_CHIEF,
                    USERLEVEL_EDITOR,
                    LANGUAGE_LIST
                  ), $s);
}

function serendipity_parseTemplate($n, $raw = false, $prepend_var = null, $get_defaults = true) {
    global $serendipity;

    if (is_array($prepend_var)) {
        $config = $configRaw = &$prepend_var;
        $usertemplate = true;
    } else {
        $config = $configRaw = array();
        $usertemplate = false;
    }

    $t = file($n, 1);

    $maxt = count($t);

    for ($x=0; $x<$maxt; $x++) {
        $l = $t[$x];
        $l = trim($l);

        if ($l != '') {
            switch ($l[0]) {

                // New Configure section
                case '/':
                    if ($l[1] == '/') {
                        $current = @constant(trim(substr($l, 2)));
                        $config['categories'][$current] = array();
                    }
                    break;

                case '#':
                    $config['descriptions'][$current] = @constant(trim(substr($l, 1)));
                    break;

                // A configure option
                case '$':
                    // Grep out the name, type and default
                    preg_match('#\{([^|]+\|[^|]+\|([^}]+)?)\}[^/]+/{2}(.+)#msi', $l, $match);

                    // Make vars containing the elements in the | list
                    list($constant, $name, $type, $distdefault, $permission, $flags) = explode('|', $match[1]);

                    // Only show directives which are destined for this user. On installation, show everyting.
                    if (IS_installed === false || $serendipity['serendipityUserlevel'] >= $permission) {
                        $cdef = ($get_defaults ? serendipity_query_default($name, $distdefault, $usertemplate, $type) : '');
                        $config['categories'][$current][] = $configRaw[] = array(
                                                'longname'    => @constant($constant),
                                                'name'        => $name,
                                                'type'        => $type,
                                                'default'     => $cdef,
                                                'distdefault' => serendipity_replaceEmbeddedConfigvars($distdefault),
                                                'desc'        => serendipity_replaceEmbeddedConfigVars(@constant(trim($match[3]))),
                                                'valid_for'   => $permission,
                                                'flags'       => explode(',', $flags)
                                              );
                    }
                    break;
            }
        }
    }

    if ($raw) {
        return $configRaw;
    } else {
        // Cleanup phase. Remove categories for which no variables can be defined
        if (isset($config['categories']) && is_array($config['categories'])) {
            foreach($config['categories'] AS $item => $itemarray) {
                if (count($itemarray) < 1) {
                    unset($config['categories'][$item]);
                }
            }
        }
        return $config;
    }
}

function serendipity_guessInput($type, $name, $value='', $default='') {
global $serendipity;

    if ($name == 'rewrite' && $default == $value && isset($serendipity['rewrite_default']) && $serendipity['rewrite_default'] != '') {
        $value = $serendipity['rewrite_default'];
    }

    switch ($type) {
        case 'bool' :
            $value = serendipity_get_bool($value);
            echo '<input id="radio_cfg_' . $name . '_yes" type="radio" name="' . $name . '" value="true" ';
            echo (($value == true) ? 'checked="checked"' : ''). ' /><label for="radio_cfg_' . $name . '_yes"> ' . YES . '</label>&nbsp;';
            echo '<input id="radio_cfg_' . $name . '_no" type="radio" name="' . $name . '" value="false" ';
            echo (($value == true) ? '' : 'checked="checked"'). ' /><label for="radio_cfg_' . $name . '_no"> ' . NO . '</label>';
            break;

        case 'protected' :
            echo '<input type="password" size="30" name="' . $name . '" value="' . htmlspecialchars($value) . '" />';
            break;
        case 'list' :
            preg_match_all("/([^\=]+)\=\>([^\,]+)\,?/i", $default, $res);
            echo '<select name="'. $name .'">';
            for ($x=0; $x<sizeof($res[1]); $x++) {
                printf('<option value="%s"%s>%s</option>'. "\n",
                      $res[1][$x],
                      (($res[1][$x] == $value) ? ' selected="selected"' : ''),
                      $res[2][$x]);
            }
            echo '</select>';
            break;
        default :
            echo '<input type="text" size="30" name="' . $name . '" value="' . htmlspecialchars($value) . '" />';
            break;
    }
}

function serendipity_printConfigTemplate($t, $from = false, $minimum = false, $folding = true, $_abort = true) {
    global $serendipity;

    if (!isset($serendipity['XHTML11'])) {
        $serendipity['XHTML11'] = FALSE;
    }

    if (IS_installed !== true) {
        $folding = false;
    }

    // If not yet installed, do some magic:
    $abort = false;
    if (IS_installed !== true && $_abort !== true) {
        $serendipity_root = dirname($_SERVER['PHP_SELF']) . '/';
        $serendipity_core = serendipity_httpCoreDir();
        $old_htaccess     = @file_get_contents($serendipity_core . '.htaccess');
        $fp               = @fopen($serendipity_core . '.htaccess', 'w');
        $serendipity_host = preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']);

        if (!$fp) {
            printf(HTACCESS_ERROR,
              '<b>chmod go+rwx ' . getcwd() . '/</b>'
            );
            $abort = true;
        } else {
            fwrite($fp, 'ErrorDocument 404 ' . $serendipity_root . 'index.php');
            fclose($fp);

            // Do a request on a nonexistant file to see, if our htaccess allows ErrorDocument
            $sock = @fsockopen($serendipity_host, $_SERVER['SERVER_PORT'], $errorno, $errorstring, 10);
            $response = '';

            if ($sock) {
                fputs($sock, "GET {$_SERVER['PHP_SELF']}nonexistant HTTP/1.0\r\n");
                fputs($sock, "Host: $serendipity_host\r\n");
                fputs($sock, "User-Agent: Serendipity/{$serendipity['version']}\r\n");
                fputs($sock, "Connection: close\r\n\r\n");

                while (!feof($sock) && strlen($response) < 4096) {
                    $response .= fgets($sock, 400);
                }
                fclose($sock);
            }

            if (preg_match('@^HTTP/\d\.\d 200@', $response) && preg_match('@X\-Blog: Serendipity@', $response)) {
                $serendipity['rewrite_default'] = 'errordocs';
            } else {
                $serendipity['rewrite_default'] = 'none';
            }

            if (!empty($old_htaccess)) {
                $fp = @fopen($serendipity_core . '.htaccess', 'w');
                fwrite($fp, $old_htaccess);
                fclose($fp);
            } else {
                @unlink($serendipity_core . '.htaccess');
            }
        }
    }

    if ($abort === false) {
?>
<script type="text/javascript" language="JavaScript">
function showConfig(id) {
    if (document.getElementById) {
        el = document.getElementById(id);
        if (el.style.display == 'none') {
            document.getElementById('option' + id).src = '<?php echo serendipity_getTemplateFile('img/minus.png') ?>';
            el.style.display = '';
        } else {
            document.getElementById('option' + id).src = '<?php echo serendipity_getTemplateFile('img/plus.png') ?>';
            el.style.display = 'none';
        }
    }
}

var state='<?php echo ($folding === true ? '' : 'none'); ?>';
function showConfigAll(count) {
    if (document.getElementById) {
        for (i = 1; i <= count; i++) {
            document.getElementById('el' + i).style.display = state;
            document.getElementById('optionel' + i).src = (state == '' ? '<?php echo serendipity_getTemplateFile('img/minus.png') ?>' : '<?php echo serendipity_getTemplateFile('img/plus.png') ?>');
        }

        if (state == '') {
            document.getElementById('optionall').src = '<?php echo serendipity_getTemplateFile('img/minus.png') ?>';
            state = 'none';
        } else {
            document.getElementById('optionall').src = '<?php echo serendipity_getTemplateFile('img/plus.png') ?>';
            state = '';
        }
    }
}
</script>

<?php
        if (!$minimum) {
?>
<form action="?" method="POST">
    <div>
        <input type="hidden" name="serendipity[adminModule]" value="installer" />
        <input type="hidden" name="installAction" value="check" />
        <br />
<?php   }
        if ( sizeof($t['categories']) > 1 ) { ?>
        <div align="right">
            <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
        </div>
<?php
        }
        $el_count = 0;
        foreach ($t['categories'] as $key => $value) {
            $el_count++;
?>
        <table width="100%" cellspacing="2">
<?php
        if ( sizeof($t['categories']) > 1 ) {
?>
            <tr>
                <th align="left" colspan="2" style="padding-left: 15px;">
                    <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folding === true ? 'plus' : 'minus') .'.png') ?>" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<?php echo $key; ?></a></th>
            </tr>
<?php   } ?>
            <tr>
                <td>
                    <table width="100%" cellspacing="0" cellpadding="3" style="<?php echo ($folding === true ? 'display: none;' : ''); ?>" id="el<?php echo $el_count; ?>">
                        <tr>
                            <td style="padding-left: 20px;" colspan="2">
                                <?php echo $t['descriptions'][$key] ?>
                            </td>
                        </tr>

<?php
            for ($x=0; $x<count($value); $x++) {

                /* Check for installOnly flag */
                if ( in_array('installOnly', $value[$x]['flags']) && IS_installed === true ) {
                    continue;
                }


                /* If we have a valuelist, then use the value from there */
                if (@is_array($from)) {
                    $value[$x]['value'] = $from[$value[$x]['name']];
                }

                /* If the value is never assigned in the valuelist, then use our default value */
                if (!isset($from[$value[$x]['name']])) {
                    $value[$x]['value'] = $value[$x]['default'];
                }
?>
                        <tr>
                            <td style="border-bottom: 1px #000000 solid" align="left" valign="top" width="75%">
                                <strong><?php echo $value[$x]['longname']; ?></strong>
                                <br />
                                <span style="color: #5E7A94; font-size: 8pt;"><?php echo '(' . $value[$x]['type'] . ') ' . $value[$x]['desc']; ?></span>
                            </td>
                            <td style="border-bottom: 1px #000000 solid; font-size: 8pt" align="left" valign="middle" width="25%">
                                <?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><?php echo serendipity_guessInput($value[$x]['type'], $value[$x]['name'], $value[$x]['value'], $value[$x]['distdefault']); ?><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?>
                            </td>
                        </tr>
<?php
            }
?>
                    </table><br /><br />
                </td>
            </tr>
        </table>
<?php
        }

        if (!$minimum) {
?>
        <input type="submit" value="<?php echo CHECK_N_SAVE; ?>" />
    </div>
</form>
<?php
        }
    }
}

function serendipity_parse_sql_tables($filename) {
    $in_table = 0;
    $queries = array();

    $fp = fopen($filename, 'r', 1);
    if ($fp) {
        while (!@feof($fp)) {
            $line = trim(fgets($fp, 4096));
            if ($in_table) {
                $def .= $line;
                if (preg_match('/^\)\s*(type\=\S+)?\s*\;$/i', $line)) {
                    $in_table = 0;
                    array_push($queries, $def);
                }
            } else {
                if (preg_match('#^create table \{PREFIX\}\S+\s*\(#i', $line)) {
                    $in_table = 1;
                    $def = $line;
                }

                if (preg_match('#^create\s*(\{fulltext\}|unique)\s*index#i', $line)) {
                    array_push($queries, $line);
                }
            }
        }
        fclose($fp);
    }

    return $queries;
}

function serendipity_checkInstallation() {
    global $serendipity, $umask;

    $errs = array();

    // Check dirs
    if (!is_dir($_POST['serendipityPath'])) {
        $errs[] = sprintf(DIRECTORY_NON_EXISTANT, $_POST['serendipityPath']);
    }
    elseif (!is_writable($_POST['serendipityPath']) ) {
        $errs[] = sprintf(DIRECTORY_WRITE_ERROR, $_POST['serendipityPath']);
    }
    elseif (!is_dir($_POST['serendipityPath'] . $_POST['uploadPath'] ) && @mkdir($_POST['serendipityPath'] . $_POST['uploadPath'], $umask) !== true) {
        $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . $_POST['uploadPath']);
    }
    elseif (!is_writable($_POST['serendipityPath'] . $_POST['uploadPath'])) {
        $errs[] = sprintf(DIRECTORY_WRITE_ERROR, $_POST['serendipityPath'] . $_POST['uploadPath']);
        $errs[] = sprintf(DIRECTORY_RUN_CMD    , 'chmod go+rws', $_POST['serendipityPath'] . $_POST['uploadPath']);
    }

    // Attempt to create the template compile directory, it might already be there, but we just want to be sure
    if (!is_dir($_POST['serendipityPath'] . PATH_SMARTY_COMPILE) && @mkdir($_POST['serendipityPath'] . PATH_SMARTY_COMPILE, $umask) !== true) {
        $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . PATH_ARCHIVES);
        $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'mkdir'      , $_POST['serendipityPath'] . PATH_SMARTY_COMPILE);
        $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_SMARTY_COMPILE);
    } elseif (is_dir($_POST['serendipityPath'] . PATH_SMARTY_COMPILE) && !is_writeable($_POST['serendipityPath'] . PATH_SMARTY_COMPILE) && @chmod($_POST['serendipityPath'] . PATH_SMARTY_COMPILE, $umask) !== true) {
        $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'chmod go+rwx', $_POST['serendipityPath'] . PATH_SMARTY_COMPILE);
    }

    // Attempt to create the archives directory
    if (!is_dir($_POST['serendipityPath'] . PATH_ARCHIVES) && @mkdir($_POST['serendipityPath'] . PATH_ARCHIVES, $umask) !== true) {
        $errs[] = sprintf(DIRECTORY_CREATE_ERROR, $_POST['serendipityPath'] . PATH_ARCHIVES);
        $errs[] = sprintf(DIRECTORY_RUN_CMD     , 'mkdir'      , $_POST['serendipityPath'] . PATH_ARCHIVES);
        $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'])) {
        $errs[] = sprintf(CANT_EXECUTE_BINARY, 'convert imagemagick');
    }

    if ($_POST['dbType'] == 'sqlite') {
        // We don't want that our SQLite db file can be guessed from other applications on a server
        // and have access to our's. So we randomize the SQLite dbname.
        $_POST['sqlitedbName'] = $_POST['dbName'] . '_' . md5(time());
    }

    $serendipity['dbType'] = $_POST['dbType'];
    // Probe database
    // (do it after the dir stuff, as we need to be able to create the sqlite database)
    @include_once($_POST['serendipityPath'] . 'include/db/db.inc.php');
    // For shared installations, probe the file on include path
    @include_once(S9Y_INCLUDE_PATH . 'include/db/serendipity_db.inc.php');

    if (S9Y_DB_INCLUDED) {
        serendipity_db_probe($_POST, $errs);
    }

    return (count($errs) > 0 ? $errs : '');
}

function serendipity_installDatabase() {
    global $serendipity;

    /* Try and check if the database/tables are already installed,
       if they are... exit the function */
    echo CHECK_DATABASE_EXISTS;
    $t = serendipity_db_query("SELECT * FROM {$_POST['dbPrefix']}authors", false, 'both', false);
    echo ' ' . DONE . '<br />';

    if (is_array($t)) {
        return false;
    }

    echo CREATE_DATABASE;
    // Create tables
    $queries = serendipity_parse_sql_tables($serendipity['serendipityPath'] . 'sql/db.sql');
    $queries = str_replace('{PREFIX}', $_POST['dbPrefix'], $queries);

    foreach ($queries as $query) {
        serendipity_db_schema_import($query);
    }

    if ($_POST['want_mail'] == true) {
        $mail_comments = 1;
    } else {
        $mail_comments = 0;
    }
    echo ' ' . DONE . '<br />';

    /*
        ------------- Install main author ------------
    */
    $enc_pass = md5($_POST['pass']);
    $query = "INSERT INTO {$_POST['dbPrefix']}authors (
                            username,
                            password,
                            email,
                            mail_comments,
                            mail_trackbacks,
                            userlevel
                          )
                  VALUES  (
                            '{$_POST['user']}',
                            '$enc_pass',
                            '{$_POST['email']}',
                            $mail_comments,
                            $mail_comments,
                            " . USERLEVEL_ADMIN . "
                          )";
    serendipity_db_query($query);

    $serendipity['dbPrefix'] = $_POST['dbPrefix'];

    /* Set the default template */
    serendipity_set_config_var('template', $serendipity['defaultTemplate']);

    return true;
}

function serendipity_installFiles($serendipity_core = '') {
    global $serendipity;

    // This variable is transmitted from serendipity_admin_installer. If an empty variable is used,
    // this means that serendipity_installFiles() was called from the auto-updater facility.
    if (empty($serendipity_core)) {
        $serendipity_core = $serendipity['serendipityPath'];
    }

    $htaccess = @file_get_contents($serendipity_core . '.htaccess');

    // Let this function be callable outside installation and let it use existing settings.
    $import = array('rewrite', 'serendipityHTTPPath', 'indexFile');
    foreach($import AS $key) {
        if (empty($_POST[$key]) && isset($serendipity[$key])) {
            $$key = $serendipity[$key];
        } else {
            $$key = $_POST[$key];
        }
    }

    if (php_sapi_name() == 'cgi' || php_sapi_name() == 'cgi-fcgi') {
        $htaccess_cgi = '_cgi';
    } else {
        $htaccess_cgi = '';
    }


    /* Detect comptability with php_value directives */
    if ($htaccess_cgi == '') {
        $response = '';
        $serendipity_root = dirname($_SERVER['PHP_SELF']) . '/';
        $serendipity_host = preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']);

        $old_htaccess = @file_get_contents($serendipity_core . '.htaccess');
        $fp = @fopen($serendipity_core . '.htaccess', 'w');
        if ($fp) {
            fwrite($fp, 'php_value register_globals off'. "\n" .'php_value session.use_trans_sid 0');
            fclose($fp);

            $sock = @fsockopen($serendipity_host, $_SERVER['SERVER_PORT'], $errorno, $errorstring, 10);
            if ($sock) {
                fputs($sock, "GET {$serendipity['serendipityHTTPPath']} HTTP/1.0\r\n");
                fputs($sock, "Host: $serendipity_host\r\n");
                fputs($sock, "User-Agent: Serendipity/{$serendipity['version']}\r\n");
                fputs($sock, "Connection: close\r\n\r\n");

                while (!feof($sock) && strlen($response) < 4096) {
                    $response .= fgets($sock, 400);
                }
                fclose($sock);
            }

            /* If we get HTTP 500 Internal Server Error, we have to use the .cgi template */
            if (preg_match('@^HTTP/\d\.\d 500@', $response)) {
                $htaccess_cgi = '_cgi';
            }

            if (!empty($old_htaccess)) {
                $fp = @fopen($serendipity_core . '.htaccess', 'w');
                fwrite($fp, $old_htaccess);
                fclose($fp);
            } else {
                @unlink($serendipity_core . '.htaccess');
            }
        }
    }


    if ($rewrite == 'rewrite') {
        $template = 'htaccess' . $htaccess_cgi . '_rewrite.tpl';
    } elseif ($rewrite == 'errordocs') {
        $template = 'htaccess' . $htaccess_cgi . '_errordocs.tpl';
    } else {
        $template = 'htaccess' . $htaccess_cgi . '_normal.tpl';
    }

    if (!($a = file(S9Y_INCLUDE_PATH . 'include/tpl/' . $template, 1))) {
        $err[] = ERROR_TEMPLATE_FILE;
    }

    $content = str_replace(
                 array(
                   '{PREFIX}',
                   '{indexFile}',
                   '{PAT_UNSUBSCRIBE}', '{PATH_UNSUBSCRIBE}',
                   '{PAT_ARCHIVES}', '{PATH_ARCHIVES}',
                   '{PAT_ARCHIVES_SHORT}',
                   '{PAT_FEEDS}', '{PATH_FEEDS}',
                   '{PAT_FEED}',
                   '{PAT_ADMIN}', '{PATH_ADMIN}',
                   '{PAT_ENTRIES}', '{PATH_ENTRIES}',
                   '{PAT_ARCHIVE}', '{PATH_ARCHIVE}',
                   '{PAT_CATEGORIES}', '{PATH_CATEGORIES}',
                   '{PAT_PLUGIN}', '{PATH_PLUGIN}',
                   '{PAT_DELETE}', '{PATH_DELETE}',
                   '{PAT_APPROVE}', '{PATH_APPROVE}'
                 ),

                 array(
                   $serendipityHTTPPath,
                   $indexFile,
                   trim(PAT_UNSUBSCRIBE, '@/i'), PATH_UNSUBSCRIBE,
                   trim(PAT_ARCHIVES, '@/i'), PATH_ARCHIVES,
                   trim(PAT_ARCHIVES_SHORT, '@/i'),
                   trim(PAT_FEEDS, '@/i'), PATH_FEEDS,
                   trim(PAT_FEED, '@/i'),
                   trim(PAT_ADMIN, '@/i'), PATH_ADMIN,
                   trim(PAT_ENTRIES, '@/i'), PATH_ENTRIES,
                   trim(PAT_ARCHIVE, '@/i'), PATH_ARCHIVE,
                   trim(PAT_CATEGORIES, '@/i'), PATH_CATEGORIES,
                   trim(PAT_PLUGIN, '@/i'), PATH_PLUGIN,
                   trim(PAT_DELETE, '@/i'), PATH_DELETE,
                   trim(PAT_APPROVE, '@/i'), PATH_APPROVE
                 ),

                 implode('', $a)
              );

    $fp = @fopen($serendipity_core . '.htaccess', 'w');
    if (!$fp) {
        $errs[] = sprintf(FILE_WRITE_ERROR, $serendipity_core . '.htaccess') . ' ' . FILE_CREATE_YOURSELF;
        $errs[] = sprintf(COPY_CODE_BELOW , $serendipity_core . '.htaccess', 'serendipity', htmlspecialchars($content));
        return $errs;
    } else {
        // Check if an old htaccess file existed and try to preserve its contents. Otherwise completely wipe the file.
        if ($htaccess != '' && preg_match('@^(.*)#\s+BEGIN\s+s9y.*#\s+END\s+s9y(.*)$@isU', $htaccess, $match)) {
            // Code outside from s9y-code was found.
            fwrite($fp, $match[1] . $content . $match[2]);
        } else {
            fwrite($fp, $content);
        }
        fclose($fp);
        return true;
    }

}

function serendipity_updateConfiguration() {
    global $serendipity, $umask;

    // Save all basic config variables to the database
    $p = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE, true);

    if (isset($_POST['sqlitedbName']) && !empty($_POST['sqlitedbName'])) {
        $_POST['dbName'] = $_POST['sqlitedbName'];
    }

    foreach($p as $key => $entry) {
        serendipity_set_config_var(
          $entry['name'],
          $_POST[$entry['name']],
          (($entry['range'] == 'global' || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN || IS_installed === false) ? 0 : $serendipity['authorid'])
        );
    }

    // Save all user-relevant data in the usertable. Only when s9y is installed.
    if (IS_installed === true) {
        $u = serendipity_parseTemplate(S9Y_CONFIG_USERTEMPLATE, true);
        foreach($u AS $key => $entry) {
            serendipity_set_user_var(
              $entry['name'],
              $_POST[$entry['name']],

              ($entry['range'] == 'global' ? 0 : $serendipity['authorid'])
            );
        }
    }

    if (IS_installed === false || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) {
        return serendipity_updateLocalConfig($_POST['dbName'],
                                             $_POST['dbPrefix'],
                                             $_POST['dbHost'],
                                             $_POST['dbUser'],
                                             $_POST['dbPass'],
                                             $_POST['dbType'],
                                             'serendipity_config_local.inc.php',
                                             $_POST['serendipityPath']);
    } else {
        return true;
    }
}

function serendipity_httpCoreDir() {
    if (!empty($_SERVER['SCRIPT_FILENAME'])) {
        return dirname($_SERVER['SCRIPT_FILENAME']) . '/';
    }

    return $_SERVER['DOCUMENT_ROOT'] . dirname($_SERVER['PHP_SELF']) . '/';
}

function serendipity_removeFiles($files = null) {
    global $serendipity, $errors;

    if (!is_array($files)) {
        return;
    }

    $backupdir = S9Y_INCLUDE_PATH . 'backup';
    if (!is_dir($backupdir)) {
        @mkdir($backupdir, 0777);
        if (!is_dir($backupdir)) {
            $errors[] = sprintf(DIRECTORY_CREATE_ERROR, $backupdir);
            return false;
        }
    }

    if (!is_writable($backupdir)) {
        $errors[] = sprintf(DIRECTORY_WRITE_ERROR, $backupdir);
        return false;
    }

    foreach($files AS $file) {
        $source   = S9Y_INCLUDE_PATH . $file;
        $sanefile = str_replace('/', '_', $file);
        $target   = $backupdir . '/' . $sanefile;

        if (!file_exists($source)) {
            continue;
        }

        if (file_exists($target)) {
            $target = $backupdir . '/' . time() . '.' . $sanefile; // Backupped file already exists. Append with timestamp as name.
        }

        if (!is_writable($source)) {
            $errors[] = sprintf(FILE_WRITE_ERROR, $source) . '<br />';
        } else {
            rename($source, $target);
        }
    }
}
?>

--- NEW FILE: functions_smarty.inc.php ---
<?php # $Id: functions_smarty.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $

function serendipity_smarty_fetch($block, $file, $echo = false) {
    global $serendipity;

    $output = $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode']));
    $serendipity['smarty']->assign($block, $output);

    return $output;
}

function serendipity_emptyPrefix($string, $prefix = ': ') {
    return (!empty($string) ? $prefix . htmlspecialchars($string) : '');
}

function serendipity_smarty_hookPlugin($params, &$smarty) {
    global $serendipity;
    static $hookable = array('frontend_header',
                             'entries_footer',
                             'frontend_comment');

    if ( !isset($params['hook']) ) {
        $smarty->trigger_error(__FUNCTION__ .": missing 'hook' parameter");
        return;
    }
    if ( !in_array($params['hook'], $hookable) ) {
        $smarty->trigger_error(__FUNCTION__ .": illegal hook '". $params['hook'] ."'");
        return;
    }

    if ( !isset($params['data']) ) {
        $params['data'] = &$serendipity;
    }
    if ( !isset($params['adddata']) ) {
        $params['add'] = null;
    }

    serendipity_plugin_api::hook_event($params['hook'], $params['data'], $params['add']);
}


function serendipity_smarty_printSidebar($params, &$smarty) {
    if ( !isset($params['side']) ) {
        $smarty->trigger_error(__FUNCTION__ .": missing 'side' parameter");
        return;
    }
    return serendipity_plugin_api::generate_plugins($params['side']);
}

function serendipity_smarty_getFile($params, &$smarty) {
    if ( !isset($params['file']) ) {
        $smarty->trigger_error(__FUNCTION__ .": missing 'file' parameter");
        return;
    }
    return serendipity_getTemplateFile($params['file']);
}


function serendipity_smarty_formatTime($timestamp, $format) {
    if (defined($format)) {
        return serendipity_formatTime(constant($format), $timestamp);
    } else {
        return serendipity_formatTime($format, $timestamp);
    }
}

function serendipity_smarty_printComments($params, &$smarty) {
    global $serendipity;

    if (!isset($params['entry'])) {
        $smarty->trigger_error(__FUNCTION__ .": missing 'entry' parameter");
        return;
    }

    if (!isset($params['mode'])) {
        $params['mode'] = VIEWMODE_THREADED;
    }

    $comments = serendipity_fetchComments($params['entry']);

    if (!empty($serendipity['POST']['preview'])) {
        $comments[] =
            array(
                    'email'     => $serendipity['POST']['email'],
                    'username'  => $serendipity['POST']['name'],
                    'body'      => $serendipity['POST']['comment'],
                    'url'       => $serendipity['POST']['url'],
                    'parent_id' => $serendipity['POST']['replyTo'],
                    'timestamp' => time()
            );
    }

    return serendipity_printComments($comments, $params['mode']);
}

function serendipity_smarty_printTrackbacks($params, &$smarty) {
    if ( !isset($params['entry']) ) {
        $smarty->trigger_error(__FUNCTION__ .": missing 'entry' parameter");
        return;
    }

    return serendipity_printTrackbacks(serendipity_fetchTrackbacks($params['entry']));
}

function serendipity_smarty_assignDefaults() {
    global $serendipity;
    $serendipity['smarty']->assign(
        array(
            'head_charset'              => LANG_CHARSET,
            'head_version'              => $serendipity['version'],
            'CONST'                     => get_defined_constants(),

            'is_xhtml'                  => $serendipity['XHTML11'],
            'use_popups'                => $serendipity['enablePopup'],
            'is_embedded'               => (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) ? false : true,
            'is_raw_mode'               => $serendipity['smarty_raw_mode'],

            'entry_id'                  => (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])) ? $serendipity['GET']['id'] : false,
            'is_single_entry'           => (isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])),

            'blogTitle'                 => htmlspecialchars($serendipity['blogTitle']),
            'blogSubTitle'              => htmlspecialchars($serendipity['blogSubTitle']),
            'blogDescription'           => htmlspecialchars($serendipity['blogDescription']),

            'serendipityHTTPPath'       => $serendipity['serendipityHTTPPath'],
            'serendipityBaseURL'        => $serendipity['baseURL'],
            'serendipityRewritePrefix'  => $serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '',
            'serendipityIndexFile'      => $serendipity['indexFile']
        )
    );

    return true;
}
--- NEW FILE: lang.inc.php ---
<?php # $Id: lang.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $

if (!defined('LANGUAGE_LIST')) define('LANGUAGE_LIST', 'en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech (Win-1250),cz=>Czech (ISO-8859-2),nl=>Dutch,pt=>Portuguese Brazilian,bg=>Bulgarian,no=>Norwegian,it=>Italian');

if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
    // Try and include preferred language from the configurated setting
    if (@include(S9Y_INCLUDE_PATH . 'lang/serendipity_lang_'. $serendipity['lang'] .'.inc.php') ) {
        // Only here can we truely say the language is loaded
        define('serendipity_LANG_LOADED', true);
    } elseif (IS_installed === false || (defined('IS_up2date') && IS_up2date === false)) {   /* -- Auto-Guess -- */
        // If no config file is loaded, language includes are not available.
        // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
        $serendipty['autolang'] = 'en';
        $supported_languages = array('en', 'da', 'de', 'es', 'cs', 'cz', 'fr', 'nl', 'pt', 'bg', 'no', 'it');
        $possible_languages = explode(',', (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''));
        if (is_array($possible_languages)) {
            foreach($possible_languages as $index => $lang) {
                $preferred_language = strtolower(preg_replace('@^([^\-_;]*)_?.*$@', '\1', $lang));
                if (in_array($preferred_language, $supported_languages)) {
                    @include_once(S9Y_INCLUDE_PATH . 'lang/serendipity_lang_' . $preferred_language . '.inc.php');
                    $serendipity['autolang'] = $preferred_language;
                    break;
                } // endif
            } // endforeach
        } // endif
    }  //endif

    // Do fallback to english
    if ((defined('serendipity_LANG_LOADED') && serendipity_LANG_LOADED === true) || IS_installed === false || (defined('IS_up2date') && IS_up2date === false)) {
        @include_once(S9Y_INCLUDE_PATH . 'lang/serendipity_lang_en.inc.php');
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>
--- NEW FILE: functions_config.inc.php ---
<?php # $Id: functions_config.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $

function serendipity_set_config_var($name, $val, $authorid = 0) {
    global $serendipity;

    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . (int)$authorid);
    $r = serendipity_db_insert('config', array('name' => $name, 'value' => $val, 'authorid' => $authorid));
    $serendipity[$name] = $val;
    if (is_string($r)) {
        echo $r;
    }
}

function serendipity_get_config_var($name, $defval = false, $empty = false) {
    global $serendipity;
    if (isset($serendipity[$name])) {
        if ($empty && gettype($serendipity[$name]) == 'string' && $serendipity[$name] === '') {
            return $defval;
        } else {
            return $serendipity[$name];
        }
    } else {
        return $defval;
    }
}

function serendipity_get_user_var($name, $authorid, $default) {
    global $serendipity;

    $r = serendipity_db_query("SELECT $name FROM {$serendipity['dbPrefix']}authors WHERE authorid = " . (int)$authorid, true);

    if (is_array($r)) {
        return $r[0];
    } else {
        return $default;
    }
}

function serendipity_set_user_var($name, $val, $authorid, $copy_to_s9y = true) {
    global $serendipity;

    // When inserting a DB value, this array maps the new values to the corresponding s9y variables
    static $user_map_array = array(
        'username'  => 'serendipityUser',
        'email'     => 'serendipityEmail',
        'userlevel' => 'serendipityUserlevel'
    );

    // Special case for inserting a password
    switch($name) {
        case 'password':
            if (empty($val)) {
                return;
            }

            $val = md5($val);
            $copy_to_s9y = false;
            break;

        case 'right_publish':
        case 'mail_comments':
        case 'mail_trackbacks':
            $val = (serendipity_db_bool($val) ? 1 : '0');
            break;
    }

    serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors SET $name = '" . serendipity_db_escape_string($val) . "' WHERE authorid = " . (int)$authorid);

    if ($copy_to_s9y) {
        if (isset($user_map_array[$name])) {
            $key = $user_map_array[$name];
        } else {
            $key = 'serendipity' . ucfirst($name);
        }

        $_SESSION[$key] = $serendipity[$key] = $val;
    }
}

function serendipity_getTemplateFile($file, $key = 'serendipityHTTPPath') {
    global $serendipity;

    $directories = array(
      (isset($serendipity['template']) ? $serendipity['template'] . '/' : ''),
      $serendipity['defaultTemplate'] .'/',
      'default/'
    );

    foreach ($directories as $directory) {
        $templateFile = $serendipity['templatePath'] . $directory . $file;

        if (file_exists($serendipity['serendipityPath'] . $templateFile)) {
            return $serendipity[$key] . $templateFile;
        }
    }
    return false;
}

function serendipity_load_configuration($author = null) {
    global $serendipity;

    if (!empty($author)) {
        // Replace default configuration directives with user-relevant data
        $rows = serendipity_db_query("SELECT name,value
                                        FROM {$serendipity['dbPrefix']}config
                                        WHERE authorid = '". (int)$author ."'");
    } else {
        // Only get default variables, user-independent (frontend)
        $rows = serendipity_db_query("SELECT name,value
                                        FROM {$serendipity['dbPrefix']}config
                                        WHERE authorid = 0");
    }

    if (is_array($rows)) {
        foreach ($rows as $row) {
            // Convert 'true' and 'false' into booleans
            $serendipity[$row['name']] = serendipity_get_bool($row['value']);
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>
--- NEW FILE: genpage.inc.php ---
<?php # $Id: genpage.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $
include_once('serendipity_config.inc.php');
include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php');
include_once(S9Y_INCLUDE_PATH . 'include/plugin_internal.inc.php');

$serendipity['smarty_file'] = 'index.tpl';

if (file_exists($serendipity['smarty']->template_dir . '/layout.php')) {
    $serendipity['smarty_raw_mode'] = true;
} else {
    $serendipity['smarty_raw_mode'] = false;
}

serendipity_smarty_assignDefaults();
$serendipity['smarty']->assign(
    array(
        'leftSidebarElements'       => serendipity_plugin_api::count_plugins('left'),
        'rightSidebarElements'      => serendipity_plugin_api::count_plugins('right')
    )
);

if ($serendipity['smarty_raw_mode']) {
    include_once(serendipity_getTemplateFile('layout.php', 'serendipityPath'));
} else {
    include_once(serendipity_getTemplateFile('smarty_layout.php', 'serendipityPath'));
    serendipity_smarty_fetch('CONTENT', 'content.tpl');
}

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

--- NEW FILE: functions.inc.php ---
<?php # $Id: functions.inc.php,v 1.1.2.1 2004/11/06 11:22:49 garvinhicking Exp $
# Copyright (c) 2003-2004, Jannis Hermanns
# All rights reserved.  See LICENSE file for licensing details

$serendipity['imageList'] = array();
include_once(S9Y_INCLUDE_PATH . "include/db/db.inc.php");
include_once(S9Y_INCLUDE_PATH . "include/compat.inc.php");
include_once(S9Y_INCLUDE_PATH . "include/functions_config.inc.php");
include_once(S9Y_INCLUDE_PATH . "bundled-libs/XML/RPC.php");
include_once(S9Y_INCLUDE_PATH . "include/plugin_api.inc.php");
include_once(S9Y_INCLUDE_PATH . "include/functions_images.inc.php");
include_once(S9Y_INCLUDE_PATH . "include/functions_installer.inc.php");
include_once(S9Y_INCLUDE_PATH . "include/functions_entries.inc.php");
include_once(S9Y_INCLUDE_PATH . "include/functions_comments.inc.php");
include_once(S9Y_INCLUDE_PATH . "include/functions_trackbacks.inc.php");
include_once(S9Y_INCLUDE_PATH . "include/functions_smarty.inc.php");

function serendipity_truncateString($s, $len) {
    if ( strlen($s) > ($len+3) ) {
        $s = substr($s, 0, $len) . '...';
    }
    return $s;
}

function serendipity_formatTime($format, $time) {
    static $cache;
    if (!isset($cache)) {
        $cache = array();
    }

    if (!isset($cache[$format])) {
        $cache[$format] = $format;
        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
            $cache[$format] = str_replace('%e', '%d', $cache[$format]);
        }
    }
    return ucfirst(strftime($cache[$format], (int)$time));
}


function serendipity_logout() {
    $_SESSION['serendipityAuthedUser'] = false;
    @session_destroy();
    serendipity_deleteCookie('author_information');
}

function serendipity_login() {
    global $serendipity;

    if (serendipity_authenticate_author()) {
        #The session has this data already
        #we previously just checked the value of $_SESSION['serendipityAuthedUser'] but
        #we need the authorid still, so call serendipity_authenticate_author with blank
        #params
        return true;
    }

    if (serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass'])) {
        if (empty($serendipity['POST']['auto'])) {
            serendipity_deleteCookie('author_information');
            return false;
        } else {
            $package = serialize(array('username' => $serendipity['POST']['user'],
                                       'password' => $serendipity['POST']['pass']));
            serendipity_setCookie('author_information', base64_encode($package));
            return true;
        }
    } elseif ( isset($serendipity['COOKIE']['author_information']) ) {
        $cookie = unserialize(base64_decode($serendipity['COOKIE']['author_information']));
        if (serendipity_authenticate_author($cookie['username'], $cookie['password'])) {
            return true;
        } else {
            serendipity_deleteCookie('author_information');
            return false;
        }
    }
}

function serendipity_userLoggedIn() {
    if ($_SESSION['serendipityAuthedUser'] === true && IS_installed) {
        return true;
    } else {
        return false;
    }
}

function serendipity_fetchTemplates() {
    global $serendipity;
    $dir = opendir($serendipity['serendipityPath'] . $serendipity['templatePath']);
    while (($file = readdir($dir)) !== false) {
        if (is_dir($serendipity['serendipityPath'] . $serendipity['templatePath'] . $file) && !ereg('^(\.|CVS)', $file) && !file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $file . '/inactive.txt') && file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $file . '/info.txt')) {
            $rv[] = $file;
        }
    }
    natcasesort($rv);
    return $rv;
}

function serendipity_fetchTemplateInfo($theme) {
    global $serendipity;
    /* Blame jannis */
    $lines = file($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/info.txt');

    for($x=0; $x<count($lines); $x++) {
        $j = preg_split('/([^\:]+)\:/', $lines[$x], -1, PREG_SPLIT_DELIM_CAPTURE);
        if ($j[2]) {
            $currSec = $j[1];
            $data[strtolower($currSec)][] = trim($j[2]);
        } else {
            $data[strtolower($currSec)][] = trim($j[0]);
        }
    }

    foreach ($data as $k => $v) {
        $data[$k] = implode("\n", $v);
    }

    return $data;
}

function serendipity_setCookie($name,$value) {
    global $serendipity;

    setcookie("serendipity[$name]", $value, time()+60*60*24*30, $serendipity['serendipityHTTPPath']);
    $_COOKIE[$name] = $value;
    $serendipity['COOKIE'][$name] = $value;
}

function serendipity_deleteCookie($name) {
    global $serendipity;

    setcookie("serendipity[$name]", '', time()-4000);
    unset($_COOKIE[$name]);
    unset($serendipity['COOKIE'][$name]);
}

function serendipity_fetchUsers($user = '') {
    global $serendipity;

    $where = '';
    if (!empty($user)) {
        $where = "WHERE authorid = '" . (int)$user ."'";
    }

    $querystring = "SELECT * FROM {$serendipity['dbPrefix']}authors $where ORDER BY username ASC";

    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_makeFilename($str) {
    static $from = array(
                     ' ',

                     'Ä',
                     'ä',

                     'Ö',
                     'ö',

                     'Ü',
                     'ü',

                     'ß',

                     'é',
                     'è',
                     'ê',

                     'í',
                     'ì',
                     'î',

                     'á',
                     'à',
                     'â',
                     'å',

                     'ó',
                     'ò',
                     'ô',
                     'õ',

                     'ú',
                     'ù',
                     'û',

                     'ç',
                     'Ç',

                     'ñ',

                     'ý');

    static $to   = array(
                     '-',

                     'AE',
                     'ae',

                     'OE',
                     'oe',

                     'UE',
                     'ue',

                     'ss',

                     'e',
                     'e',
                     'e',

                     'i',
                     'i',
                     'i',

                     'a',
                     'a',
                     'a',
                     'a',

                     'o',
                     'o',
                     'o',
                     'o',

                     'u',
                     'u',
                     'u',

                     'c',
                     'C',

                     'n',

                     'y');

    // For pretty urls we want to have a '+' as word separator. But GUIDs need to stay used to using '_' to not break bc.
    // (For performance reasons this changes the static array instead of using a second str_replace call only for the ' ' case,
    // and to avoid a costy call to array_merge()
    if ($compat !== true) {
        $to[0] = '-';
    } else {
        $to[0] = '_';
    }

    // Replace international chars not detected by every locale
    $str = str_replace($from, $to, $str);

    // Nuke chars not allowed in our URI
    $str = preg_replace('#[^' . PAT_FILENAME . ']#i', '', $str);

    // Remove consecutive separators
    $str = preg_replace('#'. $to[0] .'{2,}#s', $to[0], $str);

    // Remove excess separators
    $str = trim($str, $to[0]);

    return $str;
}

function serendipity_fetchReferences($id) {
    global $serendipity;

    $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id = '" . (int)$id . "'";

    return serendipity_db_query($query);
}


function serendipity_utf8_encode($string) {
    if (strtolower(LANG_CHARSET) != 'utf-8') {
        if (function_exists('iconv')) {
            return iconv(LANG_CHARSET, 'UTF-8', $string);
        } else {
            return utf8_encode($string);
        }
    } else {
        return $string;
    }
}

function serendipity_rss_getguid($entry, $comments = false) {
    $guid = serendipity_archiveURL((isset($entry['entryid']) && $entry['entryid'] != '' ? $entry['entryid'] : $entry['id']), 'guid');
    if ($comments == true) {
        $guid .= '#c' . $entry['commentid'];
    }

    return $guid;
}

// jbalcorn: starter function to clean up xhtml for atom feed.  Add things to this as we find common
//      mistakes, unless someone finds a better way to do this.
//      DONE:
//          since someone encoded all the urls, we can now assume any amp followed by
//              whitespace or a HTML tag (i.e. &<br /> )should be
//              encoded and most not with a space are intentional
//      TODO:
//          check ALL ampersands, find out if it's a valid code, and encode if not
function xhtml_cleanup($html) {
    static $p = array(
        '/\&([\s\<])/',       // ampersand followed by whitespace or tag
        '/\&$/',              // ampersand at end of body
        '/<(br|hr|img)([^\/>]*)>/i',    // unclosed br tag - attributes included
    );

    static $r = array(
        '&amp;\1',
        '&amp;',
        '<\1\2 />'
    );

    return preg_replace($p, $r, $html);
}

/* Uses logic to figure out how the URI should look, based on current rewrite rule */
function serendipity_rewriteURL($path, $key='baseURL') {
    global $serendipity;
    return $serendipity[$key] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . $path;
}

function serendipity_archiveURL($id, $title, $key = 'baseURL', $checkrewrite = true) {
    $path = PATH_ARCHIVES . '/' . (int)$id . '-' . serendipity_makeFilename($title) . '.html';
    if ( $checkrewrite ) {
        $path = serendipity_rewriteURL($path, $key);
    }
    return $path;
}

function serendipity_archiveDateUrl($range, $summary=false, $key='baseURL') {
    return serendipity_rewriteURL(PATH_ARCHIVES . '/' . $range . ($summary ? '/summary' : '') . '.html', $key);
}

/**
* Returns the maximum file upload size, in bytes (0 if none).
**/
function serendipity_maxfileuploadsize() {
    if ( $val = trim(ini_get('upload_max_filesize')) == '' )
        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_fetchAuthor($author) {
    global $serendipity;

    return serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}authors WHERE " . (is_numeric($author) ? "authorid={$author};" : "username='{$author}';"));
}

/**
* Split up a filename
**/
function serendipity_parseFileName($file) {
    $x = explode('.', $file);
    $suf = array_pop($x);
    $f   = @implode('.', $x);
    return array($f, $suf);
}

function serendipity_authenticate_author($username = '', $password = '', $is_md5 = false) {
    global $serendipity;

    if (isset($_SESSION['serendipityUser']) && isset($_SESSION['serendipityPassword']) && isset($_SESSION['serendipityAuthedUser']) && $_SESSION['serendipityAuthedUser'] == true) {
        $username = $_SESSION['serendipityUser'];
        $password = $_SESSION['serendipityPassword'];
        // For safety reasons when multiple blogs are installed on the same host, we need to check the current author each time to not let him log into a different blog with the same sessiondata
        $is_md5 = true;
    }

    if ($username != '') {
        if ($is_md5 === false && !empty($password)) {
            $password = md5($password);
        }

        $query = "SELECT DISTINCT
                    email, authorid, userlevel, right_publish
                  FROM
                    $serendipity[dbPrefix]authors
                  WHERE
                    username   = '" . serendipity_db_escape_string($username) . "'
                  AND password = '" . serendipity_db_escape_string($password) . "'";
        $row = serendipity_db_query($query, true, 'assoc');

        if (is_array($row)) {
            $_SESSION['serendipityUser']        = $serendipity['serendipityUser']         = $username;
            $_SESSION['serendipityPassword']    = $serendipity['serendipityPassword']     = $password;
            $_SESSION['serendipityEmail']       = $serendipity['serendipityEmail']        = $row['email'];
            $_SESSION['serendipityAuthorid']    = $serendipity['authorid']                = $row['authorid'];
            $_SESSION['serendipityUserlevel']   = $serendipity['serendipityUserlevel']    = $row['userlevel'];
            $_SESSION['serendipityAuthedUser']  = $serendipity['serendipityAuthedUser']   = true;
            $_SESSION['serendipityRightPublish']= $serendipity['serendipityRightPublish'] = $row['right_publish'];
            serendipity_load_configuration($serendipity['authorid']);
            return true;
        } else {
            $_SESSION['serendipityAuthedUser'] = false;
            @session_destroy();
        }
    }

    return false;
}

function serendipity_track_referrer($entry = 0) {
    global $serendipity;

    if (isset($_SERVER['HTTP_REFERER'])) {
        if (stristr($_SERVER['HTTP_REFERER'], $serendipity['baseURL']) !== false) {
            return;
        }

        if (!isset($serendipity['_blockReferer']) || !is_array($serendipity['_blockReferer'])) {
            // Only generate an array once per call
            $serendipity['_blockReferer'] = array();
            $serendipity['_blockReferer'] = @explode(';', $serendipity['blockReferer']);
        }

        $url_parts  = parse_url($_SERVER['HTTP_REFERER']);
        $host_parts = explode('.', $url_parts['host']);
        if (!$url_parts['host'] ||
            strstr($url_parts['host'], $_SERVER['SERVER_NAME'])) {
            return;
        }

        foreach($serendipity['_blockReferer'] AS $idx => $hostname) {
            if (@strstr($url_parts['host'], $hostname)) {
                return;
            }
        }

        if (rand(0, 100) < 1) {
            serendipity_track_referrer_gc();
        }

        if(preg_match('/^mysqli?/', $serendipity['dbType'])) {
            $interval = 900;
        } else {
            $interval = "interval '900'";
        }

        $suppressq = "SELECT count(1)
                      FROM $serendipity[dbPrefix]suppress
                      WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'
                      AND scheme = '" . serendipity_db_escape_string($url_parts['scheme']) . "'
                      AND port = '" . serendipity_db_escape_string($url_parts['port']) . "'
                      AND host = '" . serendipity_db_escape_string($url_parts['host']) . "'
                      AND path = '" . serendipity_db_escape_string($url_parts['path']) . "'
                      AND query = '" . serendipity_db_escape_string($url_parts['query']) . "'
                      AND last > now() - $interval";

        $suppressp = "DELETE FROM $serendipity[dbPrefix]suppress
                      WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'
                      AND scheme = '" . serendipity_db_escape_string($url_parts['scheme']) . "'
                      AND host = '" . serendipity_db_escape_string($url_parts['host']) . "'
                      AND port = '" . serendipity_db_escape_string($url_parts[...
 
[truncated message content]

[php-blog-cvs] serendipity/include/tpl - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/include/tpl added to the repository
--> Using per-directory sticky tag `branch-smarty'

[php-blog-cvs] serendipity/include/db - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/include/db added to the repository
--> Using per-directory sticky tag `branch-smarty'

[php-blog-cvs] serendipity/include/admin - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/include/admin added to the repository
--> Using per-directory sticky tag `branch-smarty'

[php-blog-cvs] serendipity/include - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/include added to the repository
--> Using per-directory sticky tag `branch-smarty'

[php-blog-cvs] serendipity/docs - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/docs added to the repository
--> Using per-directory sticky tag `branch-smarty'

[php-blog-cvs] serendipity NEWS,1.249,1.250 serendipity_functions_installer.inc.php,1.36,1.37

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

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

Modified Files:
	NEWS serendipity_functions_installer.inc.php 
Log Message:
fix sqlite dbname rewrite saving


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- NEWS	3 Nov 2004 10:00:16 -0000	1.249
+++ NEWS	6 Nov 2004 10:58:42 -0000	1.250
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * SQLite database name was not saved properly and could get set to
+      a wrong value when updating configuration (garvinhicking)
+
     * Better detection if Apache ErrorDocument can be used
       (garvinhicking)
 

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_functions_installer.inc.php	3 Nov 2004 10:00:16 -0000	1.36
+++ serendipity_functions_installer.inc.php	6 Nov 2004 10:58:42 -0000	1.37
@@ -722,6 +722,10 @@
     // Save all basic config variables to the database
     $p = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE, true);
 
+    if (isset($_POST['sqlitedbName']) && !empty($_POST['sqlitedbName'])) {
+        $_POST['dbName'] = $_POST['sqlitedbName'];
+    }
+
     foreach($p as $key => $entry) {
         serendipity_set_config_var(
           $entry['name'],

[php-blog-cvs] serendipity index.php,1.49.2.8,1.49.2.9

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

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

Modified Files:
      Tag: branch-smarty
	index.php 
Log Message:
even though it's only debugging output, that center-tag is so much deprecated :)
Add a CSS id so that it can be turned off by templating.


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.49.2.8
retrieving revision 1.49.2.9
diff -u -d -r1.49.2.8 -r1.49.2.9
--- index.php	3 Nov 2004 10:00:50 -0000	1.49.2.8
+++ index.php	4 Nov 2004 14:40:48 -0000	1.49.2.9
@@ -235,7 +235,7 @@
 }
 $serendipity['smarty']->display(serendipity_getTemplateFile($serendipity['smarty_file'], 'serendipityPath'));
 
-echo '<center style="color: red; font-size: large">Process complete in '. (microtime_float()-$time_start) .' ms</center>';
+echo '<div id="s9y_debug" style="text-align: center; color: red; font-size: large">Process complete in '. (microtime_float()-$time_start) .' ms</div>';
 # serendipity_plugin_api::register_default_plugins();
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.64,1.419.2.65

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php 
Log Message:
fix comment preview


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.64
retrieving revision 1.419.2.65
diff -u -d -r1.419.2.64 -r1.419.2.65
--- serendipity_functions.inc.php	4 Nov 2004 13:42:49 -0000	1.419.2.64
+++ serendipity_functions.inc.php	4 Nov 2004 14:27:56 -0000	1.419.2.65
@@ -966,24 +966,6 @@
 
             /* IF WE ARE DISPLAYING A FULL ENTRY */
             if (isset($serendipity['GET']['id'])) {
-                $entry['viewmode'] = ($serendipity['GET']['cview']) ? $serendipity['GET']['cview'] : VIEWMODE_THREADED;
-
-                if (!empty($serendipity['POST']['preview'])) {
-                    serendipity_printComments(
-                        array(
-                            array(
-                                'email'     => $serendipity['POST']['email'],
-                                'username'  => $serendipity['POST']['name'],
-                                'body'      => $serendipity['POST']['comment'],
-                                'url'       => $serendipity['POST']['url'],
-                                'parent_id' => $serendipity['POST']['replyTo'],
-                                'timestamp' => time()
-                            )
-                        ),
-                        $serendipity['POST']['replyTo']
-                    );
-                }
-
                 $serendipity['smarty']->assign(
                     array(
                         'comments_messagestack' => (isset($serendipity['messagestack']['comments']) ? (array)$serendipity['messagestack']['comments'] : false),
@@ -3477,16 +3459,32 @@
 }
 
 function serendipity_smarty_printComments($params, &$smarty) {
-    if ( !isset($params['entry']) ) {
+    global $serendipity;
+
+    if (!isset($params['entry'])) {
         $smarty->trigger_error(__FUNCTION__ .": missing 'entry' parameter");
         return;
     }
 
-    if ( !isset($params['mode']) ) {
+    if (!isset($params['mode'])) {
         $params['mode'] = VIEWMODE_THREADED;
     }
 
-    return serendipity_printComments(serendipity_fetchComments($params['entry']), $params['mode']);
+    $comments = serendipity_fetchComments($params['entry']);
+
+    if (!empty($serendipity['POST']['preview'])) {
+        $comments[] =
+            array(
+                    'email'     => $serendipity['POST']['email'],
+                    'username'  => $serendipity['POST']['name'],
+                    'body'      => $serendipity['POST']['comment'],
+                    'url'       => $serendipity['POST']['url'],
+                    'parent_id' => $serendipity['POST']['replyTo'],
+                    'timestamp' => time()
+            );
+    }
+
+    return serendipity_printComments($comments, $params['mode']);
 }
 
 function serendipity_smarty_printTrackbacks($params, &$smarty) {

[php-blog-cvs] serendipity/templates/default index.tpl,1.1.2.6,1.1.2.7

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

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

Modified Files:
      Tag: branch-smarty
	index.tpl 
Log Message:
only show sidebars when asked for


Index: index.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/index.tpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- index.tpl	30 Sep 2004 18:05:45 -0000	1.1.2.6
+++ index.tpl	4 Nov 2004 13:42:57 -0000	1.1.2.7
@@ -35,9 +35,13 @@
 
 <table id="mainpane">
     <tr>
+{if $leftSidebarElements > 0}
         <td id="serendipityLeftSideBar" valign="top">{serendipity_printSidebar side="left"}</td>
+{/if}
         <td id="content" valign="top">{$CONTENT}</td>
+{if $rightSidebarElements > 0}
         <td id="serendipityRightSideBar" valign="top">{serendipity_printSidebar side="right"}</td>
+{/if}
     </tr>
 </table>
 {/if}

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.63,1.419.2.64 serendipity_genpage.inc.php,1.33.2.9,1.33.2.10 serendipity_plugin_api.php,1.23.2.8,1.23.2.9

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php serendipity_genpage.inc.php 
	serendipity_plugin_api.php 
Log Message:
only show sidebars when asked for


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.23.2.8
retrieving revision 1.23.2.9
diff -u -d -r1.23.2.8 -r1.23.2.9
--- serendipity_plugin_api.php	28 Oct 2004 20:17:10 -0000	1.23.2.8
+++ serendipity_plugin_api.php	4 Nov 2004 13:42:54 -0000	1.23.2.9
@@ -244,6 +244,29 @@
         return serendipity_db_query($sql);
     }
 
+    /* Retrieves a list of plugin instances */
+    function count_plugins($filter = '*', $negate = false)
+    {
+        global $serendipity;
+
+        $sql = "SELECT COUNT(placement) AS count from {$serendipity['dbPrefix']}plugins ";
+
+        if ($filter !== '*') {
+            if ($negate) {
+                $sql .= "WHERE placement != '$filter' ";
+            } else {
+                $sql .= "WHERE placement='$filter' ";
+            }
+        }
+
+        $count = serendipity_db_query($sql, true);
+        if (is_array($count) && isset($count[0])) {
+            return (int)$count[0];
+        }
+
+        return 0;
+    }
+
     /* Creates an instance of a named plugin */
     function &load_plugin($instance_id)
     {

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.33.2.9
retrieving revision 1.33.2.10
diff -u -d -r1.33.2.9 -r1.33.2.10
--- serendipity_genpage.inc.php	30 Sep 2004 18:05:44 -0000	1.33.2.9
+++ serendipity_genpage.inc.php	4 Nov 2004 13:42:54 -0000	1.33.2.10
@@ -11,7 +11,6 @@
     $serendipity['smarty_raw_mode'] = false;
 }
 
-
 $serendipity['smarty']->assign(
     array(
         'head_charset'              => LANG_CHARSET,
@@ -34,6 +33,9 @@
         'serendipityBaseURL'        => $serendipity['baseURL'],
         'serendipityRewritePrefix'  => $serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '',
         'serendipityIndexFile'      => $serendipity['indexFile'],
+
+        'leftSidebarElements'       => serendipity_plugin_api::count_plugins('left'),
+        'rightSidebarElements'      => serendipity_plugin_api::count_plugins('right')
     )
 );
 

[php-blog-cvs] serendipity NEWS,1.214.2.47,1.214.2.48 serendipity_functions.inc.php,1.419.2.62,1.419.2.63

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

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

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_functions.inc.php 
Log Message:
* "Recent Entries" Plugin can now have userdefined title and only      
  show entries of a specific category (+ subcategories).


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.62
retrieving revision 1.419.2.63
diff -u -d -r1.419.2.62 -r1.419.2.63
--- serendipity_functions.inc.php	4 Nov 2004 11:56:43 -0000	1.419.2.62
+++ serendipity_functions.inc.php	4 Nov 2004 12:54:47 -0000	1.419.2.63
@@ -2593,6 +2593,9 @@
                           htmlspecialchars($cat['category_name']));
                     }
                     break;
+                case 4:
+                    $ret .= $cat['categoryid'] . '|||' . str_repeat(' ', $level * 2) . $cat['category_name'] . '@@@';
+                    break;
             }
             $ret .= serendipity_generateCategoryList($cats, $select, $type, $cat['categoryid'], $level + 1, $xmlImg);
         }

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.47
retrieving revision 1.214.2.48
diff -u -d -r1.214.2.47 -r1.214.2.48
--- NEWS	4 Nov 2004 11:56:42 -0000	1.214.2.47
+++ NEWS	4 Nov 2004 12:54:47 -0000	1.214.2.48
@@ -3,6 +3,10 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * "Recent Entries" Plugin can now have userdefined title and only
+      show entries of a specific category (+ subcategories).
+      (garvinhicking)
+
     * New "quicksave" button to save an entry as draft without being
       redirected to entry overview, and immediately showing the preview.
       Use Accesskeys: Alt-S saves entry, Alt-P previews, ALT-Q

[php-blog-cvs] serendipity/plugins/serendipity_plugin_recententries serendipity_plugin_recententries.php,1.9.2.1,1.9.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_recententries.php 
Log Message:
* "Recent Entries" Plugin can now have userdefined title and only      
  show entries of a specific category (+ subcategories).


Index: serendipity_plugin_recententries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- serendipity_plugin_recententries.php	29 Oct 2004 11:02:41 -0000	1.9.2.1
+++ serendipity_plugin_recententries.php	4 Nov 2004 12:54:48 -0000	1.9.2.2
@@ -28,12 +28,19 @@
         $propbag->add('description',   PLUGIN_RECENTENTRIES_BLAHBLAH);
         $propbag->add('stackable',     true);
         $propbag->add('author',        'Christian Machmeier');
-        $propbag->add('version',       '1.0');
-        $propbag->add('configuration', array('number', 'dateformat'));
+        $propbag->add('version',       '1.1');
+        $propbag->add('configuration', array('title', 'number', 'dateformat', 'category'));
     }
 
     function introspect_config_item($name, &$propbag) {
         switch($name) {
+            case 'title':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        TITLE);
+                $propbag->add('description', TITLE_FOR_NUGGET);
+                $propbag->add('default',     PLUGIN_RECENTENTRIES_TITLE);
+                break;
+
             case 'number':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_RECENTENTRIES_NUMBER);
@@ -48,6 +55,35 @@
                 $propbag->add('default', '%A, %B %e %Y');
                 break;
 
+            case 'category':
+                $cats    = serendipity_fetchCategories($serendipity['authorid']);
+                if (!is_array($cats)) {
+                    return false;
+                }
+
+                $catlist = serendipity_generateCategoryList($cats, array(0), 4);
+                $tmp_select_cats = explode('@@@', $catlist);
+
+                if (!is_array($tmp_select_cats)) {
+                    return false;
+                }
+
+                $select_cats = array();
+                $select_cats['none'] = ALL_CATEGORIES;
+                foreach($tmp_select_cats as $cidx => $tmp_select_cat) {
+                    $select_cat = explode('|||', $tmp_select_cat);
+                    if (!empty($select_cat[0]) && !empty($select_cat[1])) {
+                        $select_cats[$select_cat[0]] = $select_cat[1];
+                    }
+                }
+
+                $propbag->add('type',          'select');
+                $propbag->add('select_values', $select_cats);
+                $propbag->add('name',          CATEGORY);
+                $propbag->add('description',   CATEGORIES_TO_FETCH);
+                $propbag->add('default',       'none');
+                break;
+
             default:
                 return false;
         }
@@ -59,6 +95,16 @@
 
         $number     = $this->get_config('number');
         $dateformat = $this->get_config('dateformat');
+        $category   = $this->get_config('category', 'none');
+        $title      = $this->get_config('title', $title);
+
+        $sql_join   = '';
+        $sql_where  = '';
+        if ($category != 'none' && is_numeric($category)) {
+            $sql_join = 'LEFT OUTER JOIN ' . $serendipity['dbPrefix'] . 'entrycat AS ec ON id = ec.entryid
+                         LEFT OUTER JOIN ' . $serendipity['dbPrefix'] . 'category AS c  ON ec.categoryid = c.categoryid';
+            $sql_where = ' AND (c.category_left BETWEEN ' . implode(' AND ', serendipity_fetchCategoryRange($category)) . ')';
+        }
 
         if (!$number || !is_numeric($number) || $number < 1) {
             $number = 10;
@@ -68,15 +114,16 @@
             $dateformat = '%A, %B %e %Y';
         }
 
-        $title = PLUGIN_RECENTENTRIES_TITLE;
-
-        $entries = serendipity_db_query("SELECT id,
+        $entries_query = "SELECT id,
                                                 title,
                                                 timestamp
                                            FROM {$serendipity['dbPrefix']}entries
-                                          WHERE isdraft = 'false'
+                                                $sql_join
+                                          WHERE isdraft = 'false' AND timestamp <= " . time() . "
+                                                $sql_where
                                        ORDER BY timestamp DESC
-                                          LIMIT $number");
+                                          LIMIT $number";
+        $entries = serendipity_db_query($entries_query);
 
         if (isset($entries) && is_array($entries)) {
             foreach ($entries as $k => $entry) {

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.15.2.7,1.15.2.8 serendipity_lang_cs.inc.php,1.61.2.7,1.61.2.8 serendipity_lang_cz.inc.php,1.61.2.6,1.61.2.7 serendipity_lang_da.inc.php,1.79.2.8,1.79.2.9 serendipity_lang_de.inc.php,1.98.2.9,1.98.2.10 serendipity_lang_en.inc.php,1.79.2.8,1.79.2.9 serendipity_lang_es.inc.php,1.77.2.8,1.77.2.9 serendipity_lang_fr.inc.php,1.58.2.9,1.58.2.10 serendipity_lang_it.inc.php,1.1.2.7,1.1.2.8 serendipity_lang_nl.inc.php,1.36.2.7,1.36.2.8 serendipity_lang_no.inc.php,1.2.2.7,1.2.2.8 serendipity_lang_pt.inc.php,1.36.2.8,1.36.2.9

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
Log Message:
"quicksave"


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.61.2.7
retrieving revision 1.61.2.8
diff -u -d -r1.61.2.7 -r1.61.2.8
--- serendipity_lang_cs.inc.php	28 Oct 2004 20:17:19 -0000	1.61.2.7
+++ serendipity_lang_cs.inc.php	4 Nov 2004 11:59:25 -0000	1.61.2.8
@@ -587,5 +587,7 @@
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('QUICKSAVE', 'Quicksave'); // 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.2.2.7
retrieving revision 1.2.2.8
diff -u -d -r1.2.2.7 -r1.2.2.8
--- serendipity_lang_no.inc.php	28 Oct 2004 20:17:22 -0000	1.2.2.7
+++ serendipity_lang_no.inc.php	4 Nov 2004 11:59:26 -0000	1.2.2.8
@@ -582,4 +582,6 @@
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('QUICKSAVE', 'Quicksave'); // Translate
+
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.36.2.7
retrieving revision 1.36.2.8
diff -u -d -r1.36.2.7 -r1.36.2.8
--- serendipity_lang_nl.inc.php	28 Oct 2004 20:17:22 -0000	1.36.2.7
+++ serendipity_lang_nl.inc.php	4 Nov 2004 11:59:25 -0000	1.36.2.8
@@ -592,6 +592,7 @@
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('QUICKSAVE', 'Quicksave'); // 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.79.2.8
retrieving revision 1.79.2.9
diff -u -d -r1.79.2.8 -r1.79.2.9
--- serendipity_lang_en.inc.php	28 Oct 2004 20:17:20 -0000	1.79.2.8
+++ serendipity_lang_en.inc.php	4 Nov 2004 11:59:25 -0000	1.79.2.9
@@ -584,6 +584,7 @@
 @define('INSTALL', 'Install');
 @define('ALREADY_INSTALLED', 'Already installed');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install');
+@define('QUICKSAVE', 'Quicksave');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -u -d -r1.15.2.7 -r1.15.2.8
--- serendipity_lang_bg.inc.php	28 Oct 2004 20:17:11 -0000	1.15.2.7
+++ serendipity_lang_bg.inc.php	4 Nov 2004 11:59:25 -0000	1.15.2.8
@@ -569,5 +569,7 @@
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('QUICKSAVE', 'Quicksave'); // 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.36.2.8
retrieving revision 1.36.2.9
diff -u -d -r1.36.2.8 -r1.36.2.9
--- serendipity_lang_pt.inc.php	28 Oct 2004 20:17:22 -0000	1.36.2.8
+++ serendipity_lang_pt.inc.php	4 Nov 2004 11:59:26 -0000	1.36.2.9
@@ -588,6 +588,7 @@
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('QUICKSAVE', 'Quicksave'); // 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.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- serendipity_lang_it.inc.php	28 Oct 2004 20:17:21 -0000	1.1.2.7
+++ serendipity_lang_it.inc.php	4 Nov 2004 11:59:25 -0000	1.1.2.8
@@ -584,6 +584,7 @@
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('QUICKSAVE', 'Quicksave'); // 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.79.2.8
retrieving revision 1.79.2.9
diff -u -d -r1.79.2.8 -r1.79.2.9
--- serendipity_lang_da.inc.php	28 Oct 2004 20:17:20 -0000	1.79.2.8
+++ serendipity_lang_da.inc.php	4 Nov 2004 11:59:25 -0000	1.79.2.9
@@ -582,5 +582,7 @@
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('QUICKSAVE', 'Quicksave'); // 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.58.2.9
retrieving revision 1.58.2.10
diff -u -d -r1.58.2.9 -r1.58.2.10
--- serendipity_lang_fr.inc.php	3 Nov 2004 10:05:53 -0000	1.58.2.9
+++ serendipity_lang_fr.inc.php	4 Nov 2004 11:59:25 -0000	1.58.2.10
@@ -590,5 +590,7 @@
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('QUICKSAVE', 'Quicksave'); // 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.61.2.6
retrieving revision 1.61.2.7
diff -u -d -r1.61.2.6 -r1.61.2.7
--- serendipity_lang_cz.inc.php	28 Oct 2004 20:17:19 -0000	1.61.2.6
+++ serendipity_lang_cz.inc.php	4 Nov 2004 11:59:25 -0000	1.61.2.7
@@ -585,5 +585,7 @@
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('QUICKSAVE', 'Quicksave'); // 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.77.2.8
retrieving revision 1.77.2.9
diff -u -d -r1.77.2.8 -r1.77.2.9
--- serendipity_lang_es.inc.php	28 Oct 2004 20:17:20 -0000	1.77.2.8
+++ serendipity_lang_es.inc.php	4 Nov 2004 11:59:25 -0000	1.77.2.9
@@ -593,5 +593,7 @@
 @define('INSTALL', 'Install'); // Translate
 @define('ALREADY_INSTALLED', 'Already installed'); // Translate
 @define('SELECT_A_PLUGIN_TO_ADD', 'Select the plugin which you wish to install'); // Translate
+@define('QUICKSAVE', 'Quicksave'); // Translate
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.98.2.9
retrieving revision 1.98.2.10
diff -u -d -r1.98.2.9 -r1.98.2.10
--- serendipity_lang_de.inc.php	3 Nov 2004 13:04:35 -0000	1.98.2.9
+++ serendipity_lang_de.inc.php	4 Nov 2004 11:59:25 -0000	1.98.2.10
@@ -513,7 +513,7 @@
 @define('IMAGE_RESIZE', 'Dateiausmaße ändern');
 @define('MEDIA_DELETE', 'Datei löschen');
 @define('FILES_PER_PAGE', 'Dateien pro Seite');
-@define('CLICK_FILE_TO_INSERT', 'Auf eine Datei klicken um es einzufügen:');
+@define('CLICK_FILE_TO_INSERT', 'Auf eine Datei klicken um diese einzufügen:');
 @define('SELECT_FILE', 'Bitte wählen Sie eine Datei');
 @define('MEDIA_FULLSIZE', 'Vollbild');
 @define('CALENDAR_BOW_DESC', 'Welcher Tag gibt den Wochenanfang an? Standard ist Montag.');
@@ -584,5 +584,7 @@
 @define('INSTALL', 'Installieren');
 @define('ALREADY_INSTALLED', 'Bereits installiert');
 @define('SELECT_A_PLUGIN_TO_ADD', 'Plugin zur Installation wählen');
+@define('QUICKSAVE', 'Zwischenspeichern');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity NEWS,1.214.2.46,1.214.2.47 serendipity_admin_entries.inc.php,1.37,1.37.2.1 serendipity_admin_image_selector.php,1.32,1.32.2.1 serendipity_admin_images.inc.php,1.30.2.1,1.30.2.2 serendipity_functions.inc.php,1.419.2.61,1.419.2.62 serendipity_functions_images.inc.php,1.36.2.3,1.36.2.4

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

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

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_admin_entries.inc.php 
	serendipity_admin_image_selector.php 
	serendipity_admin_images.inc.php serendipity_functions.inc.php 
	serendipity_functions_images.inc.php 
Log Message:
* Fixed entry preview in backend for usage with smarty
* New "quicksave" button to save an entry as draft without being
  redirected to entry overview, and immediately showing the preview.
  Use Accesskeys: Alt-S saves entry, Alt-P previews, ALT-Q
  quicksaves.
* Media browser now allows to immediately upload a file from the
  entry creation screen and use that file/image easily

Please test the media browser thingie especially, as I have not tested
all possible circumstances.


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.36.2.3
retrieving revision 1.36.2.4
diff -u -d -r1.36.2.3 -r1.36.2.4
--- serendipity_functions_images.inc.php	29 Oct 2004 10:11:08 -0000	1.36.2.3
+++ serendipity_functions_images.inc.php	4 Nov 2004 11:56:43 -0000	1.36.2.4
@@ -174,6 +174,12 @@
         echo $query . '<br />';
         echo $sql . '<br />';
     }
+
+    $image_id = serendipity_db_insert_id('images', 'id');
+    if ($image_id > 0) {
+        return $image_id;
+    }
+
     return true;
 }
 
@@ -215,7 +221,7 @@
 
     /* Lets assume we are all done, now we add the image to the image database */
     if ($insertMode) {
-        serendipity_insertImageInDatabase($f, $suf, $fdim['mime'], filesize($infile), $fdim[0], $fdim[1], $serendipity['thumbSuffix'], time(), $authorid, $directory);
+        $r['image_id'] = serendipity_insertImageInDatabase($f, $suf, $fdim['mime'], filesize($infile), $fdim[0], $fdim[1], $serendipity['thumbSuffix'], time(), $authorid, $directory);
     }
 
     return $r;
@@ -662,12 +668,12 @@
     return array($newwidth, $newheight);
 }
 
-function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = false, $url = NULL) {
+function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = false, $url = NULL, $show_upload = false) {
     global $serendipity;
     $sort_row_interval = array(8, 16, 50, 100);
 
     $perPage = (isset($serendipity['GET']['sortorder']['perpage']) ? $serendipity['GET']['sortorder']['perpage'] : $sort_row_interval[0]);
-    $start = ($page-1)*$perPage;
+    $start   = ($page-1) * $perPage;
 
     $serendipity['imageList'] = serendipity_fetchImagesFromDatabase(
                                   $start,
@@ -767,6 +773,13 @@
         </tr>
         <tr>
             <td align="right" colspan="6">
+<?php
+        if ($show_upload) {
+?>
+                <input type="button" value="<?php echo htmlspecialchars(ADD_MEDIA); ?>" onclick="location.href='<?php echo $url; ?>&amp;serendipity[adminAction]=addSelect'; return false" />
+<?php
+        }
+?>
                 <input type="submit" name="go" value=" - <?php echo GO ?> - " />
             </td>
         </tr>

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -d -r1.37 -r1.37.2.1
--- serendipity_admin_entries.inc.php	1 Sep 2004 17:17:41 -0000	1.37
+++ serendipity_admin_entries.inc.php	4 Nov 2004 11:56:43 -0000	1.37.2.1
@@ -281,6 +281,27 @@
             }
         }
 
+        if ($serendipity['POST']['quicksave'] == 'true') {
+            // When quicksaving a new entry, set it to 'draft'
+            if (!is_numeric($entry['id'])) {
+                $entry['isdraft'] = 'true';
+            }
+
+            $serendipity['POST']['preview'] = 'true';
+            $res = serendipity_updertEntry($entry);
+            if (is_string($res)) {
+                echo '<div class="serendipity_msg_error">' . QUICKSAVE . ': <b>' . $res . '</b></div><br />';
+            } else {
+                // serendipity_updertEntry sets this global variable to store the entry id. Couldn't pass this
+                // by reference or as return value because it affects too many places inside our API and dependant
+                // function calls.
+                if (!empty($serendipity['lastSavedEntry'])) {
+                    $entry['id'] = $serendipity['lastSavedEntry'];
+                }
+                echo '<div class="serendipity_msg_notice">' . QUICKSAVE . ': ' . ENTRY_SAVED . '</div><br />';
+            }
+        }
+
         // Save the entry, or just display a preview
         if ($serendipity['POST']['preview'] != 'true') {
             $res = serendipity_updertEntry($entry);
@@ -311,6 +332,7 @@
                 $entry['categories'][] = serendipity_fetchCategoryInfo($catid);
             }
 
+            $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend
             echo '<strong>' . PREVIEW . '</strong>';
             echo '<div style="border:1px solid #000000; padding: 15px;">';
             serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true);

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.46
retrieving revision 1.214.2.47
diff -u -d -r1.214.2.46 -r1.214.2.47
--- NEWS	3 Nov 2004 10:00:50 -0000	1.214.2.46
+++ NEWS	4 Nov 2004 11:56:42 -0000	1.214.2.47
@@ -3,6 +3,15 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * New "quicksave" button to save an entry as draft without being
+      redirected to entry overview, and immediately showing the preview.
+      Use Accesskeys: Alt-S saves entry, Alt-P previews, ALT-Q
+      quicksaves. (garvinhicking)
+
+    * Media browser now allows to immediately upload a file from the
+      entry creation screen and use that file/image easily
+      (garvinhicking)
+
     * exit.php redirection will emit a 301 Moved Permanently header for
       the new location. (garvinhicking)
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.61
retrieving revision 1.419.2.62
diff -u -d -r1.419.2.61 -r1.419.2.62
--- serendipity_functions.inc.php	4 Nov 2004 09:31:50 -0000	1.419.2.61
+++ serendipity_functions.inc.php	4 Nov 2004 11:56:43 -0000	1.419.2.62
@@ -2144,7 +2144,7 @@
         $res = serendipity_db_insert('entries', $entry);
 
         if ($res) {
-            $entry['id'] = serendipity_db_insert_id('entries', 'id');
+            $entry['id'] = $serendipity['lastSavedEntry'] = serendipity_db_insert_id('entries', 'id');
             if (is_array($categories)) {
                 foreach ($categories as $cat) {
                   if (is_numeric($cat))
@@ -2668,6 +2668,7 @@
     $hidden .= '        <input type="hidden" name="serendipity[id]" value="' . (isset($entry['id']) ? $entry['id'] : '') . '" />' . $n;
     $hidden .= '        <input type="hidden" name="serendipity[timestamp]" value="' . (isset($entry['timestamp']) ? $entry['timestamp'] : '') . '" />' . $n;
     $hidden .= '        <input type="hidden" name="serendipity[preview]" value="false" />';
+    $hidden .= '        <input type="hidden" name="serendipity[quicksave]" value="false" />';
 
     if (!empty($errMsg)) {
 ?>
@@ -2685,9 +2686,10 @@
                     <table width="100%" cellspacing="0" cellpadding="0" border="0">
                         <tr>
                             <td><input type="text" name="serendipity[title]" value="<?php echo isset($entry['title']) ? htmlspecialchars($entry['title']) : ''; ?>" size="72" /></td>
-                            <td align="right"><select name="serendipity[isdraft]">
-                                <?php if ($_SESSION['serendipityRightPublish']) { ?><option  value="false" <?php echo $draftP; ?>><?php echo PUBLISH; ?></option><?php } ?>
-                                <option  value="true"  <?php echo $draftD; ?>><?php echo DRAFT; ?></option>
+                            <td align="right">
+                                <select name="serendipity[isdraft]">
+                                    <?php if ($_SESSION['serendipityRightPublish']) { ?><option  value="false" <?php echo $draftP; ?>><?php echo PUBLISH; ?></option><?php } ?>
+                                    <option  value="true"  <?php echo $draftD; ?>><?php echo DRAFT; ?></option>
                                 </select>
                             </td>
                         </tr>
@@ -2862,17 +2864,13 @@
                     <table width="100%" cellpadding="0" cellspacing="0">
                         <tr>
                             <td align="left">
-                                <input id="checkbox_allow_comments" type="checkbox" name="serendipity[allow_comments]" value="true" <?php echo $allow_comments; ?> /><label for="checkbox_allow_comments"><?php echo COMMENTS_ENABLE; ?></label>
+                                <input id="checkbox_allow_comments" type="checkbox" name="serendipity[allow_comments]" value="true" <?php echo $allow_comments; ?> /><label for="checkbox_allow_comments"><?php echo COMMENTS_ENABLE; ?></label><br />
+                                <input id="checkbox_moderate_comments" type="checkbox" name="serendipity[moderate_comments]" value="true" <?php echo $moderate_comments; ?> /><label for="checkbox_moderate_comments"><?php echo COMMENTS_MODERATE; ?></label>
                             </td>
                             <td align="right" rowspan="2" valign="middle">
-                                <input type="submit" value="- <?php echo PREVIEW; ?> -" style="font-weight: bold;" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true';" />
-                                <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
-                            </td>
-
-                        </tr>
-                        <tr>
-                            <td align="left">
-                                <input id="checkbox_moderate_comments" type="checkbox" name="serendipity[moderate_comments]" value="true" <?php echo $moderate_comments; ?> /><label for="checkbox_moderate_comments"><?php echo COMMENTS_MODERATE; ?></label>
+                                <input accesskey="p" type="submit" value="- <?php echo PREVIEW; ?> -" style="font-weight: bold; margin: 2px; width: 100%; text-align: center" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true';" /><br />
+                                <input accesskey="q" type="submit" value="- <?php echo QUICKSAVE; ?> -" style="font-size: x-small; margin: 2px; width: 100%; text-align: center" onclick="document.forms['serendipityEntry'].elements['serendipity[quicksave]'].value='true';" /><br />
+                                <input accesskey="s" type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold; margin: 2px; width: 100%; text-align: center" />
                             </td>
                         </tr>
                     </table>

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -u -d -r1.30.2.1 -r1.30.2.2
--- serendipity_admin_images.inc.php	27 Sep 2004 10:24:38 -0000	1.30.2.1
+++ serendipity_admin_images.inc.php	4 Nov 2004 11:56:43 -0000	1.30.2.2
@@ -133,7 +133,7 @@
                 printf(FILE_FETCHED . '<br />', $serendipity['POST']['imageurl'], $tfile);
 
                 // Create thumbnail
-                serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']);
+                $created_thumbnail = serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']);
                 echo THUMB_CREATED_DONE . '<br />';
             }
         }
@@ -158,7 +158,7 @@
                 @chmod($target, 0664);
 
                 // Create thumbnail
-                serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']);
+                $created_thumbnail = serendipity_makeThumbnail($tfile, false, $authorid, $serendipity['POST']['target_directory']);
                 echo THUMB_CREATED_DONE . '<br />';
             } else {
                 echo ERROR_UNKNOWN_NOUPLOAD . '<br />';
@@ -296,7 +296,14 @@
             <input type="hidden" name="serendipity[action]"      value="admin" />
             <input type="hidden" name="serendipity[adminModule]" value="images" />
             <input type="hidden" name="serendipity[adminAction]" value="add" />
-
+<?php
+        if (isset($image_selector_addvars) && is_array($image_selector_addvars)) {
+            // These variables may come frmo serendipity_admin_image_selector.php to show embedded upload form
+            foreach($image_selector_addvars AS $imgsel_key => $imgsel_val) {
+                echo '          <input type="hidden" name="serendipity[' . htmlspecialchars($imgsel_key) . ']" value="' . htmlspecialchars($imgsel_val) . '" />' . "\n";
+            }
+        }
+?>
             <table>
                 <tr>
                     <td nowrap="nowrap"><?php echo ENTER_MEDIA_URL; ?></td>

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -d -r1.32 -r1.32.2.1
--- serendipity_admin_image_selector.php	30 Aug 2004 18:56:19 -0000	1.32
+++ serendipity_admin_image_selector.php	4 Nov 2004 11:56:43 -0000	1.32.2.1
@@ -22,6 +22,14 @@
     die(HAVE_TO_BE_LOGGED_ON);
 }
 
+if (!isset($serendipity['GET']['adminModule'])) {
+    $serendipity['GET']['adminModule'] = (isset($serendipity['POST']['adminModule']) ? $serendipity['POST']['adminModule'] : '');
+}
+
+if (!isset($serendipity['GET']['step'])) {
+    $serendipity['GET']['step']        = (isset($serendipity['POST']['step'])        ? $serendipity['POST']['step']        : '');
+}
+
 ?>
 <html>
     <head>
@@ -31,10 +39,46 @@
     </head>
 <body class="s9y_wrap" id="serendipity_admin_image_page">
 
+<div style="margin: 5px">
 <?php
 switch ($serendipity['GET']['step']) {
     case '1':
-        $file = serendipity_fetchImageFromDatabase($serendipity['GET']['image']);
+        if (isset($serendipity['GET']['adminAction'])) { // Embedded upload form
+            switch ($serendipity['GET']['adminAction']) {
+                case 'addSelect':
+                    $image_selector_addvars = array(
+                        'step'          => 1,
+                        'textarea'      => (!empty($serendipity['GET']['textarea'])      ? $serendipity['GET']['textarea']      : ''),
+                        'htmltarget'    => (!empty($serendipity['GET']['htmltarget'])    ? $serendipity['GET']['htmltarget']    : ''),
+                        'filename_only' => (!empty($serendipity['GET']['filename_only']) ? $serendipity['GET']['filename_only'] : '')
+                    );
+                    include S9Y_INCLUDE_PATH . 'serendipity_admin_images.inc.php';
+                    break 2;
+
+                case 'add':
+                    include S9Y_INCLUDE_PATH . 'serendipity_admin_images.inc.php';
+                    if (isset($created_thumbnail) && is_array($created_thumbnail) && isset($created_thumbnail['image_id'])) {
+                        $serendipity['GET']['image'] = (int)$created_thumbnail['image_id'];
+
+                        if (!empty($serendipity['POST']['htmltarget'])) {
+                            $serendipity['GET']['htmltarget'] = $serendipity['POST']['htmltarget'];
+                        }
+
+                        if (!empty($serendipity['POST']['filename_only'])) {
+                            $serendipity['GET']['filename_only'] = $serendipity['POST']['filename_only'];
+                        }
+
+                        if (!empty($serendipity['POST']['textarea'])) {
+                            $serendipity['GET']['textarea'] = $serendipity['POST']['textarea'];
+                        }
+                        break;
+                    } else {
+                        break 2;
+                    }
+            }
+        }
+
+        $file          = serendipity_fetchImageFromDatabase($serendipity['GET']['image']);
         $imgsrc        = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
         $imgName       = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] .'.'. $file['extension'];
         $thumbbasename = $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
@@ -46,7 +90,9 @@
 <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
 
 <div>
-<?php if ($is_image) {?>
+<?php
+        if ($is_image) {
+?>
     <img align="right" src="<?php echo $imgsrc; ?>">
     <h1><?php printf(YOU_CHOSE, $file['name']); ?></h1>
     <p>
@@ -135,10 +181,8 @@
             $add_url .= '&amp;serendipity[filename_only]=' . $serendipity['GET']['filename_only'];
         }
 ?>
-    <b><?php echo SELECT_FILE; ?></b>
-    <br />
-
-    <?php echo CLICK_FILE_TO_INSERT; ?>
+    <h1><?php echo SELECT_FILE; ?></h1>
+    <h2><?php echo CLICK_FILE_TO_INSERT; ?></h2>
     <br />
 
     <?php
@@ -146,11 +190,13 @@
           isset($serendipity['GET']['page'])   ? $serendipity['GET']['page']   : 1,
           4,
           false,
-          '?serendipity[step]=1' . $add_url . '&amp;serendipity[textarea]='. $serendipity['GET']['textarea']
+          '?serendipity[step]=1' . $add_url . '&amp;serendipity[textarea]='. $serendipity['GET']['textarea'],
+          true
         );
 }
 ?>
 
+</div>
 </body>
 </html>
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.453,1.454

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fix link title, fix wrong JS


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -d -r1.453 -r1.454
--- serendipity_functions.inc.php	27 Oct 2004 15:00:36 -0000	1.453
+++ serendipity_functions.inc.php	4 Nov 2004 09:32:16 -0000	1.454
@@ -3036,7 +3036,7 @@
                         <input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<b>','</b>')" />
                         <input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<u>','</u>')" />
                         <input type="button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])" />
-                        <input type="button" name="insImage" value="<?php echo MEDIA ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
+                        <input type="button" name="insImage" value="<?php echo MEDIA; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
                         <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])" />
 <?php
         /* Do the "old" non-WYSIWYG editor */
@@ -3045,7 +3045,7 @@
                         <input type="button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
                         <input type="button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
                         <input type="button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
-                        <input type="button" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php'?serendipity[textarea]=body, 'ImageSel', 'width=800,height=600,toolbar=no');">
+                        <input type="button" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no');">
                         <input type="button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
 <?php   }
     } else {
@@ -3102,7 +3102,7 @@
                         <input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<b>','</b>')" />
                         <input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<u>','</u>')" />
                         <input type="button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[extended]'])" />
-                        <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
+                        <input type="button" name="insImage" value="<?php echo MEDIA; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
                         <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[extended]'])" />
 <?php
         /* Do the "old" non-WYSIWYG editor */
@@ -3111,7 +3111,7 @@
                         <input type="button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'u')">
                         <input type="button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'i')">
                         <input type="button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[extended]'])">
-                        <input type="button" value="<?php echo IMAGE; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
+                        <input type="button" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
                         <input type="button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[extended]'])">
 <?php
         }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.60,1.419.2.61

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php 
Log Message:
MFH


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.60
retrieving revision 1.419.2.61
diff -u -d -r1.419.2.60 -r1.419.2.61
--- serendipity_functions.inc.php	3 Nov 2004 13:04:31 -0000	1.419.2.60
+++ serendipity_functions.inc.php	4 Nov 2004 09:31:50 -0000	1.419.2.61
@@ -2831,7 +2831,7 @@
                         <input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<b>','</b>')" />
                         <input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<u>','</u>')" />
                         <input type="button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])" />
-                        <input type="button" name="insImage" value="<?php echo MEDIA ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
+                        <input type="button" name="insImage" value="<?php echo MEDIA; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
                         <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])" />
 <?php
         /* Do the "old" non-WYSIWYG editor */
@@ -2840,7 +2840,7 @@
                         <input type="button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
                         <input type="button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
                         <input type="button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
-                        <input type="button" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php'?serendipity[textarea]=body, 'ImageSel', 'width=800,height=600,toolbar=no');">
+                        <input type="button" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no');">
                         <input type="button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
 <?php   }
     } else {
@@ -2897,7 +2897,7 @@
                         <input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<b>','</b>')" />
                         <input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<u>','</u>')" />
                         <input type="button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[extended]'])" />
-                        <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
+                        <input type="button" name="insImage" value="<?php echo MEDIA; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
                         <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[extended]'])" />
 <?php
         /* Do the "old" non-WYSIWYG editor */
@@ -2906,7 +2906,7 @@
                         <input type="button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'u')">
                         <input type="button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'i')">
                         <input type="button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[extended]'])">
-                        <input type="button" value="<?php echo IMAGE; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
+                        <input type="button" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
                         <input type="button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[extended]'])">
 <?php
         }

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.98.2.8,1.98.2.9

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_de.inc.php 
Log Message:
* MFH german language
* Allow to use a constant for printing the date for comments/comment dropdown. We may want to use a new date constant for that?


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.98.2.8
retrieving revision 1.98.2.9
diff -u -d -r1.98.2.8 -r1.98.2.9
--- serendipity_lang_de.inc.php	29 Oct 2004 10:16:49 -0000	1.98.2.8
+++ serendipity_lang_de.inc.php	3 Nov 2004 13:04:35 -0000	1.98.2.9
@@ -81,7 +81,7 @@
 @define('ADD_COMMENT', 'Kommentar schreiben');
 @define('NO_COMMENTS', 'Noch keine Kommentare.');
 @define('POSTED_BY', 'Geschrieben von');
-@define('ON', 'um');
+@define('ON', 'am');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Im Blog %s wurde ein neuer Kommentar zu Eintrag #%s eingetragen!');
 @define('NO_CATEGORY', 'Keine Kategorie');
 @define('ENTRY_BODY', 'Eintrag');
@@ -155,7 +155,7 @@
 @define('COMMENT_NOT_ADDED', 'Kommentar wurde nicht hinzugefügt, da der Eintrag geschlossen wurde.');
 @define('COMMENT_NOT_ADDED_CLICK', 'Klicken Sie %shier, um zu den Kommentaren zurückzukehren%s und %shier, um das Fenster zu schließen%s.');
 @define('EMPTY_COMMENT', 'Ihr Kommentar war leer, bitte %sgehen Sie zurück%s und versuchen es erneut');
-@define('ENTRIES_FOR', 'Einträge am %s');
+@define('ENTRIES_FOR', 'Einträge für %s');
 @define('DOCUMENT_NOT_FOUND', 'Das Dokument %s wurde nicht gefunden.');
 @define('USERNAME', 'Benutzername');
 @define('PASSWORD', 'Passwort');

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.59,1.419.2.60

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php 
Log Message:
* MFH german language
* Allow to use a constant for printing the date for comments/comment dropdown. We may want to use a new date constant for that?


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.59
retrieving revision 1.419.2.60
diff -u -d -r1.419.2.59 -r1.419.2.60
--- serendipity_functions.inc.php	28 Oct 2004 20:22:53 -0000	1.419.2.59
+++ serendipity_functions.inc.php	3 Nov 2004 13:04:31 -0000	1.419.2.60
@@ -1163,7 +1163,7 @@
     foreach ($comments as $comment) {
         if ($comment['parent_id'] == $parent) {
             $i++;
-            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&nbsp;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $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('&nbsp;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . ucfirst(strftime(DATE_FORMAT_SHORT, $comment['timestamp'])) . "</option>\n";
             $retval .= serendipity_generateCommentList($id, $comments, $selected, $comment['id'], $level + 1, $indent . $i . '.');
         }
     }

[php-blog-cvs] serendipity/templates/default comments.tpl,1.1.2.2,1.1.2.3

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

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

Modified Files:
      Tag: branch-smarty
	comments.tpl 
Log Message:
* MFH german language
* Allow to use a constant for printing the date for comments/comment dropdown. We may want to use a new date constant for that?


Index: comments.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/comments.tpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- comments.tpl	9 Oct 2004 23:16:27 -0000	1.1.2.2
+++ comments.tpl	3 Nov 2004 13:04:35 -0000	1.1.2.3
@@ -13,7 +13,7 @@
                 (<a href="{$comment.url}" title="{$comment.url|@escape}">Link</a>)
             {/if}
             {$CONST.ON}
-            {$comment.timestamp|@formatTime:"%b %e %Y, %H:%M"}
+            {$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>)
             {/if}

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.103,1.104

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

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

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
corrected german mistake


Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- serendipity_lang_de.inc.php	20 Oct 2004 16:27:25 -0000	1.103
+++ serendipity_lang_de.inc.php	3 Nov 2004 12:57:55 -0000	1.104
@@ -82,7 +82,7 @@
 @define('ADD_COMMENT', 'Kommentar schreiben');
 @define('NO_COMMENTS', 'Noch keine Kommentare.');
 @define('POSTED_BY', 'Geschrieben von');
-@define('ON', 'um');
+@define('ON', 'am');
 @define('A_NEW_COMMENT_BLAHBLAH', 'Im Blog %s wurde ein neuer Kommentar zu Eintrag #%s eingetragen!');
 @define('NO_CATEGORY', 'Keine Kategorie');
 @define('ENTRY_BODY', 'Eintrag');
@@ -156,7 +156,7 @@
 @define('COMMENT_NOT_ADDED', 'Kommentar wurde nicht hinzugefügt, da der Eintrag geschlossen wurde.');
 @define('COMMENT_NOT_ADDED_CLICK', 'Klicken Sie %shier, um zu den Kommentaren zurückzukehren%s und %shier, um das Fenster zu schließen%s.');
 @define('EMPTY_COMMENT', 'Ihr Kommentar war leer, bitte %sgehen Sie zurück%s und versuchen es erneut');
-@define('ENTRIES_FOR', 'Einträge am %s');
+@define('ENTRIES_FOR', 'Einträge für %s');
 @define('DOCUMENT_NOT_FOUND', 'Das Dokument %s wurde nicht gefunden.');
 @define('USERNAME', 'Benutzername');
 @define('PASSWORD', 'Passwort');

[php-blog-cvs] serendipity/lang serendipity_lang_fr.inc.php,1.63,1.64

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

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

Modified Files:
	serendipity_lang_fr.inc.php 
Log Message:
fixed javascript escaping, thanks to stoub from the forums


Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- serendipity_lang_fr.inc.php	20 Oct 2004 16:27:25 -0000	1.63
+++ serendipity_lang_fr.inc.php	3 Nov 2004 10:06:27 -0000	1.64
@@ -491,7 +491,7 @@
 @define('COMMENT_EDITED', 'Le commentaire sélectionné a été modifié');
 @define('HIDE', 'Cacher');
 @define('VIEW_EXTENDED_ENTRY', 'Continuer à lire "%s"');
-@define('TRACKBACK_SPECIFIC_ON_CLICK', 'Ce lien n\'est pas fait pour être cliqué. Il contient le lien de traçage pour ce billet. Vous pouvez utiliser ce lien pour envoyer un ping ou faire un traçage sur ce billet à partir de votre blog. Pour copier le lien, faites un clic droit sur le lien, et sélectionnez \'Copier le lien\' dans Internet Explorer ou \'Copier le lien\' dans Mozilla.');
+@define('TRACKBACK_SPECIFIC_ON_CLICK', 'Ce lien n\\\'est pas fait pour être cliqué. Il contient le lien de traçage pour ce billet. Vous pouvez utiliser ce lien pour envoyer un ping ou faire un traçage sur ce billet à partir de votre blog. Pour copier le lien, faites un clic droit sur le lien, et sélectionnez \\\'Copier le lien\\\' dans Internet Explorer ou \\\'Copier le lien\\\' dans Mozilla.');
 @define('THIS_TRACKBACK_NEEDS_REVIEW', 'Attention: Ce traçage doit être approuvé avant qu\'il puisse être affiché.');
 @define('DELETE_TRACKBACK', 'Supprimer le traçage');
 @define('APPROVE_TRACKBACK', 'Approuver le traçage');