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

minor whitespace and code cleanup

Browse Source 
and a small github docnote fix
and added a todo for transforming a filename into a valid  upload path
This commit is contained in:
Ian 2015-09-30 11:22:37 +02:00
parent 9e49ecc8c3
commit d7b1e7d23d
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/admin/entries.inc.php
View File

@ -8,6 +8,7 @@ if (!serendipity_checkPermission('adminEntries')) {
return; return;
} }
$per_page = array('12', '16', '50', '100');
$sort_order = array('timestamp' => DATE, $sort_order = array('timestamp' => DATE,
'isdraft' => PUBLISH . '/' . DRAFT, 'isdraft' => PUBLISH . '/' . DRAFT,
'a.realname' => AUTHOR, 'a.realname' => AUTHOR,
@ -15,7 +16,6 @@ $sort_order = array('timestamp' => DATE,
'last_modified' => LAST_UPDATED, 'last_modified' => LAST_UPDATED,
'title' => TITLE, 'title' => TITLE,
'id' => 'ID'); 'id' => 'ID');
$per_page = array('12', '16', '50', '100');
$data = array(); $data = array();
@ -434,8 +434,8 @@ $data['entryForm'] = $entryForm;
$data['errors'] = $errors; $data['errors'] = $errors;
$data['get'] = $serendipity['GET']; // don't trust {$smarty.get.vars} if not proofed, as we often change GET vars via serendipty['GET'] by runtime $data['get'] = $serendipity['GET']; // don't trust {$smarty.get.vars} if not proofed, as we often change GET vars via serendipty['GET'] by runtime
// make sure we've got these // make sure we've got these
if(!isset($data['urltoken'])) $data['urltoken'] = serendipity_setFormToken('url'); if (!isset($data['urltoken'])) $data['urltoken'] = serendipity_setFormToken('url');
if(!isset($data['formtoken'])) $data['formtoken'] = serendipity_setFormToken(); if (!isset($data['formtoken'])) $data['formtoken'] = serendipity_setFormToken();
echo serendipity_smarty_show('admin/entries.inc.tpl', $data); echo serendipity_smarty_show('admin/entries.inc.tpl', $data);

2
include/compat.inc.php
View File

@ -206,7 +206,7 @@ if (!function_exists('errorToExceptionHandler')) {
// while being in tags like <select> to push on top of page, else return non javascript use $str just there // while being in tags like <select> to push on top of page, else return non javascript use $str just there
// sadly we can not use HEREDOC notation here, since this does not execute the javascript after finished writing // sadly we can not use HEREDOC notation here, since this does not execute the javascript after finished writing
echo "\n".'<script> echo "\n".'<script>
if(typeof errorHandlerCreateDOM == "function") { if (typeof errorHandlerCreateDOM == "function") {
var fragment = window.top.errorHandlerCreateDOM("Error redirect: '.addslashes($str).'"); var fragment = window.top.errorHandlerCreateDOM("Error redirect: '.addslashes($str).'");
document.body.insertBefore(fragment, document.body.childNodes[0]); document.body.insertBefore(fragment, document.body.childNodes[0]);
}' . "\n</script>\n<noscript>" . $str . "</noscript>\n"; }' . "\n</script>\n<noscript>" . $str . "</noscript>\n";

2
include/functions_config.inc.php
View File

@ -1059,7 +1059,7 @@ function serendipity_getPostAuthSessionLanguage() {
if ($serendipity['expose_s9y']) serendipity_header('X-Serendipity-InterfaceLangSource: Database'); if ($serendipity['expose_s9y']) serendipity_header('X-Serendipity-InterfaceLangSource: Database');
$lang = $serendipity['lang']; $lang = $serendipity['lang'];
} else { } else {
$lang = (isset($_SESSION['serendipityLanguage']))?$_SESSION['serendipityLanguage']:$serendipity['lang']; $lang = (isset($_SESSION['serendipityLanguage'])) ? $_SESSION['serendipityLanguage'] : $serendipity['lang'];
} }
if (!isset($serendipity['languages'][$lang])) { if (!isset($serendipity['languages'][$lang])) {

3
include/functions_images.inc.php
View File

@ -1360,7 +1360,7 @@ function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newh
* @param int Image height * @param int Image height
* @param int Target dimension size * @param int Target dimension size
* @param string Dimension to constrain ('width', 'height', 'largest', * @param string Dimension to constrain ('width', 'height', 'largest',
'smallest'; defaults to original behavior, 'largest') * 'smallest'; defaults to original behavior, 'largest')
* @return array An array with the scaled width and height * @return array An array with the scaled width and height
*/ */
function serendipity_calculate_aspect_size($width, $height, $size, $constraint = null) { function serendipity_calculate_aspect_size($width, $height, $size, $constraint = null) {
@ -1938,6 +1938,7 @@ function serendipity_deletePath($dir) {
/** /**
* Transform a filename into a valid upload path * Transform a filename into a valid upload path
* ToDO: Rewrite to use converted Umlauts, eg -> ae!
* *
* @access public * @access public
* @param string The input filename * @param string The input filename

2
include/functions_rss.inc.php
View File

@ -155,7 +155,7 @@ function serendipity_printEntries_rss(&$entries, $version, $comments = false, $f
break; break;
case 'atom1.0': case 'atom1.0':
$entry_hook = 'frontend_display:atom-1.0:per_entry'; $entry_hook = 'frontend_display:atom-1.0:per_entry';
break; break;
} }

3
templates/2k11/admin/index.tpl
View File

@ -30,6 +30,7 @@
</div> </div>
</header> </header>
{/if} {/if}
<main id="workspace" class="clearfix"> <main id="workspace" class="clearfix">
{if NOT $admin_vars.is_logged_in} {if NOT $admin_vars.is_logged_in}
{$admin_vars.out|@serendipity_refhookPlugin:'backend_login_page'} {$admin_vars.out|@serendipity_refhookPlugin:'backend_login_page'}
@ -160,8 +161,10 @@
{$admin_vars.main_content} {$admin_vars.main_content}
</div> </div>
{/if} {/if}
</main> </main>
{if NOT $admin_vars.no_footer} {if NOT $admin_vars.no_footer}
<footer id="meta"> <footer id="meta">
<p>{$admin_vars.version_info}</p> <p>{$admin_vars.version_info}</p>
</footer> </footer>