mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

cleanup cosmetics

Browse Source
This commit is contained in:
Ian
2014-12-10 14:34:54 +01:00
parent ffe93c92fc
commit aca77bd482
22 changed files with 132 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
exit.php
View File

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

4
include/compat.inc.php
View File

@ -1,4 +1,4 @@
<?php # $Id$ <?php
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team) # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details # 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>'; $str .= '<p>' . $errStr . ' in ' . $errFile . ' on line ' . $errLine . '</p>';
#var_dump(headers_list()); #var_dump(headers_list());
if (headers_sent()) { 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 { } else {
// see global include of function in plugin_api.inc.php // see global include of function in plugin_api.inc.php
// this also reacts on non eye-displayed errors with following small javascript, // this also reacts on non eye-displayed errors with following small javascript,

6
include/functions_calendars.inc.php
View File

@ -420,7 +420,7 @@ function persian_date_utf($format, $timestamp='') {
$output_str.=$format[$i]; $output_str.=$format[$i];
break; break;
} }
}else{ } else {
$i++; $i++;
$output_str.=$format[$i]; $output_str.=$format[$i];
} }
@ -480,7 +480,7 @@ function persian_mktime($hour='', $min='', $sec='', $mon='', $day='', $year='',
} }
*/ */
if($mon <= 0){ if ($mon <= 0){
// change sign // change sign
$mon = abs($mon); $mon = abs($mon);
@ -511,6 +511,6 @@ function persian_mktime($hour='', $min='', $sec='', $mon='', $day='', $year='',
$day += $j_days_in_month[$temp_month]; $day += $j_days_in_month[$temp_month];
} }
list($year, $mon, $day)=p2g($year, $mon, $day); list($year, $mon, $day) = p2g($year, $mon, $day);
return mktime($hour, $min, $sec, $mon, $day, $year, $is_dst); return mktime($hour, $min, $sec, $mon, $day, $year, $is_dst);
} }

2
include/functions_config.inc.php
View File

@ -626,7 +626,7 @@ function serendipity_authenticate_author($username = '', $password = '', $is_has
$_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid']; $_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid'];
$_SESSION['serendipityUserlevel'] = $serendipity['serendipityUserlevel'] = $row['userlevel']; $_SESSION['serendipityUserlevel'] = $serendipity['serendipityUserlevel'] = $row['userlevel'];
$_SESSION['serendipityAuthedUser'] = $serendipity['serendipityAuthedUser'] = true; $_SESSION['serendipityAuthedUser'] = $serendipity['serendipityAuthedUser'] = true;
$_SESSION['serendipityRightPublish']= $serendipity['serendipityRightPublish'] = $row['right_publish']; $_SESSION['serendipityRightPublish'] = $serendipity['serendipityRightPublish'] = $row['right_publish'];
$_SESSION['serendipityHashType'] = $serendipity['serendipityHashType'] = $row['hashtype']; $_SESSION['serendipityHashType'] = $serendipity['serendipityHashType'] = $row['hashtype'];
serendipity_load_configuration($serendipity['authorid']); serendipity_load_configuration($serendipity['authorid']);

2
include/functions_installer.inc.php
View File

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

1
include/functions_trackbacks.inc.php
View File

@ -872,4 +872,3 @@ function is_utf8($string) {
. '|\xF4[\x80-\x8F][\x80-\xBF]{2}' # plane 16 . '|\xF4[\x80-\x8F][\x80-\xBF]{2}' # plane 16
. ')*$%xs', $string); . ')*$%xs', $string);
} }

2
include/functions_upgrader.inc.php
View File

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

5
include/genpage.inc.php
View File

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

2
include/lang.inc.php
View File

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

3
include/plugin_api_extension.inc.php
View File

@ -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) # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details # All rights reserved. See LICENSE file for licensing details

4
include/template_api.inc.php
View File

@ -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) # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details # All rights reserved. See LICENSE file for licensing details
@ -330,4 +331,3 @@ class serendipity_smarty_emulator_xml extends serendipity_smarty_emulator {
} }
} }
} }

2
index.php
View File

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

21
rss.php
View File

