+ id="content" rows="20" cols="74">{$content|default:{$smarty.request.content|default:''}|htmlspecialchars}
{*here will go a plugin hook*}
{action hook=simple_edit_form}
diff --git a/fp-includes/core/core.draft.php b/fp-includes/core/core.draft.php
index 6a6ae52..871ec4d 100644
--- a/fp-includes/core/core.draft.php
+++ b/fp-includes/core/core.draft.php
@@ -44,7 +44,7 @@ function draft_getlist() {
static $list = array();
if (!$list) {
- $obj = & draft_init();
+ $obj = &draft_init();
$list = $obj->getList();
krsort($list);
}
@@ -86,7 +86,7 @@ function draft_save(&$entry, $id = null, $update_index = false, $update_date = f
fs_delete($ed . EXT);
// remove from normal flow
- $o = & entry_init();
+ $o = &entry_init();
$o->delete($id, null);
}
}
@@ -177,7 +177,7 @@ function smarty_block_draft($params, $content, &$smarty, &$repeat) {
'version' => '',
'id' => ''
));
- $arr = & $smarty->getTemplateVars('draft_list');
+ $arr = $smarty->getTemplateVars('draft_list');
$id = $subject = null;
if ($arr) {
diff --git a/fp-includes/core/core.language.php b/fp-includes/core/core.language.php
index e7ca490..b44fb9d 100644
--- a/fp-includes/core/core.language.php
+++ b/fp-includes/core/core.language.php
@@ -1,126 +1,110 @@
my, file, name
- $old_lang =& $GLOBALS['lang'];
-
- if (!$old_lang)
- $old_lang = array();
-
- if ($postfix) {
-
- if (strpos($postfix, 'plugin:')===0) {
- $pluginpath = substr($postfix, 7);
- }
-
- $file = "lang.$postfix.php";
-
- } else {
-
- $postfix='default';
- $file = "lang.default.php";
-
+ $pluginpath = '';
+
+ // checks if we already loaded this lang file
+ $old_lang = &$GLOBALS ['lang'];
+
+ if (!$old_lang)
+ $old_lang = array();
+
+ if ($postfix) {
+
+ if (strpos($postfix, 'plugin:') === 0) {
+ $pluginpath = substr($postfix, 7);
}
-
- $fpath=LANG_DIR."{$fp_config['locale']['lang']}/$file";
- $fallback=LANG_DIR.LANG_DEFAULT."/$file";
-
-
- $path = '';
- $plugin=$pluginpath;
-
-
- if ($pluginpath) {
- if (($n = strpos($pluginpath, '/'))!==false) {
- $plugin = substr($plugin, 0, $n-1);
- $path = substr($plugin, $n+1);
- $path = str_replace('/', '.', $path);
- }
-
- $dir = plugin_getdir($plugin);
-
- $fpath = $dir . "lang/lang.{$fp_config['locale']['lang']}{$path}.php";
- $fallback = $dir . "lang/lang.".LANG_DEFAULT."{$path}.php";
-
- }
-
- if (!file_exists($fpath)) {
- /* if file does not exist, we fall back on English */
- if (!file_exists($fallback)) {
- trigger_error("No suitable language file was found $postfix", E_USER_WARNING);
- return;
- }
-
- $fpath = $fallback;
-
- }
- /* load $lang from file */
-
- /*
- * utf encoded files may output whitespaces known as BOM, we must
- * capture this chars
- */
-
- ob_start();
-
- include_once ($fpath);
-
-
- if (!isset($lang)){
- return $GLOBALS['lang'];
+ $file = "lang.$postfix.php";
+ } else {
+
+ $postfix = 'default';
+ $file = "lang.default.php";
+ }
+
+ $fpath = LANG_DIR . "{$fp_config['locale']['lang']}/$file";
+ $fallback = LANG_DIR . LANG_DEFAULT . "/$file";
+
+ $path = '';
+ $plugin = $pluginpath;
+
+ if ($pluginpath) {
+ if (($n = strpos($pluginpath, '/')) !== false) {
+ $plugin = substr($plugin, 0, $n - 1);
+ $path = substr($plugin, $n + 1);
+ $path = str_replace('/', '.', $path);
}
-
-
- ob_end_clean();
-
-
- $GLOBALS['lang'] = array_merge_recursive($lang, $old_lang);
-
- return $GLOBALS['lang'];
-
- }
-
- function lang_getconf($id) {
- global $lang;
- $fpath=LANG_DIR."$id/lang.conf.php";
- if (file_exists($fpath)) {
- include ($fpath);
- return $langconf;
- } else
- trigger_error("Error loading config for language \"$file\"", E_USER_WARNING);
+ $dir = plugin_getdir($plugin);
+
+ $fpath = $dir . "lang/lang.{$fp_config['locale']['lang']}{$path}.php";
+ $fallback = $dir . "lang/lang." . LANG_DEFAULT . "{$path}.php";
}
-
-
- class lang_indexer extends fs_filelister {
-
- var $_directory=LANG_DIR;
-
- function _checkFile($directory, $file) {
-
- if (is_dir("$directory/$file")) {
- if (!preg_match('![a-z]{2}-[a-z]{2}!', $file)) return 0;
- $this->_list[$file] = lang_getconf($file);
- }
-
- return 0;
-
+ if (!file_exists($fpath)) {
+ /* if file does not exist, we fall back on English */
+ if (!file_exists($fallback)) {
+ trigger_error("No suitable language file was found $postfix", E_USER_WARNING);
+ return;
}
-
+
+ $fpath = $fallback;
}
-
- function lang_list() {
- $obj = new lang_indexer();
- return $obj->getList();
+
+ /* load $lang from file */
+
+ /*
+ * utf encoded files may output whitespaces known as BOM, we must
+ * capture this chars
+ */
+
+ ob_start();
+
+ include_once ($fpath);
+
+ if (!isset($lang)) {
+ return $GLOBALS ['lang'];
}
-
-
+
+ ob_end_clean();
+
+ $GLOBALS ['lang'] = array_merge_recursive($lang, $old_lang);
+
+ return $GLOBALS ['lang'];
+}
+
+function lang_getconf($id) {
+ global $lang;
+
+ $fpath = LANG_DIR . "$id/lang.conf.php";
+ if (file_exists($fpath)) {
+ include ($fpath);
+ return $langconf;
+ } else
+ trigger_error("Error loading config for language \"$file\"", E_USER_WARNING);
+}
+
+class lang_indexer extends fs_filelister {
+
+ var $_directory = LANG_DIR;
+
+ function _checkFile($directory, $file) {
+ if (is_dir("$directory/$file")) {
+ if (!preg_match('![a-z]{2}-[a-z]{2}!', $file))
+ return 0;
+ $this->_list [$file] = lang_getconf($file);
+ }
+
+ return 0;
+ }
+
+}
+
+function lang_list() {
+ $obj = new lang_indexer();
+ return $obj->getList();
+}
+
?>