* Fix SQL injection for comment.php used in read-context.

(Thanks to High-Tech Bridge SA Security Release Lab, Advisory HTB23092)

comment.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: comment.php 2522 2009-06-11 12:14:15Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

deployment/comment.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: comment.php 7 2005-04-16 06:39:31Z s_bergmann $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

deployment/exit.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: exit.php 7 2005-04-16 06:39:31Z s_bergmann $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

deployment/index.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: index.php 7 2005-04-16 06:39:31Z s_bergmann $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

deployment/rss.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: rss.php 7 2005-04-16 06:39:31Z s_bergmann $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

deployment/serendipity.css.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity.css.php 7 2005-04-16 06:39:31Z s_bergmann $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

deployment/serendipity_admin.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_admin.php 7 2005-04-16 06:39:31Z s_bergmann $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

deployment/serendipity_admin_image_selector.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_admin_image_selector.php 7 2005-04-16 06:39:31Z s_bergmann $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

deployment/serendipity_config.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_config.inc.php 861 2006-01-23 09:46:13Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

deployment/serendipity_define.js.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_define.js.php 7 2005-04-16 06:39:31Z s_bergmann $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

deployment/serendipity_editor.js

@@ -1,5 +1,5 @@
 <!-- // Hide from older browsers
-/* $Id$ */
+/* $Id: serendipity_editor.js 2549 2009-07-14 10:14:46Z garvinhicking $ */
 /*
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

deployment/serendipity_xmlrpc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_xmlrpc.php 7 2005-04-16 06:39:31Z s_bergmann $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

deployment/wfwcomment.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: wfwcomment.php 7 2005-04-16 06:39:31Z s_bergmann $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Serendipity is provided in managed mode here

docs/NEWS

@@ -1,23 +1,45 @@
 # $Id$
 
-
-Version 1.7 ()
+Version 1.6.2 (May 16th, 2012)
 ------------------------------------------------------------------------
 
-    * Added new serendipity['defaultBaseURL'] variable that makes sure
-      that the baseURL is not overriden when configuring serendipity
-      with a possibly autodetected currentl URL. Patch by Manko10.
-
-Version 1.6 ()
+    * Fix SQL injection for comment.php used in read-context.     
+      (Thanks to High-Tech Bridge SA Security Release Lab, Advisory HTB23092)
+          
+Version 1.6.1 (May 8th, 2012)
 ------------------------------------------------------------------------
 
-    * Fix XSS issue in mediadatabase filtering, thanks to Stefan Schurtz
+    * Improved escaping of backend plugin management for DB query
+      and media selector output (Stefan Schurtz)
+          
+    * Updated spamblock plugin to 1.78 & 1.79
+      changed wordfilter to function to check with 'verify_once'
+      to reject wordfilter signed spam comments before - 
+	  added in 1.79 killswitch check and serendipity_db_bool()
 
+    * fixed draft & future entries preview link in backend
+
+    * Fixed some possible errors with pdo db_begin/end_transaction()
+
+    * Fixed unneccessary preg_match notices in the statistics backend
+
+    * Fixed a possible problem where template-specific variables would
+      note be cleared in favor of the new global ones.
+
+    * Fixed serendipity_fetchComments producing wrong SQL code. Please
+      check your code if you did workarounds already and remove them.
+
+Version 1.6 (October 27th 2011)
+------------------------------------------------------------------------
+
+    * Fix XSS issue in karma-plugin admin interface and media manager
+      interface, by Stefan Schurtz
+    
     * Fix problem with autosave plugin used in conjunction with
       entryproperties (chrisbra)
-      
-    * Removed browsercompatibilitty plugin because it's outdated and
-      IE6 shall be dead.
+          
+    * Removed browsercompatibility plugin due to its outdatedness. IE6
+      is dead.
       
     * Fixed Spartauc SF.Net download location (Thanks to christian_boltz)
     
@@ -622,21 +644,21 @@ Version 1.3.1 ()
 ------------------------------------------------------------------------
 
     * Add XSS security checks for installer, even though very
-      hypothetical application :) (Hanno Böck)
+      hypothetical application :) (Hanno Böck)
 
     * Add {serendipity_getImageSize} smarty function (judebert)
     
     * Add escaping to "Top Referrers" plugin and honor local configuration
-      of "Show links" option, thanks to Hanno Böck
+      of "Show links" option, thanks to Hanno Böck
     
     * Fix some PostgreSQL implicit casts for SQL queries (changed
-      LIKE to =). (Devrim Gündüz)
+      LIKE to =). (Devrim Gündüz)
 
 Version 1.3 (March 18th, 2008)
 ------------------------------------------------------------------------
 
     * Fix possible XSS injection for published trackbacks, thanks to 
-      Peter Hüwe!
+      Peter Hüwe!
 
     * Added "Google Reader" option to syndication plugin, by Adam
       Charnock
@@ -1218,7 +1240,7 @@ Version 1.1-beta1 (August 14th, 2006)
     * Added arabic (sa) language by Way
 
     * Add patch to allow entryproperties plugin to define passwords for
-      specific entries (Falk Döring)
+      specific entries (Falk Döring)
 
     * Made smarty function "serendipity_printComments" accept to new
       parameters: "order" (ASC/DESC) and "limit" (garvinhicking)
@@ -1231,7 +1253,7 @@ Version 1.1-beta1 (August 14th, 2006)
       (thanks to deminy!)
 
     * Replaced core smarty assign() calls to assign_by_ref() where
-      appropriate. (Falk Döring, garvinhicking)
+      appropriate. (Falk Döring, garvinhicking)
       TODO: This might introduce oddities! Check thoroughly.
 
     * Fixed not showing entries in the quicksearch that have the
@@ -1301,7 +1323,7 @@ Version 1.1-alpha5()
 
    * Added "plugin_api_extension" class, which contains some helper
      methods for future use, like re-ordering DB items or checking
-     valid emails. (Falk Döring)
+     valid emails. (Falk Döring)
 
    * Fix multiple occurences of the string "--" in the entry title to
      not mess up HTML display because of weird Firefox interpretation
@@ -1627,7 +1649,7 @@ Version 1.0-beta2 (March 13th, 2006)
 
    * Updated french translation by Sebastian Mordziol
 
-   * Updated icelandic translation by Örn Arnarson
+   * Updated icelandic translation by Örn Arnarson
 
    * Updated chinese plugin translation, by Demin Yin
 
@@ -1819,7 +1841,7 @@ Version 0.9.1 (November 23rd, 2005)
     * Fix showing preview image of hotlinked images. Thanks to Thomas
       and RobA from the forums! (garvinhicking)
 
-    * Make Onyx RSS parser interpret HTTP redirecty. (Kristian Köhntopp)
+    * Make Onyx RSS parser interpret HTTP redirecty. (Kristian Köhntopp)
 
     * Added blogger.com importer by Jawish Hameed
 
@@ -2093,7 +2115,7 @@ Version 0.9-beta1 (September 29th, 2005)
     * Localized the string "Reply" which occured inside some templates.
       (s/Reply/{$CONST.REPLY}/) (garvinhicking)
 
-    * Added swedish translation by Torbjörn Hedberg, Added european
+    * Added swedish translation by Torbjörn Hedberg, Added european
       portugues translation by Joao Palhoto Matos, Added hungarian
       translation by Posz Marton
 
@@ -2355,7 +2377,7 @@ Version 0.8.1 (May 17th, 2005)
 Version 0.8 (April, 15th 2005)
 ------------------------------------------------------------------------
 
-    * Added icelandic translation by Örn Arnarson
+    * Added icelandic translation by Örn Arnarson
 
     * Fixed a possible SQL injection issue in Tracking methods. Also
       fixed possible XSS exploit in BBCode markup, if enabled for

exit.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: exit.php 2316 2008-08-22 09:20:13Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/category.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: category.inc.php 2706 2010-10-12 12:38:13Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/comments.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: comments.inc.php 2759 2011-07-11 06:14:12Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/configuration.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: configuration.inc.php 2366 2008-11-06 11:44:43Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -30,14 +30,14 @@ switch ($_POST['installAction'] && serendipity_checkFormToken()) {
             $permalinkOld = array(
                 $oldConfig['serendipityHTTPPath'],
                 $oldConfig['serendipityPath'],
-                $oldConfig['defaultBaseURL'],
+                $oldConfig['baseURL'],
                 $oldConfig['indexFile'],
                 $oldConfig['rewrite']);
 
             $permalinkNew = array(
                 $serendipity['serendipityHTTPPath'],
                 $serendipity['serendipityPath'],
-                $serendipity['defaultBaseURL'],
+                $serendipity['baseURL'],
                 $serendipity['indexFile'],
                 $serendipity['rewrite']);
 

include/admin/entries.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: entries.inc.php 2628 2010-01-13 12:28:55Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -284,7 +284,7 @@ function serendipity_drawList() {
                         </td>
                         <td align="right">
                             <?php if (serendipity_db_bool($entry['isdraft']) || (!$serendipity['showFutureEntries'] && $entry['timestamp'] >= serendipity_serverOffsetHour())) { ?>
-                            <a target="_blank" href="<?php echo $entry['preview_link']; ?>" title="<?php echo PREVIEW . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo PREVIEW; ?>" /><?php echo PREVIEW ?></a>
+                            <a target="_blank" href="<?php echo $entry['preview_link']; ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" title="<?php echo PREVIEW . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo PREVIEW; ?>" /><?php echo PREVIEW ?></a>
                             <?php } else { ?>
                             <a target="_blank" href="<?php echo $entry['link']; ?>" title="<?php echo VIEW . ' #' . $entry['id']; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><?php echo VIEW ?></a>
                             <?php } ?>

include/admin/entries_overview.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: entries_overview.inc.php 2100 2008-02-01 14:10:14Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 /* vim: set sts=4 ts=4 expandtab : */