@ -1,4 +1,4 @@
<?php # $Id$ <?php
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team) # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details # All rights reserved. See LICENSE file for licensing details
@ -87,9 +87,9 @@ if (isset($modified_since) &&
} }
switch ($_GET['type']) { switch ($_GET['type']) {
case 'comments_and_trackbacks': case 'comments_and_trackbacks':
case 'trackbacks': case 'trackbacks':
case 'comments': case 'comments':
$entries = serendipity_fetchComments(isset($_GET['cid']) ? $_GET['cid'] : null, $serendipity['RSSfetchLimit'], 'co.id desc', false, $_GET['type']); $entries = serendipity_fetchComments(isset($_GET['cid']) ? $_GET['cid'] : null, $serendipity['RSSfetchLimit'], 'co.id desc', false, $_GET['type']);
$description = $title . ' - ' . $description; $description = $title . ' - ' . $description;
if (isset($_GET['cid'])) { if (isset($_GET['cid'])) {
@ -99,8 +99,9 @@ case 'comments':
} }
$comments = TRUE; $comments = TRUE;
break; break;
case 'content':
default: case 'content':
default:
if (isset($_GET['all']) && $_GET['all']) { if (isset($_GET['all']) && $_GET['all']) {
// Fetch all entries in reverse order for later importing. Fetch sticky entries as normal entries. // Fetch all entries in reverse order for later importing. Fetch sticky entries as normal entries.
$entries = serendipity_fetchEntries(null, true, '', false, false, 'id ASC', '', false, true); $entries = serendipity_fetchEntries(null, true, '', false, false, 'id ASC', '', false, true);
@ -153,7 +154,7 @@ if (serendipity_get_config_var('feedBannerURL') != '') {
$h = 21; $h = 21;
} }
$metadata['additional_fields']['image'] = <<<IMAGE $metadata['additional_fields']['image'] = <<<IMAGE
<image> <image>
<url>$img</url> <url>$img</url>
<title>RSS: $title - $description</title> <title>RSS: $title - $description</title>
@ -163,12 +164,12 @@ if (serendipity_get_config_var('feedBannerURL') != '') {
</image> </image>
IMAGE; IMAGE;
$metadata['additional_fields']['image_atom1.0'] = <<<IMAGE $metadata['additional_fields']['image_atom1.0'] = <<<IMAGE
<icon>$img</icon> <icon>$img</icon>
IMAGE; IMAGE;
$metadata['additional_fields']['image_rss1.0_channel'] = '<image rdf:resource="' . $img . '" />'; $metadata['additional_fields']['image_rss1.0_channel'] = '<image rdf:resource="' . $img . '" />';
$metadata['additional_fields']['image_rss1.0_rdf'] = <<<IMAGE $metadata['additional_fields']['image_rss1.0_rdf'] = <<<IMAGE
<image rdf:about="$img"> <image rdf:about="$img">
<url>$img</url> <url>$img</url>
<title>RSS: $title - $description</title> <title>RSS: $title - $description</title>

3
serendipity.css.php
View File

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

4
serendipity_admin.php
View File

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

2
serendipity_admin_image_selector.php
View File

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

5
serendipity_config.inc.php
View File

@ -1,4 +1,4 @@
<?php # $Id$ <?php
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team) # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
# All rights reserved. See LICENSE file for licensing details # All rights reserved. See LICENSE file for licensing details
@ -128,7 +128,7 @@ if (!isset($serendipity['template_backend'])) {
$serendipity['template_backend'] = '2k11'; $serendipity['template_backend'] = '2k11';
} }
/* Availiable languages */ /* Available languages */
if (!isset($serendipity['languages'])) { if (!isset($serendipity['languages'])) {
$serendipity['languages'] = array('en' => 'English', $serendipity['languages'] = array('en' => 'English',
'de' => 'German', 'de' => 'German',
@ -411,7 +411,6 @@ $serendipity['permissionLevels'] = array(USERLEVEL_EDITOR => USERLEVEL_EDITOR_DE
USERLEVEL_CHIEF => USERLEVEL_CHIEF_DESC, USERLEVEL_CHIEF => USERLEVEL_CHIEF_DESC,
USERLEVEL_ADMIN => USERLEVEL_ADMIN_DESC); USERLEVEL_ADMIN => USERLEVEL_ADMIN_DESC);
// Redirect to the upgrader // Redirect to the upgrader
if (IS_up2date === false && !defined('IN_upgrader')) { if (IS_up2date === false && !defined('IN_upgrader')) {
if (preg_match(PAT_CSS, $_SERVER['REQUEST_URI'], $matches)) { if (preg_match(PAT_CSS, $_SERVER['REQUEST_URI'], $matches)) {

2
serendipity_xmlrpc.php
View File

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

2
wfwcomment.php
View File

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