From 7e8ddb88b82cf18a546c8038d07e1669a5fd3f0e Mon Sep 17 00:00:00 2001 From: azett Date: Sat, 13 Feb 2021 13:03:09 +0100 Subject: [PATCH 01/20] Fixed more template errors in order to get everything running with PHP 8.0. Also: Fixed some tiny PHP errors. Thanks for reporting, Matthias! --- admin/panels/maintain/admin.maintain.php | 50 ++-- .../maintain/admin.maintain.updates.tpl | 6 +- fp-includes/core/core.layout.php | 257 +++++++++--------- fp-interface/sharedtpls/comment-atom.tpl | 2 +- fp-interface/sharedtpls/comment-rss.tpl | 2 +- fp-plugins/prettyurls/plugin.prettyurls.php | 4 +- 6 files changed, 163 insertions(+), 158 deletions(-) diff --git a/admin/panels/maintain/admin.maintain.php b/admin/panels/maintain/admin.maintain.php index 5b0511f..19c58dd 100755 --- a/admin/panels/maintain/admin.maintain.php +++ b/admin/panels/maintain/admin.maintain.php @@ -17,7 +17,7 @@ class tpl_deleter extends fs_filelister { function __construct() { - + // $this->smarty = $GLOBALS['_FP_SMARTY']; $this->_directory = CACHE_DIR; parent::__construct(); @@ -31,7 +31,7 @@ class tpl_deleter extends fs_filelister { // trigger_error($file, E_USER_NOTICE); return 0; } - + } class s_entry_crawler extends fs_filelister { @@ -48,18 +48,18 @@ class s_entry_crawler extends fs_filelister { if (is_dir($f) && ctype_digit($file)) { return 1; } - + if (fnmatch('entry*' . EXT, $file)) { $id = basename($file, EXT); $arr = entry_parse($id, true); - + echo "[POST] $id => {$arr['subject']}\n"; $this->index->add($id, $arr); - + return 0; } } - + } /** @@ -73,7 +73,7 @@ class admin_maintain extends AdminPanel { 'default' => false, 'updates' => false ); - + } class admin_maintain_updates extends AdminPanelAction { @@ -93,9 +93,9 @@ class admin_maintain_updates extends AdminPanelAction { 'stable' => 'unknown', 'unstable' => 'unknown' ); - + $file = utils_geturl($this->web); - + if ($file) { $ver = utils_kexplode($file ['content']); if (!isset($ver ['stable'])) { @@ -108,13 +108,15 @@ class admin_maintain_updates extends AdminPanelAction { } else { $success = -1; } - - $this->smarty->assign('updates', $ver); + + $this->smarty->assign('stableversion', $ver ['stable']); + $this->smarty->assign('unstableversion', $ver ['unstable']); + $this->smarty->assign('notice', $ver ['notice']); $this->smarty->assign('fpweb', $this->fpweb); $this->smarty->assign('sfweb', $this->sfweb); $this->smarty->assign('success', $success); } - + } class admin_maintain_default extends AdminPanelAction { @@ -127,27 +129,27 @@ class admin_maintain_default extends AdminPanelAction { switch ($do) { case 'rebuild': { - + if (substr(INDEX_DIR, -1) == '/') $oldidx = substr(INDEX_DIR, 0, -1); - + $movedir = $oldidx . time(); - + header('Content-Type: text/plain'); echo "ENTERING LOWRES MODE\n\n"; - + if (file_exists(INDEX_DIR)) { - + echo "BACKUP INDEX to $movedir\n"; $ret = @rename($oldidx, $movedir); if (!$ret) trigger_error('Cannot backup old index. STOP.', E_USER_ERROR); } fs_mkdir(INDEX_DIR); - + new s_entry_crawler(); exit("\nDONE \nPlease, select the back arrow in your browser"); - + return PANEL_NOREDIRECT; } case 'restorechmods': @@ -167,10 +169,10 @@ class admin_maintain_default extends AdminPanelAction { $this->smarty->compile_check = true; $this->smarty->force_compile = true; $this->smarty->assign('success', 1); - + if (!file_exists(CACHE_DIR)) fs_mkdir(CACHE_DIR); - + return PANEL_NOREDIRECT; } case 'phpinfo': @@ -179,17 +181,17 @@ class admin_maintain_default extends AdminPanelAction { phpinfo(); $info = ob_get_contents(); ob_end_clean(); - + $this->smarty->assign('phpinfo', preg_replace('%^.*(.*).*$%ms', '$1', $info)); } - + return PANEL_NOREDIRECT; } } function main() { } - + } ?> diff --git a/admin/panels/maintain/admin.maintain.updates.tpl b/admin/panels/maintain/admin.maintain.updates.tpl index 2c7a64c..312889b 100644 --- a/admin/panels/maintain/admin.maintain.updates.tpl +++ b/admin/panels/maintain/admin.maintain.updates.tpl @@ -1,7 +1,7 @@

{$panelstrings.head}

{include file=shared:errorlist.tpl} -{$panelstrings.list|sprintf:$smarty.const.SYSTEM_VER:$sfweb:$updates.stable:$fpweb:$updates.unstable} -{if $updates.notice} +{$panelstrings.list|sprintf:$smarty.const.SYSTEM_VER:$sfweb:$stableversion:$fpweb:$unstableversion} +{if $notice}
{$panelstrings.notice}
-

{$updates.notice}

+

{$notice}

{/if} \ No newline at end of file diff --git a/fp-includes/core/core.layout.php b/fp-includes/core/core.layout.php index d1397fc..7498956 100644 --- a/fp-includes/core/core.layout.php +++ b/fp-includes/core/core.layout.php @@ -1,137 +1,140 @@ pagecontent = $content; - $this->pagecontent = $content; - - $this->fpdb =& new FPDB; - $GLOBALS['fpdb'] =& $this->fpdb; + $this->fpdb =& new FPDB(); + $GLOBALS ['fpdb'] = & $this->fpdb; - $this->fp_widgets =& new widget_indexer; - $GLOBALS['fp_widgets'] =& $this->fp_widgets; - - $this->smarty =& $GLOBALS['_FP_SMARTY']; - - $GLOBALS['fp_config'] =& $this->config; - $this->config = $GLOBALS['fp_config']['general']; - - - $this->theme = theme_loadsettings(); - $GLOBALS['theme'] =& $this->theme; - - $this->lang = lang_load(); - $GLOBALS['lang'] =& $this->lang; - - // user_loggedin() or sess_setup(); - - plugin_loadall(); - - // init smarty - - $this->smarty->compile_dir = CACHE_DIR; - $this->smarty->cache_dir = SMARTY_DIR . 'cache/'; - $this->smarty->caching = 0; - - - - do_action('init'); + $this->fp_widgets =& new widget_indexer(); + $GLOBALS ['fp_widgets'] = & $this->fp_widgets; - } - - - function display() { - $this->main(); - theme_init($this->smarty, $this); - $this->smarty->display($this->tpl); - - unset($this->smarty); - - do_action('shutdown'); - - } - /* - - function post_message($module, $ring, $message) { - $this->message_queue[$module][$ring][]=$message; - - } - - function flush_messages($module, $ring=-1) { - - $msg_arr=array(); - if ($ring<0) - $ring_arr = - array_keys($this->message_queue[$module]); - else - $ring_arr = array($ring); - - foreach($ring_arr as $this_ring) { - $localq=& $this->message_queue[$module][$this_ring]; - foreach ($localq as $msg) { - $msg_arr[]=$msg; - } - } - - $this->smarty->append('err', $msg_arr); - return $msg_arr; - } - */ - - } - - class Abstract_LayoutIndex extends LayoutDefault { - - var $tpl = 'index.tpl'; - - } - - class Abstract_LayoutComment extends LayoutDefault { - - var $tpl = 'comments.tpl'; - - } - - class Abstract_LayoutDialog extends LayoutDefault { - - var $tpl = 'default.tpl'; - - function page($subject, $content, $rawcontent=false) { - $this->pagecontent = array( - 'subject'=>$subject, - 'content'=>$content - ); - - if ($rawcontent) $this->smarty->assign('rawcontent', true); - - } - - function pagecontent($params, $content, &$smarty, &$repeat) { - if ($this->pagecontent) { - $this->smarty->assign($this->pagecontent); - return $content; - } else return; - - } - - function display() { - $this->smarty->register_block('page', array(&$this, 'pagecontent')); - parent::display(); - } - - + $this->smarty = & $GLOBALS ['_FP_SMARTY']; + + $GLOBALS ['fp_config'] = & $this->config; + $this->config = $GLOBALS ['fp_config'] ['general']; + + $this->theme = theme_loadsettings(); + $GLOBALS ['theme'] = & $this->theme; + + $this->lang = lang_load(); + $GLOBALS ['lang'] = & $this->lang; + + // user_loggedin() or sess_setup(); + + plugin_loadall(); + + // init smarty + + $this->smarty->compile_dir = CACHE_DIR; + $this->smarty->cache_dir = SMARTY_DIR . 'cache/'; + $this->smarty->caching = 0; + + do_action('init'); } + function display() { + $this->main(); + theme_init($this->smarty, $this); + $this->smarty->display($this->tpl); + + unset($this->smarty); + + do_action('shutdown'); + } + + /* + * + * function post_message($module, $ring, $message) { + * $this->message_queue[$module][$ring][]=$message; + * + * } + * + * function flush_messages($module, $ring=-1) { + * + * $msg_arr=array(); + * if ($ring<0) + * $ring_arr = + * array_keys($this->message_queue[$module]); + * else + * $ring_arr = array($ring); + * + * foreach($ring_arr as $this_ring) { + * $localq=& $this->message_queue[$module][$this_ring]; + * foreach ($localq as $msg) { + * $msg_arr[]=$msg; + * } + * } + * + * $this->smarty->append('err', $msg_arr); + * return $msg_arr; + * } + */ +} + +class Abstract_LayoutIndex extends LayoutDefault { + + var $tpl = 'index.tpl'; + +} + +class Abstract_LayoutComment extends LayoutDefault { + + var $tpl = 'comments.tpl'; + +} + +class Abstract_LayoutDialog extends LayoutDefault { + + var $tpl = 'default.tpl'; + + function page($subject, $content, $rawcontent = false) { + $this->pagecontent = array( + 'subject' => $subject, + 'content' => $content + ); + + if ($rawcontent) { + $this->smarty->assign('rawcontent', true); + } else { + $this->smarty->assign('rawcontent', false); + } + } + + function pagecontent($params, $content, &$smarty, &$repeat) { + if ($this->pagecontent) { + $this->smarty->assign($this->pagecontent); + return $content; + } else + return; + } + + function display() { + $this->smarty->register_block('page', array( + &$this, + 'pagecontent' + )); + parent::display(); + } + +} ?> diff --git a/fp-interface/sharedtpls/comment-atom.tpl b/fp-interface/sharedtpls/comment-atom.tpl index 1d8a17b..15d8d50 100644 --- a/fp-interface/sharedtpls/comment-atom.tpl +++ b/fp-interface/sharedtpls/comment-atom.tpl @@ -5,7 +5,7 @@ {$flatpress.subtitle} - + FlatPress {$flatpress.author} {$smarty.now|date_format:'%Y'} diff --git a/fp-interface/sharedtpls/comment-rss.tpl b/fp-interface/sharedtpls/comment-rss.tpl index d69f214..e95ab8c 100644 --- a/fp-interface/sharedtpls/comment-rss.tpl +++ b/fp-interface/sharedtpls/comment-rss.tpl @@ -8,7 +8,7 @@ {$flatpress.title} » {$subject} {$the_comment_link} - Copyright {$smarty.now|date_format:"$Y"}, {$flatpress.author} + Copyright {'Y'|date}, {$flatpress.author} {*{$flatpress.email} ({$flatpress.author})*} {$fp_config.locale.lang} diff --git a/fp-plugins/prettyurls/plugin.prettyurls.php b/fp-plugins/prettyurls/plugin.prettyurls.php index 8e33283..8a3f72f 100644 --- a/fp-plugins/prettyurls/plugin.prettyurls.php +++ b/fp-plugins/prettyurls/plugin.prettyurls.php @@ -71,7 +71,7 @@ class Plugin_PrettyURLs { function permalink($str, $id) { global $fpdb, $post; - if (PRETTYURLS_TITLES) + if (isset($post) && PRETTYURLS_TITLES) $title = sanitize_title($post ['subject']); else $title = $id; @@ -499,7 +499,7 @@ class Plugin_PrettyURLs { if (isset($this->fp_params ['paged']) && $this->fp_params ['paged'] > 1) $page = $this->fp_params ['paged']; - $page += $v; + $page += ($v . ''); if ($page > 0) { $l .= 'page/' . $page . '/'; From 27c3e825b35de07d767a87d85b78af26a37654de Mon Sep 17 00:00:00 2001 From: azett Date: Sat, 13 Feb 2021 13:47:18 +0100 Subject: [PATCH 02/20] Fixed Heredoc strings. Turns out, Heredoc syntax - https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.heredoc - only works with closing tags being the first characters of a line. Eclipse's reformatting and indention of the code does not seem to know that^^ Fix: Changed Heredoc strings to "normal" strings. --- admin/panels/plugin/admin.plugin.php | 253 +++++++-------- fp-includes/core/core.utils.php | 5 +- fp-interface/lang/cs-cz/lang.comments.php | 6 +- fp-interface/lang/de-de/lang.comments.php | 6 +- fp-interface/lang/el-gr/lang.comments.php | 6 +- fp-interface/lang/en-us/lang.comments.php | 6 +- fp-interface/lang/es-es/lang.comments.php | 6 +- fp-interface/lang/fr-fr/lang.comments.php | 6 +- fp-interface/lang/it-it/lang.comments.php | 6 +- fp-interface/lang/ja-jp/lang.comments.php | 6 +- fp-interface/lang/pt-br/lang.comments.php | 8 +- .../plugin.accessibleantispam.php | 8 +- fp-plugins/adminarea/plugin.adminarea.php | 14 +- fp-plugins/commentcenter/lang/lang.en-us.php | 295 +++++++++--------- fp-plugins/commentcenter/lang/lang.it-it.php | 295 +++++++++--------- fp-plugins/jquery/plugin.jquery.php | 8 +- fp-plugins/lightbox2/plugin.lightbox2.php | 13 +- fp-plugins/prettyurls/plugin.prettyurls.php | 6 +- setup/lang/lang.en-us.php | 19 +- setup/lang/lang.it-it.php | 13 +- setup/lang/lang.ja-jp.php | 117 +++---- setup/lang/lang.pt-br.php | 34 +- 22 files changed, 526 insertions(+), 610 deletions(-) diff --git a/admin/panels/plugin/admin.plugin.php b/admin/panels/plugin/admin.plugin.php index b30932d..49e32ee 100644 --- a/admin/panels/plugin/admin.plugin.php +++ b/admin/panels/plugin/admin.plugin.php @@ -3,145 +3,128 @@ /** * plugin control panel * - * Type: - * Name: - * Date: - * Purpose: + * Type: + * Name: + * Date: + * Purpose: * Input: - * - * @author NoWhereMan * + * @author NoWhereMan + * */ /* - function admin_plugin_adminheader() { - $f = ADMIN_DIR . '/panels/plugin/admin.plugin.js'; - echo << -SCP; - - } - add_action('wp_head', 'admin_plugin_adminheader'); -*/ - - class admin_plugin extends AdminPanel { - var $panelname = 'plugin'; - var $actions = array('default'=>true); - } - - - class admin_plugin_default extends AdminPanelAction { - - - var $commands = array('enable', 'disable'); - var $errors = array(); - - function setup() { - - $this->pluginid = isset($_GET['plugin'])? $_GET['plugin'] : null; - - $pi = new plugin_indexer; - $plist = $pi->getList(); - sort($plist); - $this->smarty->assign('pluginlist', $plist); - $this->errors = @$pi->getEnableds(true); - $this->fp_plugins = $pi->enabledlist; - - - - } - - function dodisable($id) { - - $fp_plugins = $this->fp_plugins; - - - $success = -1; - - if (plugin_exists($id)) { - - $success = 1; - - if (false !== $i = array_search($id, $fp_plugins)) { - unset($fp_plugins[$i]); - sort($fp_plugins); /* compact indices */ - do_action('deactivate_'.$id); - $success = system_save(CONFIG_DIR . 'plugins.conf.php', compact('fp_plugins')); - } else { - $success = -1; - } - - } - - if ($success) - $this->smarty->assign('success', $success); - - return PANEL_REDIRECT_CURRENT; - - } - - function doenable ($id) { - $success = -1; - $fp_plugins = $this->fp_plugins; - - - if (plugin_exists($id)) { - - $success = 1; - - if (!in_array($id, $fp_plugins)) { - $fp_plugins[] = $id; - sort($fp_plugins); - plugin_load($id, false, false); - do_action('activate_'.$id); - $success = system_save(CONFIG_DIR . 'plugins.conf.php', compact('fp_plugins')); - } else { - $success = -1; - } - } - - if ($success) - $this->smarty->assign('success', $success); - - return PANEL_REDIRECT_CURRENT; - - } - + * function admin_plugin_adminheader() { + * $f = ADMIN_DIR . '/panels/plugin/admin.plugin.js'; + * echo ' + * '; + * + * } + * add_action('wp_head', 'admin_plugin_adminheader'); + */ +class admin_plugin extends AdminPanel { - - - function main() { - - - //$conf = io_load_file(CONFIG_DIR . 'plugins.conf.php'); - - - $this->smarty->assign('warnings', $this->errors); - $this->smarty->assign('enabledlist', $this->fp_plugins); - - - lang_load('admin.plugin'); - - return 0; - - - } - - - function onsave() { - - $fp_plugins = array_keys($_POST['plugin_enabled']); - $success = system_save(CONFIG_DIR . 'plugins.conf.php', compact('fp_plugins')); - - $retval = ( $success )? 1 : -1 ; - - $this->smarty->assign('success', $retval); - //$this->smarty->assign('pluginconf', $str); - - return $retval; - - } - + var $panelname = 'plugin'; + + var $actions = array( + 'default' => true + ); + +} + +class admin_plugin_default extends AdminPanelAction { + + var $commands = array( + 'enable', + 'disable' + ); + + var $errors = array(); + + function setup() { + $this->pluginid = isset($_GET ['plugin']) ? $_GET ['plugin'] : null; + + $pi = new plugin_indexer(); + $plist = $pi->getList(); + sort($plist); + $this->smarty->assign('pluginlist', $plist); + $this->errors = @$pi->getEnableds(true); + $this->fp_plugins = $pi->enabledlist; } - - ?> + + function dodisable($id) { + $fp_plugins = $this->fp_plugins; + + $success = -1; + + if (plugin_exists($id)) { + + $success = 1; + + if (false !== $i = array_search($id, $fp_plugins)) { + unset($fp_plugins [$i]); + sort($fp_plugins); /* compact indices */ + do_action('deactivate_' . $id); + $success = system_save(CONFIG_DIR . 'plugins.conf.php', compact('fp_plugins')); + } else { + $success = -1; + } + } + + if ($success) + $this->smarty->assign('success', $success); + + return PANEL_REDIRECT_CURRENT; + } + + function doenable($id) { + $success = -1; + $fp_plugins = $this->fp_plugins; + + if (plugin_exists($id)) { + + $success = 1; + + if (!in_array($id, $fp_plugins)) { + $fp_plugins [] = $id; + sort($fp_plugins); + plugin_load($id, false, false); + do_action('activate_' . $id); + $success = system_save(CONFIG_DIR . 'plugins.conf.php', compact('fp_plugins')); + } else { + $success = -1; + } + } + + if ($success) + $this->smarty->assign('success', $success); + + return PANEL_REDIRECT_CURRENT; + } + + function main() { + + // $conf = io_load_file(CONFIG_DIR . 'plugins.conf.php'); + $this->smarty->assign('warnings', $this->errors); + $this->smarty->assign('enabledlist', $this->fp_plugins); + + lang_load('admin.plugin'); + + return 0; + } + + function onsave() { + $fp_plugins = array_keys($_POST ['plugin_enabled']); + $success = system_save(CONFIG_DIR . 'plugins.conf.php', compact('fp_plugins')); + + $retval = ($success) ? 1 : -1; + + $this->smarty->assign('success', $retval); + // $this->smarty->assign('pluginconf', $str); + + return $retval; + } + +} + +?> diff --git a/fp-includes/core/core.utils.php b/fp-includes/core/core.utils.php index da68bb4..6338cb3 100644 --- a/fp-includes/core/core.utils.php +++ b/fp-includes/core/core.utils.php @@ -409,10 +409,7 @@ function utils_geturl($url) { function utils_checksmarty() { if (!file_exists(SMARTY_DIR . 'Smarty.class.php')) { - $err = <<http://smarty.php.net; you will - probably need SmartyValidate as well; unpack them to fp-includes/core/smarty: please do not overwrite files in fp-includes/core/smarty/plugins/ -ERR; + $err = 'Fatal error: Smarty is not installed; please download it from http://smarty.php.net; you will probably need SmartyValidate as well; unpack them to fp-includes/core/smarty: please do not overwrite files in fp-includes/core/smarty/plugins/'; trigger_error($err, E_USER_ERROR); } } diff --git a/fp-interface/lang/cs-cz/lang.comments.php b/fp-interface/lang/cs-cz/lang.comments.php index a060d9d..de050a7 100644 --- a/fp-interface/lang/cs-cz/lang.comments.php +++ b/fp-interface/lang/cs-cz/lang.comments.php @@ -1,7 +1,5 @@ diff --git a/fp-interface/lang/de-de/lang.comments.php b/fp-interface/lang/de-de/lang.comments.php index e5559b6..45210e7 100644 --- a/fp-interface/lang/de-de/lang.comments.php +++ b/fp-interface/lang/de-de/lang.comments.php @@ -1,7 +1,5 @@ diff --git a/fp-interface/lang/el-gr/lang.comments.php b/fp-interface/lang/el-gr/lang.comments.php index 507b64c..b6b4068 100644 --- a/fp-interface/lang/el-gr/lang.comments.php +++ b/fp-interface/lang/el-gr/lang.comments.php @@ -1,7 +1,5 @@ diff --git a/fp-interface/lang/en-us/lang.comments.php b/fp-interface/lang/en-us/lang.comments.php index 4d0a09e..b8785ed 100644 --- a/fp-interface/lang/en-us/lang.comments.php +++ b/fp-interface/lang/en-us/lang.comments.php @@ -1,7 +1,5 @@ diff --git a/fp-interface/lang/es-es/lang.comments.php b/fp-interface/lang/es-es/lang.comments.php index bf38309..e834818 100644 --- a/fp-interface/lang/es-es/lang.comments.php +++ b/fp-interface/lang/es-es/lang.comments.php @@ -1,7 +1,5 @@ diff --git a/fp-interface/lang/fr-fr/lang.comments.php b/fp-interface/lang/fr-fr/lang.comments.php index 5daa89f..dfe8e0f 100644 --- a/fp-interface/lang/fr-fr/lang.comments.php +++ b/fp-interface/lang/fr-fr/lang.comments.php @@ -1,7 +1,5 @@  diff --git a/fp-interface/lang/it-it/lang.comments.php b/fp-interface/lang/it-it/lang.comments.php index e3b8d81..0221fbb 100644 --- a/fp-interface/lang/it-it/lang.comments.php +++ b/fp-interface/lang/it-it/lang.comments.php @@ -1,7 +1,5 @@ diff --git a/fp-interface/lang/ja-jp/lang.comments.php b/fp-interface/lang/ja-jp/lang.comments.php index c83b4cd..4712e26 100644 --- a/fp-interface/lang/ja-jp/lang.comments.php +++ b/fp-interface/lang/ja-jp/lang.comments.php @@ -1,7 +1,5 @@ diff --git a/fp-interface/lang/pt-br/lang.comments.php b/fp-interface/lang/pt-br/lang.comments.php index 0368e2a..51a8ba1 100644 --- a/fp-interface/lang/pt-br/lang.comments.php +++ b/fp-interface/lang/pt-br/lang.comments.php @@ -1,8 +1,6 @@ diff --git a/fp-plugins/accessibleantispam/plugin.accessibleantispam.php b/fp-plugins/accessibleantispam/plugin.accessibleantispam.php index 86fc524..3f5ea0a 100755 --- a/fp-plugins/accessibleantispam/plugin.accessibleantispam.php +++ b/fp-plugins/accessibleantispam/plugin.accessibleantispam.php @@ -129,10 +129,8 @@ function plugin_aaspam_comment_form() { } // echoes the question and the form part - echo <<
-

- STR; + echo '


+

'; } -?> +?> \ No newline at end of file diff --git a/fp-plugins/adminarea/plugin.adminarea.php b/fp-plugins/adminarea/plugin.adminarea.php index f446f9e..626fa21 100644 --- a/fp-plugins/adminarea/plugin.adminarea.php +++ b/fp-plugins/adminarea/plugin.adminarea.php @@ -17,14 +17,12 @@ function plugin_adminarea_widget() { if ($user = user_loggedin()) { $userid = $user ['userid']; - $string = <<{$lang['plugin']['adminarea']['welcome']} {$userid}!

+ $string = '

{$lang[\'plugin\'][\'adminarea\'][\'welcome\']} {$userid}!

- END; +
  • {$lang[\'plugin\'][\'adminarea\'][\'admin_panel\']}
    • +
  • {$lang[\'plugin\'][\'adminarea\'][\'add_entry\']}
    • +
  • {$lang[\'plugin\'][\'adminarea\'][\'logout\']}
    • + '; } else $string = ''; @@ -36,4 +34,4 @@ function plugin_adminarea_widget() { register_widget('adminarea', 'AdminArea', 'plugin_adminarea_widget'); -?> +?> \ No newline at end of file diff --git a/fp-plugins/commentcenter/lang/lang.en-us.php b/fp-plugins/commentcenter/lang/lang.en-us.php index 820bb56..6a1d817 100644 --- a/fp-plugins/commentcenter/lang/lang.en-us.php +++ b/fp-plugins/commentcenter/lang/lang.en-us.php @@ -1,177 +1,172 @@ 'Comment Center', + 'desc1' => 'This panel allows you to manage the comments on your blog.', + 'desc2' => 'Here you can do several things:', -$lang['admin']['entry']['submenu']['commentcenter']='Comment Center'; -$lang['admin']['entry']['commentcenter']=array( - # Header of the panel - 'title'=>'Comment Center', - 'desc1'=>'This panel allows you to manage the comments on your blog.', - 'desc2'=>'Here you can do several things:', + // Links + 'lpolicies' => 'Manage the policies', + 'lapprove' => 'Show blocked comments', + 'lmanage' => 'Manage comments', + 'lconfig' => 'Configure the plugin', - # Links - 'lpolicies'=>'Manage the policies', - 'lapprove'=>'Show blocked comments', - 'lmanage'=>'Manage comments', - 'lconfig'=>'Configure the plugin', + // Policies + 'policies' => 'Policies', + 'desc_pol' => 'Here you can edit the policies of comments.', + 'select' => 'Select', + 'criteria' => 'Criteria', + 'behavoir' => 'Behavoir', + 'options' => 'Options', + 'entry' => 'Entry', + 'entries' => 'Entries', + 'categories' => 'Categories', + 'nopolicies' => 'There isn\'t any policy.', + 'all_entries' => 'All Entries', + 'fol_entries' => 'The policy is applied to the following entries:', + 'fol_cats' => 'The policy is applied to entries in the following categories:', + 'older' => 'The policy is applied to entries older than %d day(s).', + 'allow' => 'Allow to comment', + 'block' => 'Block comments', + 'approvation' => 'Comments need to be approved', + 'up' => 'Move up', + 'down' => 'Move down', + 'edit' => 'Edit', + 'delete' => 'Delete', + 'newpol' => 'Add a new policy', + 'del_selected' => 'Delete selected policy(ies)', + 'select_all' => 'Select All', + 'deselect_all' => 'Deselect All', - # Policies - 'policies'=>'Policies', - 'desc_pol'=>'Here you can edit the policies of comments.', - 'select'=>'Select', - 'criteria'=>'Criteria', - 'behavoir'=>'Behavoir', - 'options'=>'Options', - 'entry'=>'Entry', - 'entries'=>'Entries', - 'categories'=>'Categories', - 'nopolicies'=>'There isn\'t any policy.', - 'all_entries'=>'All Entries', - 'fol_entries'=>'The policy is applied to the following entries:', - 'fol_cats'=>'The policy is applied to entries in the following categories:', - 'older'=>'The policy is applied to entries older than %d day(s).', - 'allow'=>'Allow to comment', - 'block'=>'Block comments', - 'approvation'=>'Comments need to be approved', - 'up'=>'Move up', - 'down'=>'Move down', - 'edit'=>'Edit', - 'delete'=>'Delete', - 'newpol'=>'Add a new policy', - 'del_selected'=>'Delete selected policy(ies)', - 'select_all'=>'Select All', - 'deselect_all'=>'Deselect All', + // Configuration page + 'configure' => 'Configure the plugin', + 'desc_conf' => 'Here you can modify the options of the plugin.', + 'log_all' => 'Log blocked comments', + 'log_all_long' => 'Check it if you want to log also comments that are blocked.', + 'email_alert' => 'Notify comments via email', + 'email_alert_long' => 'Check it if you want that when there is a comment to approve you want to be ' . 'informed via email.', + 'akismet' => 'Akismet', + 'akismet_use' => 'Enable Akismet check', + 'akismet_key' => 'Akismet Key', + 'akismet_key_long' => 'The Akismet service provide you a key to use it. Insert here.', + 'akismet_url' => 'Blog base URL for Akismet', + 'akismet_url_long' => 'I think for Akismet free service you should use just a domain. ' . 'You can leave blank this field, %s will be used.', + 'save_conf' => 'Save Configuration', - # Configuration page - 'configure'=>'Configure the plugin', - 'desc_conf'=>'Here you can modify the options of the plugin.', - 'log_all'=>'Log blocked comments', - 'log_all_long'=>'Check it if you want to log also comments that are blocked.', - 'email_alert'=>'Notify comments via email', - 'email_alert_long'=>'Check it if you want that when there is a comment to approve you want to be '. - 'informed via email.', - 'akismet'=>'Akismet', - 'akismet_use'=>'Enable Akismet check', - 'akismet_key'=>'Akismet Key', - 'akismet_key_long'=>'The Akismet service provide you a key to use it. Insert here.', - 'akismet_url'=>'Blog base URL for Akismet', - 'akismet_url_long'=>'I think for Akismet free service you should use just a domain. '. - 'You can leave blank this field, %s will be used.', - 'save_conf'=>'Save Configuration', + // Edit policy page + 'apply_to' => 'Apply to', + 'editpol' => 'Edit a policy', + 'createpol' => 'Create a policy', + 'some_entries' => 'Some Entries', + 'properties' => 'Entry with certain properties', + 'se_desc' => 'If you selected the %s option, please insert entries you want to apply to this policy.', + 'se_fill' => 'Please fill the fields with the id of the entries (entryYYMMDD-HHMMSS).', + 'po_title' => 'Properties', + 'po_desc' => 'If you selected the %s option, please fill the properties.', + 'po_comp' => 'The fields aren\'t compulsory but you must fill at least one or the policy ' . 'will apply on all entries.', + 'po_time' => 'Time options', + 'po_older' => 'Apply to entries older than ', + 'days' => 'days.', + 'save_policy' => 'Save Policy', - # Edit policy page - 'apply_to'=>'Apply to', - 'editpol'=>'Edit a policy', - 'createpol'=>'Create a policy', - 'some_entries'=>'Some Entries', - 'properties'=>'Entry with certain properties', - 'se_desc'=>'If you selected the %s option, please insert entries you want to apply to this policy.', - 'se_fill'=>'Please fill the fields with the id of the entries (entryYYMMDD-HHMMSS).', - 'po_title'=>'Properties', - 'po_desc'=>'If you selected the %s option, please fill the properties.', - 'po_comp'=>'The fields aren\'t compulsory but you must fill at least one or the policy '. - 'will apply on all entries.', - 'po_time'=>'Time options', - 'po_older'=>'Apply to entries older than ', - 'days'=>'days.', - 'save_policy'=>'Save Policy', + // Delete policies page + 'del_policies' => 'Delete Policies', + 'del_descs' => 'You are going to delete this policy: ', + 'del_descm' => 'You are going to delete these policies: ', + 'sure' => 'Are you sure?', + 'del_subs' => 'Yes, please delete it', + 'del_subm' => 'Yes, please delete them', + 'del_cancel' => 'No, take me back to the panel', - # Delete policies page - 'del_policies'=>'Delete Policies', - 'del_descs'=>'You are going to delete this policy: ', - 'del_descm'=>'You are going to delete these policies: ', - 'sure'=>'Are you sure?', - 'del_subs'=>'Yes, please delete it', - 'del_subm'=>'Yes, please delete them', - 'del_cancel'=>'No, take me back to the panel', + // Approve comments page + 'app_title' => 'Approve comment', + 'app_desc' => 'Here you can approve comments.', + 'app_date' => 'Date', + 'app_content' => 'Comment', + 'app_author' => 'Author', + 'app_email' => 'Email', + 'app_ip' => 'IP', + 'app_actions' => 'Actions', + 'app_publish' => 'Publish', + 'app_delete' => 'Delete', + 'app_nocomms' => 'There isn\'t any comment.', + 'app_pselected' => 'Publish selected comment(s)', + 'app_dselected' => 'Remove selected comment(s)', + 'app_other' => 'Other Comments', + 'app_akismet' => 'Signed as spam', + 'app_spamdesc' => 'These comments were blocked by Akismet.', + 'app_hamsubmit' => 'Submit to Akismet as ham when you publish them.', + 'app_pubnotham' => 'Publish it but dont\'submit as ham', - # Approve comments page - 'app_title'=>'Approve comment', - 'app_desc'=>'Here you can approve comments.', - 'app_date'=>'Date', - 'app_content'=>'Comment', - 'app_author'=>'Author', - 'app_email'=>'Email', - 'app_ip'=>'IP', - 'app_actions'=>'Actions', - 'app_publish'=>'Publish', - 'app_delete'=>'Delete', - 'app_nocomms'=>'There isn\'t any comment.', - 'app_pselected'=>'Publish selected comment(s)', - 'app_dselected'=>'Remove selected comment(s)', - 'app_other'=>'Other Comments', - 'app_akismet'=>'Signed as spam', - 'app_spamdesc'=>'These comments were blocked by Akismet.', - 'app_hamsubmit'=>'Submit to Akismet as ham when you publish them.', - 'app_pubnotham'=>'Publish it but dont\'submit as ham', + // Delete comments page + 'delc_title' => 'Delete Comments', + 'delc_descs' => 'You are going to delete this comment: ', + 'delc_descm' => 'You are going to delete these comments: ', - # Delete comments page - 'delc_title'=>'Delete Comments', - 'delc_descs'=>'You are going to delete this comment: ', - 'delc_descm'=>'You are going to delete these comments: ', + // Manage comments page + 'man_searcht' => 'Search an entry', + 'man_searchd' => 'Insert the id of the entry whose you want to manage comments.', + 'man_search' => 'Search', + 'man_commfor' => 'Comments for %s', + 'man_spam' => 'Submit as spam to Akismet', - # Manage comments page - 'man_searcht'=>'Search an entry', - 'man_searchd'=>'Insert the id of the entry whose you want to manage comments.', - 'man_search'=>'Search', - 'man_commfor'=>'Comments for %s', - 'man_spam'=>'Submit as spam to Akismet', + // The simple edit + 'simple_pre' => 'Comments for this entry will ', + 'simple_1' => 'be allowed.', + 'simple_0' => 'require your approval.', + 'simple_-1' => 'be blocked.', + 'simple_manage' => 'Manage the comments of this entry.', + 'simple_edit' => 'Edit Policies', - # The simple edit - 'simple_pre'=>'Comments for this entry will ', - 'simple_1'=>'be allowed.', - 'simple_0'=>'require your approval.', - 'simple_-1'=>'be blocked.', - 'simple_manage'=>'Manage the comments of this entry.', - 'simple_edit'=>'Edit Policies', - - # Akismet warnings - 'akismet_errors'=>array( - -1=>'The Akismet key is empty. Please insert it.', - -2=>'We couldn\'t call Akismet servers.', - -3=>'The Akismet response failed.', - -4=>'The Akismet key is not valid.', + // Akismet warnings + 'akismet_errors' => array( + -1 => 'The Akismet key is empty. Please insert it.', + -2 => 'We couldn\'t call Akismet servers.', + -3 => 'The Akismet response failed.', + -4 => 'The Akismet key is not valid.' ), - # Messages - 'msgs'=>array( - 1=>'Configuration saved.', - -1=>'An error occurred while trying to save the configuration.', + // Messages + 'msgs' => array( + 1 => 'Configuration saved.', + -1 => 'An error occurred while trying to save the configuration.', - 2=>'Policy saved.', - -2=>'An error occurred while trying to save the policy (maybe your settings are wrong).', + 2 => 'Policy saved.', + -2 => 'An error occurred while trying to save the policy (maybe your settings are wrong).', - 3=>'Policy moved.', - -3=>'An error occurred while trying to move the policy (or it can\'t be moved).', + 3 => 'Policy moved.', + -3 => 'An error occurred while trying to move the policy (or it can\'t be moved).', - 4=>'Policy(ies) removed.', - -4=>'An error occurred while trying to remove the policy(ies) (or you haven\'t selected any policy).', + 4 => 'Policy(ies) removed.', + -4 => 'An error occurred while trying to remove the policy(ies) (or you haven\'t selected any policy).', - 5=>'Comment(s) published.', - -5=>'An error occurred while trying to publish the comment(s).', + 5 => 'Comment(s) published.', + -5 => 'An error occurred while trying to publish the comment(s).', - 6=>'Comment(s) removed.', - -6=>'An error occurred while trying to remove the comment(s) (or you haven\'t selected any comment).', + 6 => 'Comment(s) removed.', + -6 => 'An error occurred while trying to remove the comment(s) (or you haven\'t selected any comment).', - 7=>'Comment submitted.', - -7=>'An error occurred while trying to submit the comment.', + 7 => 'Comment submitted.', + -7 => 'An error occurred while trying to submit the comment.' ), - # Errors - 'errors'=>array( - 'pol_nonex'=>'The policy you want to edit does not exist.', - 'entry_nf'=>'The entry you have selected does not exist.', - ), + // Errors + 'errors' => array( + 'pol_nonex' => 'The policy you want to edit does not exist.', + 'entry_nf' => 'The entry you have selected does not exist.' + ) ); -$lang['plugin']['commentcenter']=array( - 'akismet_error'=>'Sorry, we\'re encountering technical difficulties.', - 'lock'=>'Comments for this entry are blocked, sorry.', - 'approvation'=>'The comments has been saved but the Administrator must approve it before showing it.', +$lang ['plugin'] ['commentcenter'] = array( + 'akismet_error' => 'Sorry, we\'re encountering technical difficulties.', + 'lock' => 'Comments for this entry are blocked, sorry.', + 'approvation' => 'The comments has been saved but the Administrator must approve it before showing it.', - # Mail for comments - 'mail_subj'=>'New comment to approve on %s', + // Mail for comments + 'mail_subj' => 'New comment to approve on %s' ); -$lang['plugin']['commentcenter']['mail_text']=<< 'Centro commenti', + 'desc1' => 'Questo pannello ti consente di gestire i commenti del tuo blog.', + 'desc2' => 'Qui puoi fare numerose cose:', -$lang['admin']['entry']['submenu']['commentcenter']='Centro commenti'; -$lang['admin']['entry']['commentcenter']=array( - # Header of the panel - 'title'=>'Centro commenti', - 'desc1'=>'Questo pannello ti consente di gestire i commenti del tuo blog.', - 'desc2'=>'Qui puoi fare numerose cose:', + // Links + 'lpolicies' => 'Gestire le regole', + 'lapprove' => 'Elencare i commenti bloccati', + 'lmanage' => 'Gestire i commenti', + 'lconfig' => 'Configurare il plugin', - # Links - 'lpolicies'=>'Gestire le regole', - 'lapprove'=>'Elencare i commenti bloccati', - 'lmanage'=>'Gestire i commenti', - 'lconfig'=>'Configurare il plugin', + // Policies + 'policies' => 'Regole', + 'desc_pol' => 'Qui puoi modificare le regole sui commenti.', + 'select' => 'Seleziona', + 'criteria' => 'Criteri', + 'behavoir' => 'Comportamento', + 'options' => 'Opzioni', + 'entry' => 'Articolo', + 'entries' => 'Articoli', + 'categories' => 'Categorie', + 'nopolicies' => 'Non c\'è nessuna regola.', + 'all_entries' => 'Tutti i post', + 'fol_entries' => 'La regola è applicata ai seguenti post:', + 'fol_cats' => 'La regola è applicata ai post nelle seguenti categorie:', + 'older' => 'La regola è applicata ai post più vecchi di %d giorno/i.', + 'allow' => 'Permetti di commentare', + 'block' => 'Blocca i commenti', + 'approvation' => 'I commenti devono essere approvati', + 'up' => 'Sposta in su', + 'down' => 'Sposta in giù', + 'edit' => 'Modifica', + 'delete' => 'Elimina', + 'newpol' => 'Aggiungi una nuova regola', + 'del_selected' => 'Elimina le regole selezionate', + 'select_all' => 'Seleziona tutto', + 'deselect_all' => 'Deseleziona tutto', - # Policies - 'policies'=>'Regole', - 'desc_pol'=>'Qui puoi modificare le regole sui commenti.', - 'select'=>'Seleziona', - 'criteria'=>'Criteri', - 'behavoir'=>'Comportamento', - 'options'=>'Opzioni', - 'entry'=>'Articolo', - 'entries'=>'Articoli', - 'categories'=>'Categorie', - 'nopolicies'=>'Non c\'è nessuna regola.', - 'all_entries'=>'Tutti i post', - 'fol_entries'=>'La regola è applicata ai seguenti post:', - 'fol_cats'=>'La regola è applicata ai post nelle seguenti categorie:', - 'older'=>'La regola è applicata ai post più vecchi di %d giorno/i.', - 'allow'=>'Permetti di commentare', - 'block'=>'Blocca i commenti', - 'approvation'=>'I commenti devono essere approvati', - 'up'=>'Sposta in su', - 'down'=>'Sposta in giù', - 'edit'=>'Modifica', - 'delete'=>'Elimina', - 'newpol'=>'Aggiungi una nuova regola', - 'del_selected'=>'Elimina le regole selezionate', - 'select_all'=>'Seleziona tutto', - 'deselect_all'=>'Deseleziona tutto', + // Configuration page + 'configure' => 'Configura il plugin', + 'desc_conf' => 'Qui puoi modificare le impostazioni del plugin.', + 'log_all' => 'Registra i commenti bloccati', + 'log_all_long' => 'Selezionala se vuoi registrare anche i commenti che sono bloccati.', + 'email_alert' => 'Notifica commenti via email', + 'email_alert_long' => 'Selezionala se vuoi essere informato via email quando c\'è un nuovo commento ' . 'da approvare.', + 'akismet' => 'Akismet', + 'akismet_use' => 'Abilita il controllo di Akismet', + 'akismet_key' => 'Chiave di Akismet', + 'akismet_key_long' => 'Per usare Akismet ti viene fornita una chiave. Inseriscila qui.', + 'akismet_url' => 'Indirizzo di base per Akismet', + 'akismet_url_long' => 'Penso che per il servizio gratuito di Akismet si possa usare un solo indirizzo. ' . 'Puoi anche lasciare vuoto questo campo, al suo posto si utilizzerà %s.', + 'save_conf' => 'Salva configurazione', - # Configuration page - 'configure'=>'Configura il plugin', - 'desc_conf'=>'Qui puoi modificare le impostazioni del plugin.', - 'log_all'=>'Registra i commenti bloccati', - 'log_all_long'=>'Selezionala se vuoi registrare anche i commenti che sono bloccati.', - 'email_alert'=>'Notifica commenti via email', - 'email_alert_long'=>'Selezionala se vuoi essere informato via email quando c\'è un nuovo commento '. - 'da approvare.', - 'akismet'=>'Akismet', - 'akismet_use'=>'Abilita il controllo di Akismet', - 'akismet_key'=>'Chiave di Akismet', - 'akismet_key_long'=>'Per usare Akismet ti viene fornita una chiave. Inseriscila qui.', - 'akismet_url'=>'Indirizzo di base per Akismet', - 'akismet_url_long'=>'Penso che per il servizio gratuito di Akismet si possa usare un solo indirizzo. '. - 'Puoi anche lasciare vuoto questo campo, al suo posto si utilizzerà %s.', - 'save_conf'=>'Salva configurazione', + // Edit policy page + 'apply_to' => 'Applica a', + 'editpol' => 'Modifica una regola', + 'createpol' => 'Crea una regola', + 'some_entries' => 'Alcuni post', + 'properties' => 'Post con precise caratteristiche', + 'se_desc' => 'Se hai selezionato l\'opzione %s, per favore inserisci i post a cui la vuoi applicare.', + 'se_fill' => 'Per favore riempi i campi con gli id dei post (entryYYMMDD-HHMMSS).', + 'po_title' => 'Caratteristiche', + 'po_desc' => 'Se hai selezionato l\'opzione %s, per seleziona le caratteristiche.', + 'po_comp' => 'I campi non sono obbligatori ma ne devi selezionare almeno uno, altrimenti la regola ' . 'sarà applicata a tutti i post.', + 'po_time' => 'Opzioni sulle date', + 'po_older' => 'Applica ai post più vecchi di ', + 'days' => 'giorni.', + 'save_policy' => 'Salva regola', - # Edit policy page - 'apply_to'=>'Applica a', - 'editpol'=>'Modifica una regola', - 'createpol'=>'Crea una regola', - 'some_entries'=>'Alcuni post', - 'properties'=>'Post con precise caratteristiche', - 'se_desc'=>'Se hai selezionato l\'opzione %s, per favore inserisci i post a cui la vuoi applicare.', - 'se_fill'=>'Per favore riempi i campi con gli id dei post (entryYYMMDD-HHMMSS).', - 'po_title'=>'Caratteristiche', - 'po_desc'=>'Se hai selezionato l\'opzione %s, per seleziona le caratteristiche.', - 'po_comp'=>'I campi non sono obbligatori ma ne devi selezionare almeno uno, altrimenti la regola '. - 'sarà applicata a tutti i post.', - 'po_time'=>'Opzioni sulle date', - 'po_older'=>'Applica ai post più vecchi di ', - 'days'=>'giorni.', - 'save_policy'=>'Salva regola', + // Delete policies page + 'del_policies' => 'Elimina regole', + 'del_descs' => 'Stai per eliminare la seguente regola: ', + 'del_descm' => 'Stai per eliminare la seguenti regoli: ', + 'sure' => 'Sei sicuro?', + 'del_subs' => 'Sì, continua l\'eliminazione', + 'del_subm' => 'Sì, continua l\'eliminazione', + 'del_cancel' => 'No, riportami al pannello', - # Delete policies page - 'del_policies'=>'Elimina regole', - 'del_descs'=>'Stai per eliminare la seguente regola: ', - 'del_descm'=>'Stai per eliminare la seguenti regoli: ', - 'sure'=>'Sei sicuro?', - 'del_subs'=>'Sì, continua l\'eliminazione', - 'del_subm'=>'Sì, continua l\'eliminazione', - 'del_cancel'=>'No, riportami al pannello', + // Approve comments page + 'app_title' => 'Approva commenti', + 'app_desc' => 'Qui puoi approvare i commenti.', + 'app_date' => 'Data', + 'app_content' => 'Commento', + 'app_author' => 'Autore', + 'app_email' => 'Email', + 'app_ip' => 'IP', + 'app_actions' => 'Azioni', + 'app_publish' => 'Pubblica', + 'app_delete' => 'Elimina', + 'app_nocomms' => 'Non c\'è nessun commento.', + 'app_pselected' => 'Pubblica i commenti selezionati', + 'app_dselected' => 'Elimina i commenti selezionati', + 'app_other' => 'Alti Commenti', + 'app_akismet' => 'Segnalati come spam', + 'app_spamdesc' => 'Questi commenti sono stati bloccati da Akismet.', + 'app_hamsubmit' => 'Inviali ad Akismet come ham quando li pubblichi.', + 'app_pubnotham' => 'Pubblica senza inviarlo come ham', - # Approve comments page - 'app_title'=>'Approva commenti', - 'app_desc'=>'Qui puoi approvare i commenti.', - 'app_date'=>'Data', - 'app_content'=>'Commento', - 'app_author'=>'Autore', - 'app_email'=>'Email', - 'app_ip'=>'IP', - 'app_actions'=>'Azioni', - 'app_publish'=>'Pubblica', - 'app_delete'=>'Elimina', - 'app_nocomms'=>'Non c\'è nessun commento.', - 'app_pselected'=>'Pubblica i commenti selezionati', - 'app_dselected'=>'Elimina i commenti selezionati', - 'app_other'=>'Alti Commenti', - 'app_akismet'=>'Segnalati come spam', - 'app_spamdesc'=>'Questi commenti sono stati bloccati da Akismet.', - 'app_hamsubmit'=>'Inviali ad Akismet come ham quando li pubblichi.', - 'app_pubnotham'=>'Pubblica senza inviarlo come ham', + // Delete comments page + 'delc_title' => 'Elimina Commenti', + 'delc_descs' => 'Stai per eliminare questo commento: ', + 'delc_descm' => 'Stai per eliminare questi commenti: ', - # Delete comments page - 'delc_title'=>'Elimina Commenti', - 'delc_descs'=>'Stai per eliminare questo commento: ', - 'delc_descm'=>'Stai per eliminare questi commenti: ', + // Manage comments page + 'man_searcht' => 'Cerca un post', + 'man_searchd' => 'Inserisci l\'id del post di cui vuoi gestire i commenti.', + 'man_search' => 'Cerca', + 'man_commfor' => 'Commenti di %s', + 'man_spam' => 'Segnala come spam ad Akismet', - # Manage comments page - 'man_searcht'=>'Cerca un post', - 'man_searchd'=>'Inserisci l\'id del post di cui vuoi gestire i commenti.', - 'man_search'=>'Cerca', - 'man_commfor'=>'Commenti di %s', - 'man_spam'=>'Segnala come spam ad Akismet', + // The simple edit + 'simple_pre' => 'In questo post i commenti ', + 'simple_1' => 'sono ammessi.', + 'simple_0' => 'richiedono la tua approvazione.', + 'simple_-1' => 'sono bloccati.', + 'simple_manage' => 'Gestisci i commenti di questo post.', + 'simple_edit' => 'Modifica le regole', - # The simple edit - 'simple_pre'=>'In questo post i commenti ', - 'simple_1'=>'sono ammessi.', - 'simple_0'=>'richiedono la tua approvazione.', - 'simple_-1'=>'sono bloccati.', - 'simple_manage'=>'Gestisci i commenti di questo post.', - 'simple_edit'=>'Modifica le regole', - - # Akismet warnings - 'akismet_errors'=>array( - -1=>'La chiave di Akismet è vuota. Per favore inseriscila.', - -2=>'Non abbiamo potuto chiamare i server di Akismet.', - -3=>'La risposta di Akismet è fallita.', - -4=>'La chiave di Akismet non è valida.', + // Akismet warnings + 'akismet_errors' => array( + -1 => 'La chiave di Akismet è vuota. Per favore inseriscila.', + -2 => 'Non abbiamo potuto chiamare i server di Akismet.', + -3 => 'La risposta di Akismet è fallita.', + -4 => 'La chiave di Akismet non è valida.' ), - # Messages - 'msgs'=>array( - 1=>'Configurazione salvata.', - -1=>'Si è verificato un errore durante il salvataggio della configurazione.', + // Messages + 'msgs' => array( + 1 => 'Configurazione salvata.', + -1 => 'Si è verificato un errore durante il salvataggio della configurazione.', - 2=>'Regola salvata.', - -2=>'Si è verificato un errore durante il salvataggio della regola (forse le tue opzioni sono scorrette).', + 2 => 'Regola salvata.', + -2 => 'Si è verificato un errore durante il salvataggio della regola (forse le tue opzioni sono scorrette).', - 3=>'Regola spostata.', - -3=>'Si è verificato un errore nello spostamento della regola (o non la si può muovere).', + 3 => 'Regola spostata.', + -3 => 'Si è verificato un errore nello spostamento della regola (o non la si può muovere).', - 4=>'Regole rimosse.', - -4=>'Si è verificato un errore durante la rimozione delle regole (o non hai selezionato nessuna regola).', + 4 => 'Regole rimosse.', + -4 => 'Si è verificato un errore durante la rimozione delle regole (o non hai selezionato nessuna regola).', - 5=>'Commenti pubblicati.', - -5=>'Si è verificato un errore durante la pubblicazione del commento.', + 5 => 'Commenti pubblicati.', + -5 => 'Si è verificato un errore durante la pubblicazione del commento.', - 6=>'Commenti rimossi.', - -6=>'Si è verificato un errore durante la rimozione dei commenti (o non hai selezionato nessun commento).', + 6 => 'Commenti rimossi.', + -6 => 'Si è verificato un errore durante la rimozione dei commenti (o non hai selezionato nessun commento).', - 7=>'Commento segnalato.', - -7=>'Si è verificato un errore durante la segnalazione del commento.', + 7 => 'Commento segnalato.', + -7 => 'Si è verificato un errore durante la segnalazione del commento.' ), - # Errors - 'errors'=>array( - 'pol_nonex'=>'La regola che vuoi modificare non esiste.', - 'entry_nf'=>'Il post da te selezionato non esiste.', - ), + // Errors + 'errors' => array( + 'pol_nonex' => 'La regola che vuoi modificare non esiste.', + 'entry_nf' => 'Il post da te selezionato non esiste.' + ) ); -$lang['plugin']['commentcenter']=array( - 'akismet_error'=>'Akismet ha rilevato il tuo commento come SPAM.', - 'lock'=>'Siamo spiacenti ma i commenti per questo post sono chiusi.', - 'approvation'=>'Il commento è stato salvato ma l\'Amministratore lo deve approvare prima di farlo vedere.', +$lang ['plugin'] ['commentcenter'] = array( + 'akismet_error' => 'Akismet ha rilevato il tuo commento come SPAM.', + 'lock' => 'Siamo spiacenti ma i commenti per questo post sono chiusi.', + 'approvation' => 'Il commento è stato salvato ma l\'Amministratore lo deve approvare prima di farlo vedere.', - # Mail for comments - 'mail_subj'=>'Nuovo commento da approvare su %s', + // Mail for comments + 'mail_subj' => 'Nuovo commento da approvare su %s' ); -$lang['plugin']['commentcenter']['mail_text']=<< + echo ' - - JSUTILS; + '; } -?> +?> \ No newline at end of file diff --git a/fp-plugins/lightbox2/plugin.lightbox2.php b/fp-plugins/lightbox2/plugin.lightbox2.php index 1d5d8ea..39fc9f1 100644 --- a/fp-plugins/lightbox2/plugin.lightbox2.php +++ b/fp-plugins/lightbox2/plugin.lightbox2.php @@ -18,21 +18,17 @@ function plugin_lightbox2_setup() { function plugin_lightbox2_head() { $pdir = plugin_geturl('lightbox2'); - echo << + echo ' - - LBOXHEAD; + '; } add_action('wp_head', 'plugin_lightbox2_head'); function plugin_lightbox2_footer() { $pdir = plugin_geturl('lightbox2'); - echo << + echo ' - - LBOXHEAD; + '; } add_action('wp_footer', 'plugin_lightbox2_footer'); @@ -42,4 +38,3 @@ function plugin_lightbox2_hook($popup, $abspath) { return $lightbox_rel ? "rel=\"lightbox[$lightbox_rel]\"" : ' rel="lightbox"'; } add_action('bbcode_img_popup', 'plugin_lightbox2_hook', 5, 2); - diff --git a/fp-plugins/prettyurls/plugin.prettyurls.php b/fp-plugins/prettyurls/plugin.prettyurls.php index 8a3f72f..1e0bf40 100644 --- a/fp-plugins/prettyurls/plugin.prettyurls.php +++ b/fp-plugins/prettyurls/plugin.prettyurls.php @@ -613,7 +613,7 @@ if (class_exists('AdminPanelAction')) { $txt = io_load_file($f); if (!$txt) { - $txt = << - STR; + '; } $this->smarty->assign('cantsave', (!is_writable(ABS_PATH) || (file_exists($f) && !is_writable($f)))); @@ -659,4 +659,4 @@ if (class_exists('AdminPanelAction')) { admin_addpanelaction('plugin', 'prettyurls', true); } -?> +?> \ No newline at end of file diff --git a/setup/lang/lang.en-us.php b/setup/lang/lang.en-us.php index 96f555b..e7d0f37 100644 --- a/setup/lang/lang.en-us.php +++ b/setup/lang/lang.en-us.php @@ -70,18 +70,15 @@ $lang ['buttonbar'] = array( $lang ['samplecontent'] = array(); $lang ['samplecontent'] ['menu'] ['subject'] = 'Menu'; -$lang ['samplecontent'] ['menu'] ['content'] = << 'セットアップは中断されました.', - 'descr' => - 'ロックファイル「%s」がサーバ上に存在しますので, + * LangId: Japanese + */ +$lang ['locked'] = array( + 'head' => 'セットアップは中断されました.', + 'descr' => 'ロックファイル「%s」がサーバ上に存在しますので, すでにセットアップ済みと判断しました. もしセットアップをやり直したいのであれば, まずこのロックファイルをサーバ上から削除してください. @@ -16,53 +15,45 @@ LangId: Japanese
  • ブログに戻ります
  • ロックファイルを削除しましたので, セットアップを再開します
    • ' - ); +); - $lang['step1'] = array ( - 'head' => 'ようこそFlatPressへ', - 'descr' => - 'FlatPressを選んでくださり, 感謝申し上げます! +$lang ['step1'] = array( + 'head' => 'ようこそFlatPressへ', + 'descr' => 'FlatPressを選んでくださり, 感謝申し上げます! 新規のブログをお楽しみいただく前に, 少しばかりお尋ねします. 時間はかかりませんから, ご心配なく!', - - 'descrl1' => 'Select your language.', - 'descrl2' => 'Not in the list?', - - 'descrlang' => - - 'If you don\'t see your language in this list, you might want to see if there is a language pack for this version: + + 'descrl1' => 'Select your language.', + 'descrl2' => 'Not in the list?', + + 'descrlang' => 'If you don\'t see your language in this list, you might want to see if there is a language pack for this version: 
    %s
    To install the language pack, upload the content of the package in your flatpress/, and overwrite all, then restart this setup.', - - 'descrw' => - 'FlatPressが動作するために必須なたったひとつのことは、書き込み可能なディレクトリを用意することです. + + 'descrw' => 'FlatPressが動作するために必須なたったひとつのことは、書き込み可能なディレクトリを用意することです. 次のディレクトリを書き込み可能なパーミッションに変更してから続けて下さい. 
    %s
    ' - - ); - - $lang['step2'] = array ( - 'head' => '管理ユーザの作成', - 'descr' => - '次の各欄にご記入ください:', - 'fpuser' => 'ユーザ名', - 'fppwd' => 'ログインパスワード(英数6文字以上)', - 'fppwd2' => 'ログインパスワードの再入力', - 'www' => 'ホームページurl', - 'email' => 'E-Mailアドレス' - - ); - - $lang['step3'] = array ( - 'head' => 'はい, おしまいです', - 'descr' => - '作業は終了しました. +); + +$lang ['step2'] = array( + 'head' => '管理ユーザの作成', + 'descr' => '次の各欄にご記入ください:', + 'fpuser' => 'ユーザ名', + 'fppwd' => 'ログインパスワード(英数6文字以上)', + 'fppwd2' => 'ログインパスワードの再入力', + 'www' => 'ホームページurl', + 'email' => 'E-Mailアドレス' +); + +$lang ['step3'] = array( + 'head' => 'はい, おしまいです', + 'descr' => '作業は終了しました. 信じられないって? @@ -77,28 +68,24 @@ LangId: Japanese 最後に, FlatPress を選んでくださって感謝申し上げます!' - - ); - - $lang['buttonbar'] = array( - 'next' => 'Next >' - ); - - $lang['samplecontent'] = array(); - - $lang['samplecontent']['menu']['subject'] = 'Menu'; - $lang['samplecontent']['menu']['content'] = << 'Next >' +); + +$lang ['samplecontent'] = array(); + +$lang ['samplecontent'] ['menu'] ['subject'] = 'Menu'; +$lang ['samplecontent'] ['menu'] ['content'] = '[list] [*][url=?]Home[/url] [*][url=?paged=1]Blog[/url] [*][url=static.php?page=about]About[/url] [*][url=contact.php]Contact[/url] -[/list] -MENU; +[/list]'; - $lang['samplecontent']['entry']['subject'] = 'Welcome to FlatPress!' ; - $lang['samplecontent']['entry']['content'] = <<