include/admin/export.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: export.inc.php 1768 2007-07-12 09:40:04Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/images.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: images.inc.php 2593 2009-10-29 18:18:44Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/import.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: import.inc.php 1992 2007-10-19 14:26:12Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/b2evolution.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: b2evolution.inc.php 1093 2006-04-13 10:49:52Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/bblog.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: bblog.inc.php 144 2005-06-05 17:53:31Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/bmachine.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: bmachine.inc.php 50 2005-04-25 16:50:43Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/geeklog.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: geeklog.inc.php 50 2005-04-25 16:50:43Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/generic.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: generic.inc.php 2551 2009-07-14 11:40:16Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/movabletype.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: movabletype.inc.php 1815 2007-08-06 10:18:26Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/nucleus.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: nucleus.inc.php 1463 2006-10-27 09:20:03Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/phpbb.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: phpbb.inc.php 50 2005-04-25 16:50:43Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/pmachine.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: pmachine.inc.php 50 2005-04-25 16:50:43Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/sunlog.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: sunlog.inc.php 558 2005-10-15 16:02:02Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/textpattern.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: textpattern.inc.php 558 2005-10-15 16:02:02Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/importers/wordpress.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: wordpress.inc.php 1992 2007-10-19 14:26:12Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/installer.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: installer.inc.php 2544 2009-07-10 13:50:13Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/overview.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: overview.inc.php 2504 2009-05-04 08:33:50Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 /* vim: set sts=4 ts=4 expandtab : */

