cleanup cosmetics

2014-12-10 14:34:54 +01:00 · 2014-12-10 14:34:54 +01:00 · aca77bd482
commit aca77bd482
parent ffe93c92fc
22 changed files with 132 additions and 134 deletions
--- a/exit.php
+++ b/exit.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

--- a/include/compat.inc.php
+++ b/include/compat.inc.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

@ -135,7 +135,7 @@ if (!function_exists('errorToExceptionHandler')) {
                $str .= '<p>' . $errStr . ' in ' . $errFile . ' on line ' . $errLine . '</p>';
                #var_dump(headers_list());
                if (headers_sent()) {
-                    serendipity_die($str); // case HTTP headers: needs to halt with die() here, else it will path through and gets written underneath blog content, which hardly isn't seen by many users
+                    serendipity_die($str); // case HTTP headers: needs to halt with die() here, else it will path through and gets written underneath blog content, or into streamed js files, which hardly isn't seen by many users
                } else {
                    // see global include of function in plugin_api.inc.php
                    // this also reacts on non eye-displayed errors with following small javascript,
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

--- a/include/functions_trackbacks.inc.php
+++ b/include/functions_trackbacks.inc.php
@ -872,4 +872,3 @@ function is_utf8($string) {
         . '|\xF4[\x80-\x8F][\x80-\xBF]{2}'      # plane 16
         . ')*$%xs', $string);
 }
-
--- a/include/functions_upgrader.inc.php
+++ b/include/functions_upgrader.inc.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

--- a/include/genpage.inc.php
+++ b/include/genpage.inc.php
@ -1,4 +1,4 @@
-<?php #
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

@ -8,16 +8,15 @@ if (IN_serendipity !== true) {

 include_once('serendipity_config.inc.php');

-
 include_once(S9Y_INCLUDE_PATH . 'include/plugin_api.inc.php');

-
 $uri_addData = array(
    'startpage' => false,
    'uriargs'   => implode('/', serendipity_getUriArguments($uri, true)),
    'view'      => $serendipity['view'],
    'viewtype'  => $serendipity['viewtype']
 );
+
 if ((empty($uri_addData['uriargs']) || trim($uri_addData['uriargs']) == $serendipity['indexFile']) && empty($serendipity['GET']['subpage'])) {
    $uri_addData['startpage'] = true;
 }
--- a/include/lang.inc.php
+++ b/include/lang.inc.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

--- a/include/plugin_api_extension.inc.php
+++ b/include/plugin_api_extension.inc.php
@ -1,4 +1,5 @@
-<?php # $Id: plugin_api.inc.php 1168 2006-04-29 13:06:11Z garvinhicking $
+<?php
+# $Id: plugin_api.inc.php 1168 2006-04-29 13:06:11Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

--- a/include/template_api.inc.php
+++ b/include/template_api.inc.php
@ -1,4 +1,5 @@
-<?php # $Id: plugin_api.inc.php 1228 2006-06-01 11:18:53Z garvinhicking $
+<?php
+# $Id: plugin_api.inc.php 1228 2006-06-01 11:18:53Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

@ -330,4 +331,3 @@ class serendipity_smarty_emulator_xml extends serendipity_smarty_emulator {
        }
    }
 }
-
--- a/index.php
+++ b/index.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

--- a/rss.php
+++ b/rss.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

@ -99,6 +99,7 @@ case 'comments':
        }
        $comments    = TRUE;
        break;
+
    case 'content':
    default:
        if (isset($_GET['all']) && $_GET['all']) {
--- a/serendipity.css.php
+++ b/serendipity.css.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

@ -51,7 +51,6 @@ function serendipity_printStylesheet($file, $dir = '') {
             @file_get_contents($file, 1));
 }

-
 if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
    header('Cache-Control: no-cache');
 } else {
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

@ -252,7 +252,7 @@ if (!$use_installer) {
        $admin_vars['version_info'] = sprintf(ADMIN_FOOTER_POWERED_BY, '', '');
    }

-    if (!$serendipity['smarty']) serendipity_smarty_init();
+    if (!is_object($serendipity['smarty'])) serendipity_smarty_init();
    $serendipity['smarty']->assignByRef('admin_vars', $admin_vars);
    $serendipity['smarty']->display(serendipity_getTemplateFile('admin/index.tpl', 'serendipityPath'));
 } else {
--- a/serendipity_admin_image_selector.php
+++ b/serendipity_admin_image_selector.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

@ -128,7 +128,7 @@ if (!isset($serendipity['template_backend'])) {
    $serendipity['template_backend'] = '2k11';
 }

-/* Availiable languages */
+/* Available languages */
 if (!isset($serendipity['languages'])) {
    $serendipity['languages'] = array('en' => 'English',
                                  'de' => 'German',
@ -411,7 +411,6 @@ $serendipity['permissionLevels'] = array(USERLEVEL_EDITOR => USERLEVEL_EDITOR_DE
                                         USERLEVEL_CHIEF => USERLEVEL_CHIEF_DESC,
                                         USERLEVEL_ADMIN => USERLEVEL_ADMIN_DESC);

-
 // Redirect to the upgrader
 if (IS_up2date === false && !defined('IN_upgrader')) {
    if (preg_match(PAT_CSS, $_SERVER['REQUEST_URI'], $matches)) {
--- a/serendipity_xmlrpc.php
+++ b/serendipity_xmlrpc.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details

--- a/wfwcomment.php
+++ b/wfwcomment.php
@ -1,4 +1,4 @@
-<?php # $Id$
+<?php
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details