Beanz/flatpress
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some errors occuring in Apache error log - thx laborix

Browse Source
This commit is contained in:
azett 2022-10-09 15:09:55 +02:00
parent 36b3e50006
commit 1b9022c5f6
3 changed files with 102 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/panels/entry/admin.entry.write.tpl
View File

@ -28,7 +28,7 @@
{/if} {/if}
<input type="text" class="{$class}" <input type="text" class="{$class}"
name="subject" id="subject" name="subject" id="subject"
value="{$subject|default:$smarty.request.subject|wp_specialchars:1}" /><br /> value="{$subject|default:{$smarty.request.subject|default:''}|wp_specialchars:1}" /><br />
<input type="hidden" name="timestamp" value="{$date}" /> <input type="hidden" name="timestamp" value="{$date}" />
<input type="hidden" name="entry" value="{$id}" /> <input type="hidden" name="entry" value="{$id}" />
</p> </p>
@ -40,7 +40,7 @@
{/if} {/if}
<p> <p>
<textarea name="content" class="{$class}" <textarea name="content" class="{$class}"
id="content" rows="20" cols="74">{$content|default:$smarty.request.content|htmlspecialchars}</textarea><br /> id="content" rows="20" cols="74">{$content|default:{$smarty.request.content|default:''}|htmlspecialchars}</textarea><br />
{*here will go a plugin hook*} {*here will go a plugin hook*}
{action hook=simple_edit_form} {action hook=simple_edit_form}

6
fp-includes/core/core.draft.php
View File

@ -44,7 +44,7 @@ function draft_getlist() {
static $list = array(); static $list = array();
if (!$list) { if (!$list) {
$obj = & draft_init(); $obj = &draft_init();
$list = $obj->getList(); $list = $obj->getList();
krsort($list); krsort($list);
} }
@ -86,7 +86,7 @@ function draft_save(&$entry, $id = null, $update_index = false, $update_date = f
fs_delete($ed . EXT); fs_delete($ed . EXT);
// remove from normal flow // remove from normal flow
$o = & entry_init(); $o = &entry_init();
$o->delete($id, null); $o->delete($id, null);
} }
} }
@ -177,7 +177,7 @@ function smarty_block_draft($params, $content, &$smarty, &$repeat) {
'version' => '', 'version' => '',
'id' => '' 'id' => ''
)); ));
$arr = & $smarty->getTemplateVars('draft_list'); $arr = $smarty->getTemplateVars('draft_list');
$id = $subject = null; $id = $subject = null;
if ($arr) { if ($arr) {

72
fp-includes/core/core.language.php
View File

@ -1,53 +1,46 @@
<?php <?php
function lang_load($postfix = null) {
function lang_load($postfix=null) {
global $fp_config; global $fp_config;
$pluginpath=''; $pluginpath = '';
// checks if we already loaded this lang file // checks if we already loaded this lang file
$vals = explode('.', $postfix); // my.file.name ---> my, file, name $old_lang = &$GLOBALS ['lang'];
$old_lang =& $GLOBALS['lang'];
if (!$old_lang) if (!$old_lang)
$old_lang = array(); $old_lang = array();
if ($postfix) { if ($postfix) {
if (strpos($postfix, 'plugin:')===0) { if (strpos($postfix, 'plugin:') === 0) {
$pluginpath = substr($postfix, 7); $pluginpath = substr($postfix, 7);
} }
$file = "lang.$postfix.php"; $file = "lang.$postfix.php";
} else { } else {
$postfix='default'; $postfix = 'default';
$file = "lang.default.php"; $file = "lang.default.php";
} }
$fpath=LANG_DIR."{$fp_config['locale']['lang']}/$file"; $fpath = LANG_DIR . "{$fp_config['locale']['lang']}/$file";
$fallback=LANG_DIR.LANG_DEFAULT."/$file"; $fallback = LANG_DIR . LANG_DEFAULT . "/$file";
$path = ''; $path = '';
$plugin=$pluginpath; $plugin = $pluginpath;
if ($pluginpath) { if ($pluginpath) {
if (($n = strpos($pluginpath, '/'))!==false) { if (($n = strpos($pluginpath, '/')) !== false) {
$plugin = substr($plugin, 0, $n-1); $plugin = substr($plugin, 0, $n - 1);
$path = substr($plugin, $n+1); $path = substr($plugin, $n + 1);
$path = str_replace('/', '.', $path); $path = str_replace('/', '.', $path);
} }
$dir = plugin_getdir($plugin); $dir = plugin_getdir($plugin);
$fpath = $dir . "lang/lang.{$fp_config['locale']['lang']}{$path}.php"; $fpath = $dir . "lang/lang.{$fp_config['locale']['lang']}{$path}.php";
$fallback = $dir . "lang/lang.".LANG_DEFAULT."{$path}.php"; $fallback = $dir . "lang/lang." . LANG_DEFAULT . "{$path}.php";
} }
if (!file_exists($fpath)) { if (!file_exists($fpath)) {
@ -58,7 +51,6 @@
} }
$fpath = $fallback; $fpath = $fallback;
} }
/* load $lang from file */ /* load $lang from file */
@ -72,55 +64,47 @@
include_once ($fpath); include_once ($fpath);
if (!isset($lang)) {
if (!isset($lang)){ return $GLOBALS ['lang'];
return $GLOBALS['lang'];
} }
ob_end_clean(); ob_end_clean();
$GLOBALS ['lang'] = array_merge_recursive($lang, $old_lang);
$GLOBALS['lang'] = array_merge_recursive($lang, $old_lang); return $GLOBALS ['lang'];
}
return $GLOBALS['lang']; function lang_getconf($id) {
}
function lang_getconf($id) {
global $lang; global $lang;
$fpath=LANG_DIR."$id/lang.conf.php"; $fpath = LANG_DIR . "$id/lang.conf.php";
if (file_exists($fpath)) { if (file_exists($fpath)) {
include ($fpath); include ($fpath);
return $langconf; return $langconf;
} else } else
trigger_error("Error loading config for language \"$file\"", E_USER_WARNING); trigger_error("Error loading config for language \"$file\"", E_USER_WARNING);
} }
class lang_indexer extends fs_filelister {
var $_directory = LANG_DIR;
class lang_indexer extends fs_filelister {
var $_directory=LANG_DIR;
function _checkFile($directory, $file) { function _checkFile($directory, $file) {
if (is_dir("$directory/$file")) { if (is_dir("$directory/$file")) {
if (!preg_match('![a-z]{2}-[a-z]{2}!', $file)) return 0; if (!preg_match('![a-z]{2}-[a-z]{2}!', $file))
$this->_list[$file] = lang_getconf($file); return 0;
$this->_list [$file] = lang_getconf($file);
} }
return 0; return 0;
} }
} }
function lang_list() { function lang_list() {
$obj = new lang_indexer(); $obj = new lang_indexer();
return $obj->getList(); return $obj->getList();
} }
?> ?>