include/admin/personal.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: personal.inc.php 2469 2009-02-16 11:29:49Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/plugins.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: plugins.inc.php 2722 2011-01-03 09:11:17Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/templates.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: templates.inc.php 2722 2011-01-03 09:11:17Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -28,6 +28,10 @@ class template_option {
     function set_config($item, $value) {
         global $serendipity;
         
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}options
+                                    WHERE okey = 't_" . serendipity_db_escape_string($serendipity['template']) . "'
+                                      AND name = '" . serendipity_db_escape_string($item) . "'");
+                                                                                    
         if ($this->config[$item]['scope'] == 'global') {
             serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}options
                                    WHERE okey = 't_global'

include/admin/upgrader.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: upgrader.inc.php 2397 2008-12-09 10:41:48Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/admin/users.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: users.inc.php 2469 2009-02-16 11:29:49Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/compat.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: compat.inc.php 2751 2011-05-10 12:51:30Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/db/db.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: db.inc.php 2706 2010-10-12 12:38:13Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/db/mysql.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: mysql.inc.php 2728 2011-01-08 22:31:20Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/db/mysqli.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: mysqli.inc.php 2728 2011-01-08 22:31:20Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/db/pdo-postgres.inc.php

@@ -8,6 +8,7 @@
  * @access public
  */
 function serendipity_db_begin_transaction(){
+    global $serendipity;
     $serendipity['dbConn']->beginTransaction();
 }
 
@@ -18,6 +19,7 @@ function serendipity_db_begin_transaction(){
  * @param  boolean  If true, perform the query. If false, rollback.
  */
 function serendipity_db_end_transaction($commit){
+    global $serendipity;
     if ($commit){
         $serendipity['dbConn']->commit();
     }else{

include/db/pdo-sqlite.inc.php

@@ -49,6 +49,7 @@ function serendipity_db_sqlite_fetch_array($row, $type = PDO::FETCH_ASSOC)
  */
 
 function serendipity_db_begin_transaction(){
+    global $serendipity;
     $serendipity['dbConn']->beginTransaction();
 }
 
@@ -59,6 +60,7 @@ function serendipity_db_begin_transaction(){
  * @param  boolean  If true, perform the query. If false, rollback.
  */
 function serendipity_db_end_transaction($commit){
+    global $serendipity;
     if ($commit){
         $serendipity['dbConn']->commit();
     }else{

include/db/postgres.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: postgres.inc.php 2728 2011-01-08 22:31:20Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/db/sqlite.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: sqlite.inc.php 2728 2011-01-08 22:31:20Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/functions.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: functions.inc.php 2680 2010-08-24 09:45:46Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/functions_comments.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: functions_comments.inc.php 2752 2011-05-16 07:45:57Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -281,7 +281,7 @@ function serendipity_fetchComments($id, $limit = null, $order = '', $showAll = f
               WHERE co.type LIKE '" . $type . "' AND co.entry_id > 0 $and
               $group
               ORDER BY
-                    " . ($where != '' ? '' : 'co.id') . " " . ($order != '' ? $order : '') . "
+                    " . (empty($order) ? 'co.id' : $order) . "
                     $limit";
     $comments = serendipity_db_query($query, false, 'assoc');
 
@@ -862,7 +862,7 @@ function serendipity_insertComment($id, $commentInfo, $type = 'NORMAL', $source
     // Send mail to the author if he chose to receive these mails, or if the comment is awaiting moderation
     if ($status != 'confirm' && (serendipity_db_bool($ca['moderate_comments'])
         || ($type == 'NORMAL' && serendipity_db_bool($row['mail_comments']))
-        || ($type == 'TRACKBACK' && serendipity_db_bool($row['mail_trackbacks'])))) {
+        || (($type == 'TRACKBACK' || $type == 'PINGBACK') && serendipity_db_bool($row['mail_trackbacks'])))) {
         serendipity_sendComment($cid, $row['email'], $name, $email, $url, $id, $row['title'], $comments, $type, serendipity_db_bool($ca['moderate_comments']), $referer);
     }
 
@@ -1119,7 +1119,7 @@ function serendipity_sendComment($comment_id, $to, $fromName, $fromEmail, $fromU
     }
 
     $entryURI   = serendipity_archiveURL($id, $title, 'baseURL');
-    $path       = ($type == 'TRACKBACK') ? 'trackback' : 'comment';
+    $path       = ($type == 'TRACKBACK' || $type == 'PINGBACK') ? 'trackback' : 'comment';
 
     // Check for using Tokens
     if ($serendipity['useCommentTokens']) {
@@ -1153,7 +1153,7 @@ function serendipity_sendComment($comment_id, $to, $fromName, $fromEmail, $fromU
         $action_more .= "\n" . str_repeat(' ', 3) . $action;
     } 
 
-    if ($type == 'TRACKBACK') {
+    if ($type == 'TRACKBACK' || $type == 'PINGBACK') {
 
         /******************* TRACKBACKS *******************/
         $subject =  ($moderate_comment ? '[' . REQUIRES_REVIEW . '] ' : '') . NEW_TRACKBACK_TO . ' ' . $title;

include/functions_config.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: functions_config.inc.php 2785 2011-09-28 11:39:01Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -329,12 +329,6 @@ function serendipity_load_configuration($author = null) {
     }
     $config_loaded[$author] = true;
 
-    // Set baseURL to defaultBaseURL
-    if ((empty($author) || empty($serendipity['baseURL'])) && isset($serendipity['defaultBaseURL'])) {
-        $serendipity['baseURL'] = $serendipity['defaultBaseURL'];
-    }
-    
-
     // Store default language
     $serendipity['default_lang'] = $serendipity['lang'];
 }

include/functions_entries.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: functions_entries.inc.php 2706 2010-10-12 12:38:13Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -1059,6 +1059,7 @@ function serendipity_printEntries($entries, $extended = 0, $preview = false, $sm
             }
 
             if (!empty($entry['properties']['ep_cache_body'])) {
+                $entry['pre_body']  = $entry['body'];
                 $entry['body']      = &$entry['properties']['ep_cache_body'];
                 $entry['is_cached'] = true;
             }
@@ -1074,6 +1075,7 @@ function serendipity_printEntries($entries, $extended = 0, $preview = false, $sm
             }
 
             if (!empty($entry['properties']['ep_cache_extended'])) {
+                $entry['pre_extended'] = $entry['extended'];
                 $entry['extended']  = &$entry['properties']['ep_cache_extended'];
                 $entry['is_cached'] = true;
             }

include/functions_images.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: functions_images.inc.php 2750 2011-04-21 15:07:33Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Improved by Vladimir Ajgl (vlada@ajgl.cz) 2008-01-26

include/functions_installer.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: functions_installer.inc.php 2732 2011-01-15 13:32:59Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/functions_smarty.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: functions_smarty.inc.php 2761 2011-07-19 16:37:24Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -70,12 +70,7 @@ function &serendipity_printTrackbacks(&$trackbacks) {
 function &serendipity_smarty_fetch($block, $file, $echo = false) {
     global $serendipity;
 
-    if (strpos($serendipity['smarty']->_version, '2', 1)) {
-        $output =& $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode']));
-    } else {
-        $output =& $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, null, ($echo === true && $serendipity['smarty_raw_mode']));
-    }
-
+    $output =& $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode']));
     $serendipity['smarty']->assign_by_ref($block, $output);
 
     return $output;
@@ -919,14 +914,6 @@ function serendipity_smarty_init($vars = array()) {
             $serendipity['smarty']->compile_check = true;
             $serendipity['smarty']->compile_id    = &$serendipity['template'];
 
-            if (!strpos($serendipity['smarty']->_version, '2', 1)) {
-                $serendipity['smarty']->setDeprecationNotices(false); // set $smarty->deprecation_notices
-                #$serendipity['smarty']->setCaching(true);             // set $smarty->caching to not being regenerated
-                #$serendipity['smarty']->force_compile = false;        // override compile_check (default:false)
-                #$serendipity['smarty']->error_reporting = E_ALL & ~E_NOTICE;
-                #$serendipity['smarty']->auto_literal = false;
-            }
-            
             $serendipity['smarty']->register_modifier('makeFilename', 'serendipity_makeFilename');
             $serendipity['smarty']->register_modifier('xhtml_target', 'serendipity_xhtml_target');
             $serendipity['smarty']->register_modifier('emptyPrefix', 'serendipity_emptyPrefix');
@@ -1000,7 +987,6 @@ function serendipity_smarty_init($vars = array()) {
                 'blogDescription'           => $serendipity['blogDescription'],
 
                 'serendipityHTTPPath'       => $serendipity['serendipityHTTPPath'],
-                'serendipityDefaultBaseURL' => $serendipity['defaultBaseURL'],
                 'serendipityBaseURL'        => $serendipity['baseURL'],
                 'serendipityRewritePrefix'  => $serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '',
                 'serendipityIndexFile'      => $serendipity['indexFile'],

include/functions_trackbacks.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: functions_trackbacks.inc.php 2704 2010-10-07 08:43:53Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -362,8 +362,20 @@ function add_trackback ($id, $title, $url, $name, $excerpt) {
         fclose($fp);
     }
 
-    serendipity_saveComment($id, $comment, 'TRACKBACK');
-
+    if ($id>0) {
+        // first check, if we already have this trackback
+        $comments = serendipity_fetchComments($id,1,'co.id',true,'TRACKBACK'," AND co.url='" . serendipity_db_escape_string($url) . "'");
+        if (is_array($comments) && sizeof($comments) == 1) {
+            log_pingback("We already have that TRACKBACK!");
+            return 0; // We already have it!
+        }
+        // We don't have it, so save the pingback
+        serendipity_saveComment($id, $comment, 'TRACKBACK');
+        return 1;
+    } else {
+        return 0;
+    }
+    
     return 1;
 }
 
@@ -400,6 +412,13 @@ function add_pingback ($id, $postdata) {
         }
         
         if ($id>0) {
+            // first check, if we already have this pingback
+            $comments = serendipity_fetchComments($id,1,'co.id',true,'PINGBACK'," AND co.url='$remote'");
+            if (is_array($comments) && sizeof($comments) == 1) {
+                log_pingback("We already have that PINGBACK!");
+                return 0; // We already have it!
+            }
+            // We don't have it, so save the pingback
             serendipity_saveComment($id, $comment, 'PINGBACK');
             return 1;
         } else {

include/functions_upgrader.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: functions_upgrader.inc.php 1696 2007-05-18 07:59:14Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/genpage.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: genpage.inc.php 2651 2010-04-30 08:13:30Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/lang.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: lang.inc.php 2397 2008-12-09 10:41:48Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/plugin_api.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: plugin_api.inc.php 2771 2011-08-13 22:06:09Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -526,7 +526,7 @@ class serendipity_plugin_api
             $filename = serendipity_plugin_api::includePlugin($class_name, $pluginPath, $instance_id);
             if (empty($filename) && !empty($instance_id)) {
                 // $serendipity['debug']['pluginload'][] = "No valid path/filename found.";
-                $sql = "SELECT path from {$serendipity['dbPrefix']}plugins WHERE name = '" . $instance_id . "'";
+                $sql = "SELECT path from {$serendipity['dbPrefix']}plugins WHERE name = '" . serendipity_db_escape_string($instance_id) . "'";
                 $plugdata = serendipity_db_query($sql, true, 'both', false, false, false, true);
                 if (is_array($plugdata) && isset($plugdata[0])) {
                     $pluginPath = $plugdata[0];
@@ -590,7 +590,7 @@ class serendipity_plugin_api
         if (!is_null($authorid)) {
             $p->serendipity_owner = $authorid;
         } else {
-            $sql = "SELECT authorid from {$serendipity['dbPrefix']}plugins WHERE name = '" . $instance_id . "'";
+            $sql = "SELECT authorid from {$serendipity['dbPrefix']}plugins WHERE name = '" . serendipity_db_escape_string($instance_id) . "'";
             $owner = serendipity_db_query($sql, true);
             if (is_array($owner) && isset($owner[0])) {
                 $p->serendipity_owner = $owner[0];
@@ -1099,7 +1099,7 @@ class serendipity_plugin_api
             $instance_id .= ':';
         }
 
-        $existing = serendipity_db_query("SELECT name FROM {$serendipity['dbPrefix']}plugins WHERE name LIKE '%$instance_id%'");
+        $existing = serendipity_db_query("SELECT name FROM {$serendipity['dbPrefix']}plugins WHERE name LIKE '%" . serendipity_db_escape_string($instance_id) . "%'");
 
         if (is_array($existing) && !empty($existing[0][0])) {
             return $existing[0][0];

include/plugin_internal.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: plugin_internal.inc.php 2768 2011-07-23 04:42:02Z yellowled $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

include/tpl/config_local.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: config_local.inc.php 2592 2009-10-27 09:08:48Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -110,7 +110,7 @@
                                           'permission'  => 'siteConfiguration',
                                           'default'     => 'uploads/'),
 
-                                    array('var'         => 'defaultBaseURL',
+                                    array('var'         => 'baseURL',
                                           'title'       => INSTALL_URL,
                                           'description' => INSTALL_URL_DESC,
                                           'type'        => 'string',

include/tpl/config_personal.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: config_personal.inc.php 2592 2009-10-27 09:08:48Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

index.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: index.php 2774 2011-09-09 09:25:43Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 

lang/UTF-8/serendipity_lang_bg.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_bg.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) 2004 Bogomil Shopov <bogomil@spisanie.com>

lang/UTF-8/serendipity_lang_de.inc.php

@@ -911,7 +911,7 @@
 @define('RSS_IMPORT_WPXRSS', 'WordPress eXtended RSS Import, benötigt PHP5 und kann viel RAM/Speicher benötigen.');
 
 @define('SET_TO_MODERATED', 'Moderieren');
-@define('COMMENT_MODERATED', 'Kommentar #%s wurde erfolgreich moderiert.');
+@define('COMMENT_MODERATED', 'Kommentar #%s wurde erfolgreich auf Status "moderieren" zurückgesetzt.');
 @define('CENTER', 'mitte');
 @define('FULL_COMMENT_TEXT', 'Ja, mit vollständigen Kommentar-Texten.');
 

lang/UTF-8/serendipity_lang_en.inc.php

@@ -913,7 +913,7 @@
 @define('CATEGORY_PLUGIN_HIDEZEROCOUNT', 'Hide archives link when no entries were made in that timespan (requires counting entries)');
 @define('RSS_IMPORT_WPXRSS', 'WordPress eXtended RSS import, requires PHP5 and might take up much memory');
 @define('SET_TO_MODERATED', 'Moderate');
-@define('COMMENT_MODERATED', 'Comment #%s has successfully been set as moderated');
+@define('COMMENT_MODERATED', 'Comment #%s has successfully been set back to state "moderate".');
 @define('CENTER', 'center');
 @define('FULL_COMMENT_TEXT', 'Yes, with full comment text');
 

lang/serendipity_lang_bg.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_bg.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) 2004 Bogomil Shopov <bogomil@spisanie.com>

lang/serendipity_lang_cn.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_cn.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by

lang/serendipity_lang_da.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_da.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Tom Sommer, <ts@dreamcoder.dk>

lang/serendipity_lang_de.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_de.inc.php 2782 2011-09-28 09:19:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) Jannis Hermanns, Garvin Hicking and others
@@ -911,7 +911,7 @@
 @define('RSS_IMPORT_WPXRSS', 'WordPress eXtended RSS Import, benötigt PHP5 und kann viel RAM/Speicher benötigen.');
 
 @define('SET_TO_MODERATED', 'Moderieren');
-@define('COMMENT_MODERATED', 'Kommentar #%s wurde erfolgreich moderiert.');
+@define('COMMENT_MODERATED', 'Kommentar #%s wurde erfolgreich auf Status "moderieren" zurückgesetzt.');
 @define('CENTER', 'mitte');
 @define('FULL_COMMENT_TEXT', 'Ja, mit vollständigen Kommentar-Texten.');
 

lang/serendipity_lang_en.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_en.inc.php 2755 2011-05-31 14:07:23Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 /* vim: set sts=4 ts=4 expandtab : */
@@ -913,7 +913,7 @@
 @define('CATEGORY_PLUGIN_HIDEZEROCOUNT', 'Hide archives link when no entries were made in that timespan (requires counting entries)');
 @define('RSS_IMPORT_WPXRSS', 'WordPress eXtended RSS import, requires PHP5 and might take up much memory');
 @define('SET_TO_MODERATED', 'Moderate');
-@define('COMMENT_MODERATED', 'Comment #%s has successfully been set as moderated');
+@define('COMMENT_MODERATED', 'Comment #%s has successfully been set back to state "moderate".');
 @define('CENTER', 'center');
 @define('FULL_COMMENT_TEXT', 'Yes, with full comment text');
 

lang/serendipity_lang_es.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_es.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Luis Cervantes <LuisCervantes@ono.com>,

lang/serendipity_lang_fa.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_fa.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved. See LICENSE file for licensing details
 # this translation, translated by Omid Mottaghi <http://oxygenws.com>

lang/serendipity_lang_fi.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_fi.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Mauri Sahlberg <mos@iki.fi>

lang/serendipity_lang_fr.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_fr.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Sebastian Mordziol <argh@php-tools.net>

lang/serendipity_lang_is.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_is.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Örn Arnarson <orn@arnarson.net>

lang/serendipity_lang_ja.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_ja.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) Tadashi Jokagi <elf2000@users.sourceforge.net>, 2004-2010.

lang/serendipity_lang_ko.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_ko.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by: Wesley Hwang-Chung <wesley96@gmail.com>

lang/serendipity_lang_nl.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_nl.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Christiaan Heerze <webmaster@heimp.nl>

lang/serendipity_lang_no.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_no.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Jo Christian Oterhals <oterhals@gmail.com>

lang/serendipity_lang_pt.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_pt.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Agner Olson <agner@agner.net>

lang/serendipity_lang_ru.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_ru.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Nightly <nightly@reys.net>

lang/serendipity_lang_tn.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_tn.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by CapriSkye <admin@capriskye.com>

lang/serendipity_lang_tw.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_tw.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by CapriSkye <admin@capriskye.com>

lang/serendipity_lang_zh.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: serendipity_lang_zh.inc.php 2745 2011-04-11 12:35:40Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by

plugins/serendipity_event_bbcode/UTF-8/lang_bg.inc.php

@@ -1,7 +1,7 @@
-<?php # $Id$
+<?php # $Id: lang_bg.inc.php 1419 2006-08-29 10:25:22Z jwalker $
 
 /**
- *  @version $Revision$
+ *  @version $Revision: 1419 $
  *  @author Ivan Cenov jwalker@hotmail.bg
  */
  

plugins/serendipity_event_bbcode/UTF-8/lang_es.inc.php

@@ -1,6 +1,6 @@
-<?php # $Id$
+<?php # $Id: lang_es.inc.php 1381 2006-08-15 10:14:56Z elf2000 $
 /**
- *  @version $Revision$
+ *  @version $Revision: 1381 $
  *  @author Rodrigo Lazo Paz <rlazo.paz@gmail.com>
  *  EN-Revision: 690
  */

plugins/serendipity_event_bbcode/UTF-8/lang_fr.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: lang_fr.inc.php 1381 2006-08-15 10:14:56Z elf2000 $
 
 ##########################################################################
 # serendipity - another blogger...                                       #

plugins/serendipity_event_bbcode/UTF-8/lang_ja.inc.php

@@ -1,7 +1,7 @@
-<?php # $Id$
+<?php # $Id: lang_ja.inc.php 1712 2007-06-06 04:23:06Z elf2000 $
 
 /**
- *  @version $Revision$
+ *  @version $Revision: 1712 $
  *  @author Tadashi Jokagi <elf2000@users.sourceforge.net>
  *  EN-Revision: 1410
  */

plugins/serendipity_event_bbcode/UTF-8/lang_ko.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: lang_ko.inc.php 1381 2006-08-15 10:14:56Z elf2000 $
 # Translated by: Wesley Hwang-Chung <wesley96@gmail.com> 
 # (c) 2005 http://www.tool-box.info/
 

plugins/serendipity_event_bbcode/UTF-8/lang_pl.inc.php

@@ -1,7 +1,7 @@
-<?php # $Id$
+<?php # $Id: lang_pl.inc.php 1609 2007-02-06 08:35:09Z garvinhicking $
 
 /**
- *  @version $Revision$
+ *  @version $Revision: 1609 $
  *  @author Kostas CoSTa Brzezinski <costa@kofeina.net>
  *  EN-Revision: Revision of lang_en.inc.php
  */

plugins/serendipity_event_bbcode/UTF-8/lang_tn.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: lang_tn.inc.php 1381 2006-08-15 10:14:56Z elf2000 $
 ##########################################################################
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity    #
 # Developer Team) All rights reserved.  See LICENSE file for licensing   #

plugins/serendipity_event_bbcode/lang_bg.inc.php

@@ -1,7 +1,7 @@
-<?php # $Id$
+<?php # $Id: lang_bg.inc.php 1419 2006-08-29 10:25:22Z jwalker $
 
 /**
- *  @version $Revision$
+ *  @version $Revision: 1419 $
  *  @author Ivan Cenov jwalker@hotmail.bg
  */
  

plugins/serendipity_event_bbcode/lang_en.inc.php

@@ -1,7 +1,7 @@
-<?php # $Id$
+<?php # $Id: lang_en.inc.php 1410 2006-08-24 09:33:19Z garvinhicking $
 
 /**
- *  @version $Revision$
+ *  @version $Revision: 1410 $
  *  @author Translator Name <yourmail@example.com>
  *  EN-Revision: Revision of lang_en.inc.php
  */

plugins/serendipity_event_bbcode/lang_es.inc.php

@@ -1,6 +1,6 @@
-<?php # $Id$
+<?php # $Id: lang_es.inc.php 1381 2006-08-15 10:14:56Z elf2000 $
 /**
- *  @version $Revision$
+ *  @version $Revision: 1381 $
  *  @author Rodrigo Lazo Paz <rlazo.paz@gmail.com>
  *  EN-Revision: 690
  */

plugins/serendipity_event_bbcode/lang_fa.inc.php

@@ -1,7 +1,7 @@
-<?php # $Id$
+<?php # $Id: lang_fa.inc.php 1381 2006-08-15 10:14:56Z elf2000 $
 
 /**
- *  @version $Revision$
+ *  @version $Revision: 1381 $
  *  @author Omid Mottaghi <webmaster@oxygenws.com>
  *  EN-Revision: Revision of lang_fa.inc.php
  */

plugins/serendipity_event_bbcode/lang_fr.inc.php

@@ -1,4 +1,4 @@
-<?php # $Id$
+<?php # $Id: lang_fr.inc.php 1381 2006-08-15 10:14:56Z elf2000 $
 
 ##########################################################################
 # serendipity - another blogger...                                       #